Skip to content

Commit 800b024

Browse files
committed
Fix class name and pom dependencies
1 parent 293a26b commit 800b024

File tree

5 files changed

+11
-30
lines changed

5 files changed

+11
-30
lines changed

kafka-plugins-0.10/pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,9 @@
2020
<version>${project.parent.version}</version>
2121
</dependency>
2222
<dependency>
23-
<groupId>io.cdap.plugin</groupId>
24-
<artifactId>format-common</artifactId>
25-
<version>${cdap.plugin.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>io.cdap.plugin</groupId>
29-
<artifactId>format-avro</artifactId>
30-
<version>${cdap.plugin.version}</version>
23+
<groupId>org.apache.avro</groupId>
24+
<artifactId>avro</artifactId>
25+
<version>${avro.version}</version>
3126
</dependency>
3227
<dependency>
3328
<groupId>org.apache.kafka</groupId>

kafka-plugins-0.10/src/main/java/io/cdap/plugin/source/KafkaStreamingSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ public JavaDStream<StructuredRecord> getStream(StreamingContext context) throws
6969
collector.getOrThrowException();
7070

7171
context.registerLineage(conf.referenceName);
72-
return KafkaStreaminSourceUtil.getStructuredRecordJavaDStream(context, conf, collector);
72+
return KafkaStreamingSourceUtil.getStructuredRecordJavaDStream(context, conf, collector);
7373
}
7474
}

kafka-plugins-0.10/src/main/java/io/cdap/plugin/source/KafkaStreaminSourceUtil.java renamed to kafka-plugins-0.10/src/main/java/io/cdap/plugin/source/KafkaStreamingSourceUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
* This class contains methods for {@link KafkaStreamingSource} that require spark classes because during validation
6363
* spark classes are not available. Refer CDAP-15912 for more information.
6464
*/
65-
final class KafkaStreaminSourceUtil {
66-
private static final Logger LOG = LoggerFactory.getLogger(KafkaStreaminSourceUtil.class);
65+
final class KafkaStreamingSourceUtil {
66+
private static final Logger LOG = LoggerFactory.getLogger(KafkaStreamingSourceUtil.class);
6767

6868
/**
6969
* Returns {@link JavaDStream} for {@link KafkaStreamingSource}.
@@ -284,7 +284,7 @@ protected void addMessage(StructuredRecord.Builder builder, String messageField,
284284
}
285285
}
286286

287-
private KafkaStreaminSourceUtil() {
287+
private KafkaStreamingSourceUtil() {
288288
// no-op
289289
}
290290
}

kafka-plugins-0.8/pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,9 @@
2020
<version>${project.parent.version}</version>
2121
</dependency>
2222
<dependency>
23-
<groupId>io.cdap.plugin</groupId>
24-
<artifactId>format-common</artifactId>
25-
<version>${cdap.plugin.version}</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>io.cdap.plugin</groupId>
29-
<artifactId>format-avro</artifactId>
30-
<version>${cdap.plugin.version}</version>
23+
<groupId>org.apache.avro</groupId>
24+
<artifactId>avro</artifactId>
25+
<version>${avro.version}</version>
3126
</dependency>
3227
<dependency>
3328
<groupId>org.apache.kafka</groupId>

pom.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<hadoop.version>2.3.0</hadoop.version>
8585
<netty.version>4.1.16.Final</netty.version>
8686
<netty-http.version>1.3.0</netty-http.version>
87+
<avro.version>1.8.2</avro.version>
8788
<main.basedir>${project.basedir}</main.basedir>
8889
</properties>
8990

@@ -121,16 +122,6 @@
121122
<artifactId>cdap-formats</artifactId>
122123
<version>${cdap.version}</version>
123124
</dependency>
124-
<dependency>
125-
<groupId>io.cdap.plugin</groupId>
126-
<artifactId>format-common</artifactId>
127-
<version>${cdap.plugin.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>io.cdap.plugin</groupId>
131-
<artifactId>format-avro</artifactId>
132-
<version>${cdap.plugin.version}</version>
133-
</dependency>
134125
<dependency>
135126
<groupId>io.cdap.cdap</groupId>
136127
<artifactId>hydrator-test</artifactId>

0 commit comments

Comments
 (0)