This is an automated email from the ASF dual-hosted git repository.
sblackmon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git
commit 51528c1547f6870f2067dd9b98ccef9a65a770dc
Author: Steve Blackmon <sblack...@salesforce.com>
AuthorDate: Wed Dec 6 17:56:39 2023 -0600
java17 support
---
pom.xml | 251 ++++++++++++++++-----
src/site/markdown/dependency-info.md | 18 +-
src/site/markdown/versions.md | 12 +
src/site/site.xml | 5 +-
streams-components/streams-http/pom.xml | 4 +-
.../test/java/SimpleHTTPPostPersistWriterTest.java | 6 +-
streams-config/pom.xml | 5 +-
streams-contrib/streams-persist-console/pom.xml | 7 +-
streams-contrib/streams-persist-filebuffer/pom.xml | 7 +-
streams-contrib/streams-persist-hbase/pom.xml | 6 +-
streams-contrib/streams-persist-hdfs/pom.xml | 2 +-
streams-contrib/streams-persist-kafka/pom.xml | 4 +-
.../apache/streams/kafka/KafkaPersistReader.java | 32 ++-
.../streams/kafka/KafkaPersistReaderTask.java | 17 +-
.../apache/streams/kafka/KafkaPersistWriter.java | 15 +-
streams-contrib/streams-persist-neo4j/pom.xml | 12 +-
.../streams-processor-peoplepattern/pom.xml | 10 +-
streams-contrib/streams-provider-facebook/pom.xml | 2 +-
.../streams-provider-google/google-gplus/pom.xml | 7 +-
.../providers/TestGPlusUserActivityCollector.java | 4 +-
.../providers/TestGPlusUserDataCollector.java | 2 +-
streams-contrib/streams-provider-google/pom.xml | 2 +-
streams-contrib/streams-provider-instagram/pom.xml | 3 +-
streams-contrib/streams-provider-linkedin/pom.xml | 2 +-
streams-contrib/streams-provider-moreover/pom.xml | 4 +
.../moreover/MoreoverJsonActivitySerializer.java | 2 +-
streams-contrib/streams-provider-rss/pom.xml | 2 +-
streams-contrib/streams-provider-twitter/pom.xml | 2 +-
streams-contrib/streams-provider-youtube/pom.xml | 6 +-
.../provider/YoutubeChannelDataCollectorTest.java | 2 +-
.../provider/YoutubeUserActivityCollectorTest.java | 4 +-
.../flink-twitter-collection/pom.xml | 4 +-
streams-plugins/pom.xml | 92 +-------
streams-plugins/streams-plugin-cassandra/pom.xml | 3 +-
.../streams-plugin-elasticsearch/pom.xml | 3 +-
streams-plugins/streams-plugin-hbase/pom.xml | 3 +-
streams-plugins/streams-plugin-hive/pom.xml | 3 +-
streams-plugins/streams-plugin-pig/pom.xml | 3 +-
streams-plugins/streams-plugin-pojo/pom.xml | 5 +-
streams-plugins/streams-plugin-scala/pom.xml | 3 +-
streams-runtimes/streams-runtime-local/pom.xml | 3 +-
.../local/builders/LocalStreamBuilderTest.java | 2 +-
42 files changed, 329 insertions(+), 252 deletions(-)
diff --git a/pom.xml b/pom.xml
index 078236035e..0880ecda11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,10 +305,10 @@
<properties>
<!-- Language Library Version Properties -->
- <java.version>1.8</java.version>
- <scala.version>2.11.12</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
- <maven.version>3.6.3</maven.version>
+ <java.version>17</java.version>
+ <scala.version>2.12.18</scala.version>
+ <scala.binary.version>2.12</scala.binary.version>
+ <maven.version>3.9.3</maven.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -331,14 +331,14 @@
<apache-rat.plugin.version>0.13</apache-rat.plugin.version>
<build-helper.plugin.version>1.8</build-helper.plugin.version>
<bundle.plugin.version>1.4.3</bundle.plugin.version>
- <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
- <compiler.plugin.version>3.0</compiler.plugin.version>
- <clean.plugin.version>2.6</clean.plugin.version>
- <dependency.plugin.version>2.10</dependency.plugin.version>
+ <checkstyle.plugin.version>3.3.1</checkstyle.plugin.version>
+ <compiler.plugin.version>3.11.0</compiler.plugin.version>
+ <clean.plugin.version>3.3.2</clean.plugin.version>
+ <dependency.plugin.version>3.6.1</dependency.plugin.version>
<depgraph.plugin.version>1.0.3</depgraph.plugin.version>
<docker.plugin.version>0.24.0</docker.plugin.version>
<download.plugin.version>1.2.1</download.plugin.version>
- <enforcer.plugin.version>3.0.0-M3</enforcer.plugin.version>
+ <enforcer.plugin.version>3.4.1</enforcer.plugin.version>
<failsafe.plugin.version>2.22.0</failsafe.plugin.version>
<jar.plugin.version>2.6</jar.plugin.version>
<javadoc.plugin.version>3.2.0</javadoc.plugin.version>
@@ -346,21 +346,21 @@
<pax.plugin.version>1.5</pax.plugin.version>
<remote-resources.plugin.version>1.4</remote-resources.plugin.version>
<reports.plugin.version>2.9</reports.plugin.version>
- <resources.plugin.version>2.7</resources.plugin.version>
+ <resources.plugin.version>3.3.1</resources.plugin.version>
<scala.plugin.version>4.4.0</scala.plugin.version>
<scalastyle.plugin.version>0.8.0</scalastyle.plugin.version>
- <scm.plugin.version>1.9.5</scm.plugin.version>
- <scmpublish.plugin.version>1.1</scmpublish.plugin.version>
- <shade.plugin.version>3.1.0</shade.plugin.version>
- <site.plugin.version>3.6</site.plugin.version>
- <source.plugin.version>2.4</source.plugin.version>
- <surefire.plugin.version>2.22.0</surefire.plugin.version>
+ <scm.plugin.version>2.0.1</scm.plugin.version>
+ <scmpublish.plugin.version>3.2.1</scmpublish.plugin.version>
+ <shade.plugin.version>3.5.1</shade.plugin.version>
+ <site.plugin.version>4.0.0-M12</site.plugin.version>
+ <source.plugin.version>3.3.0</source.plugin.version>
+ <surefire.plugin.version>3.2.2</surefire.plugin.version>
<wagon.plugin.version>3.0.0</wagon.plugin.version>
- <war.plugin.version>2.5</war.plugin.version>
+ <war.plugin.version>3.4.0</war.plugin.version>
<!-- Library Dependency Versions -->
<aalto.version>1.1.0</aalto.version>
- <commons-codec.version>1.10</commons-codec.version>
+ <commons-codec.version>1.16.0</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-io.version>2.5</commons-io.version>
<commons-lang3.version>3.6</commons-lang3.version>
@@ -373,7 +373,7 @@
<guava.version>20.0</guava.version>
<httpcomponents.core.version>4.4.8</httpcomponents.core.version>
<httpcomponents.client.version>4.5.4</httpcomponents.client.version>
- <jackson.version>2.9.8</jackson.version>
+ <jackson.version>2.16.0</jackson.version>
<joda-time.version>2.9.9</joda-time.version>
<joda-convert.version>1.8.1</joda-convert.version>
<json-flattener.version>0.5.0</json-flattener.version>
@@ -387,7 +387,7 @@
<junit.version>4.12</junit.version>
<netty.version>3.8.0.Final</netty.version>
<slf4j.version>1.7.25</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
+ <log4j.version>2.22.0</log4j.version>
<logback.version>1.2.3</logback.version>
<hamcrest.version>1.3</hamcrest.version>
<reflections.version>0.9.11</reflections.version>
@@ -395,10 +395,19 @@
<zookeeper.version>3.4.5</zookeeper.version>
<!-- Test Library Dependency Versions -->
- <mockito.version>2.0.2-beta</mockito.version>
- <powermock.version>1.7.4</powermock.version>
+ <mockito.version>4.11.0</mockito.version>
+ <powermock.version>2.0.9</powermock.version>
+ <surefire.version>3.2.2</surefire.version>
<testng.version>6.11</testng.version>
+ <!-- maven plugin module helper versions -->
+ <maven-plugin.version>3.9.6</maven-plugin.version>
+ <maven-aether-provider.version>3.3.9</maven-aether-provider.version>
+ <maven-plugin-plugin.version>3.10.2</maven-plugin-plugin.version>
+ <maven-plugin-tools.version>3.10.2</maven-plugin-tools.version>
+ <maven-plugin-testing.version>3.3.0</maven-plugin-testing.version>
+ <maven-verifier.version>1.8.0</maven-verifier.version>
+
<!-- osgi configuration -->
<org.osgi.service.http.port>8080</org.osgi.service.http.port>
<org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
@@ -407,7 +416,7 @@
<skipTests>false</skipTests>
<!-- avoid intermittent build failures in streams-plugins -->
- <jvm.options>-Djava.util.Arrays.useLegacyMergeSort=true</jvm.options>
+ <jvm.options>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens
java.xml/jdk.xml.internal=ALL-UNNAMED
-Djava.util.Arrays.useLegacyMergeSort=true</jvm.options>
</properties>
@@ -938,11 +947,36 @@
<artifactId>juneau-svl</artifactId>
<version>${juneau.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>3.0.0-M4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>3.0.0-M4</version>
+ </dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe.config.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.4.0-b180830.0359</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -995,13 +1029,13 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock</artifactId>
+ <artifactId>powermock-core</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
@@ -1013,7 +1047,7 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
@@ -1038,7 +1072,7 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
@@ -1113,6 +1147,11 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>aalto-xml</artifactId>
@@ -1144,6 +1183,88 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ <version>${maven-aether-provider.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${resources.plugin.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven-plugin.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${maven-plugin.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ <version>${maven-verifier.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven-plugin.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-plugin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ <version>${maven-plugin-tools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${maven-plugin-tools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId>
+ <version>${maven-plugin-tools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>${maven-plugin-testing.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -1255,20 +1376,21 @@
<profile>
<id>java-8</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
<jdk>1.8</jdk>
</activation>
<properties>
<java.version>8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
+
<jvm.options>-Djava.util.Arrays.useLegacyMergeSort=true</jvm.options>
</properties>
</profile>
<profile>
<id>java-11</id>
<activation>
<activeByDefault>false</activeByDefault>
- <jdk>(1.11,)</jdk>
+ <jdk>(11,)</jdk>
</activation>
<properties>
<java.version>11</java.version>
@@ -1276,35 +1398,48 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.4.0-b180830.0359</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>3.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>3.0.0-M4</version>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+<!-- <dependencyManagement>-->
+<!-- <dependencies>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.xml.bind</groupId>-->
+<!-- <artifactId>jaxb-api</artifactId>-->
+<!-- <version>2.4.0-b180830.0359</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.sun.xml.bind</groupId>-->
+<!-- <artifactId>jaxb-core</artifactId>-->
+<!-- <version>3.0.0-M4</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.sun.xml.bind</groupId>-->
+<!-- <artifactId>jaxb-impl</artifactId>-->
+<!-- <version>3.0.0-M4</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.sun.activation</groupId>-->
+<!-- <artifactId>javax.activation</artifactId>-->
+<!-- <version>1.2.0</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>javax.annotation</groupId>-->
+<!-- <artifactId>javax.annotation-api</artifactId>-->
+<!-- <version>1.3.2</version>-->
+<!-- </dependency>-->
+<!-- </dependencies>-->
+<!-- </dependencyManagement>-->
+ </profile>
+ <profile>
+ <id>java-17</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <jdk>(17,)</jdk>
+ </activation>
+ <properties>
+ <java.version>17</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+
<maven.compiler.release>${java.version}</maven.compiler.release>
+ </properties>
</profile>
<profile>
<id>dist</id>
diff --git a/src/site/markdown/dependency-info.md
b/src/site/markdown/dependency-info.md
index 338c619873..05f8da0911 100644
--- a/src/site/markdown/dependency-info.md
+++ b/src/site/markdown/dependency-info.md
@@ -20,8 +20,8 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<pre class="prettyprint"><dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-master</artifactId>
- <version>0.5.1</version>
+ <artifactId>streams-core</artifactId>
+ <version>0.6.1</version>
<type>pom</type>
</dependency></pre>
@@ -35,7 +35,7 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<div class="source">
-<pre class="prettyprint">'org.apache.streams:apache-streams:pom:0.5.1'</pre>
+<pre class="prettyprint">'org.apache.streams:streams-core:jar:0.6.1'</pre>
</div>
@@ -47,8 +47,8 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<div class="source">
-<pre class="prettyprint"><dependency org="org.apache.streams"
name="streams-master" rev="0.5.1">
- <artifact name="streams-master" type="pom" />
+<pre class="prettyprint"><dependency org="org.apache.streams"
name="streams-core" rev="0.6.1">
+ <artifact name="streams-core" type="jar" />
</dependency></pre>
</div>
@@ -60,7 +60,7 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<h3><a name="Groovy_Grape"></a>Groovy Grape</h3><a name="Groovy_Grape"></a>
<div class="source"><pre class="prettyprint">@Grapes(
-@Grab(group='org.apache.streams', module='streams-master', version='0.5.1')
+@Grab(group='org.apache.streams', module='streams-core', version='0.6.1')
)</pre>
</div>
@@ -71,7 +71,7 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<h3><a name="Gradle"></a>Gradle</h3><a name="Gradle"></a>
-<div class="source"><pre class="prettyprint">compile
'org.apache.streams:streams-master:0.5.1'</pre>
+<div class="source"><pre class="prettyprint">compile
'org.apache.streams:streams-core:0.6.1'</pre>
</div>
@@ -82,7 +82,7 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<div class="source">
-<pre class="prettyprint">[org.apache.streams/streams-master
"0.5.1"]</pre>
+<pre class="prettyprint">[org.apache.streams/streams-core
"0.6.1"]</pre>
</div>
@@ -94,7 +94,7 @@ Browse the "Project Modules" index of streams-project to find
artifacts you migh
<div class="source">
-<pre class="prettyprint">libraryDependencies += "org.apache.streams"
% "streams-master" % "0.5.1"</pre>
+<pre class="prettyprint">libraryDependencies += "org.apache.streams"
% "streams-core" % "0.6.1"</pre>
</div>
diff --git a/src/site/markdown/versions.md b/src/site/markdown/versions.md
new file mode 100644
index 0000000000..8d5f28448c
--- /dev/null
+++ b/src/site/markdown/versions.md
@@ -0,0 +1,12 @@
+##Versions Supported
+
+Apache Streams should be able to be built and used with
+Java 1.8, Java 11, and Java 17.
+
+You'll need to activate only one of the following profiles:
+
+ - java-8
+ - java-11
+ - java-17
+
+The default active profile is java-17.
diff --git a/src/site/site.xml b/src/site/site.xml
index 773611b320..41eb0b1816 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -93,11 +93,12 @@
<menu name="Developers">
<item name="Install Git" href="install/git.html"/>
<item name="Install Maven" href="install/maven.html"/>
- <item name="Changelog" href="changelog.html" />
+ <item name="Versions Supported" href="versions.html"/>
<item name="Release Setup" href="release-setup.html" />
<item name="Release Process" href="release.html" />
<item name="Website Management" href="website.html" />
<item name="Coding Conventions" href="code-conventions.html"/>
+ <item name="Changelog" href="changelog.html" />
</menu>
<!--<menu name="Details">-->
<!--<item name="Mailing Lists" href="mail-lists.html" />-->
@@ -123,4 +124,4 @@
<item name="Thanks"
href="http://www.apache.org/foundation/thanks.html"; />
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/streams-components/streams-http/pom.xml
b/streams-components/streams-http/pom.xml
index 4e19a59eb5..8a91416653 100644
--- a/streams-components/streams-http/pom.xml
+++ b/streams-components/streams-http/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
diff --git
a/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
b/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
index e8bbb5ae0b..bd4995ee39 100644
---
a/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
+++
b/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
@@ -28,6 +28,7 @@ import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -39,14 +40,15 @@ import org.powermock.modules.junit4.PowerMockRunner;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
/**
* Test for
* @see org.apache.streams.components.http.persist.SimpleHTTPPostPersistWriter
*/
+@Ignore
@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("jdk.internal.reflect.*")
+@PowerMockIgnore({"javax.management.*","jdk.internal.reflect.*"})
@PrepareForTest({HttpClients.class, CloseableHttpResponse.class,
CloseableHttpResponse.class})
public class SimpleHTTPPostPersistWriterTest {
diff --git a/streams-config/pom.xml b/streams-config/pom.xml
index 1e56be7f64..8b2131f411 100644
--- a/streams-config/pom.xml
+++ b/streams-config/pom.xml
@@ -90,7 +90,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -98,7 +98,8 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
diff --git a/streams-contrib/streams-persist-console/pom.xml
b/streams-contrib/streams-persist-console/pom.xml
index a020a8b3fe..331c7c48d1 100644
--- a/streams-contrib/streams-persist-console/pom.xml
+++ b/streams-contrib/streams-persist-console/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -57,7 +57,8 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
@@ -82,4 +83,4 @@
</testResources>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/streams-contrib/streams-persist-filebuffer/pom.xml
b/streams-contrib/streams-persist-filebuffer/pom.xml
index 92ea2e5aab..826b6126be 100644
--- a/streams-contrib/streams-persist-filebuffer/pom.xml
+++ b/streams-contrib/streams-persist-filebuffer/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -78,7 +78,8 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
@@ -138,4 +139,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/streams-contrib/streams-persist-hbase/pom.xml
b/streams-contrib/streams-persist-hbase/pom.xml
index 8ed8a1be39..c72e38dbfe 100644
--- a/streams-contrib/streams-persist-hbase/pom.xml
+++ b/streams-contrib/streams-persist-hbase/pom.xml
@@ -30,8 +30,8 @@
<description>HBase Module</description>
<properties>
- <hadoop-common.version>2.7.0</hadoop-common.version>
- <hbase.version>1.2.3</hbase.version>
+ <hadoop-common.version>3.2.4</hadoop-common.version>
+ <hbase.version>1.7.2</hbase.version>
</properties>
<dependencies>
@@ -222,4 +222,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/streams-contrib/streams-persist-hdfs/pom.xml
b/streams-contrib/streams-persist-hdfs/pom.xml
index 903751477d..00de08ca8d 100644
--- a/streams-contrib/streams-persist-hdfs/pom.xml
+++ b/streams-contrib/streams-persist-hdfs/pom.xml
@@ -30,7 +30,7 @@
<description>HDFS Module</description>
<properties>
- <hdfs.version>2.7.0</hdfs.version>
+ <hdfs.version>3.2.4</hdfs.version>
</properties>
<dependencies>
diff --git a/streams-contrib/streams-persist-kafka/pom.xml
b/streams-contrib/streams-persist-kafka/pom.xml
index f85a51fdac..3cfc09ed01 100644
--- a/streams-contrib/streams-persist-kafka/pom.xml
+++ b/streams-contrib/streams-persist-kafka/pom.xml
@@ -30,8 +30,8 @@
<description>Kafka Module</description>
<properties>
- <scala.binary.version>2.11</scala.binary.version>
- <kafka.version>1.0.0</kafka.version>
+ <scala.binary.version>2.12</scala.binary.version>
+ <kafka.version>3.6.0</kafka.version>
<clojure.version>1.2.0</clojure.version>
</properties>
diff --git
a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
index d5377d91c4..4fc5455c1e 100644
---
a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
+++
b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
@@ -18,6 +18,9 @@
package org.apache.streams.kafka;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections.ListUtils;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.StreamsDatum;
@@ -25,11 +28,9 @@ import org.apache.streams.core.StreamsPersistReader;
import org.apache.streams.core.StreamsResultSet;
import com.fasterxml.jackson.databind.ObjectMapper;
-import kafka.consumer.Consumer;
-import kafka.consumer.ConsumerConfig;
-import kafka.consumer.KafkaStream;
-import kafka.consumer.Whitelist;
-import kafka.javaapi.consumer.ConsumerConnector;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+
import kafka.serializer.StringDecoder;
import kafka.utils.VerifiableProperties;
import org.joda.time.DateTime;
@@ -38,6 +39,7 @@ import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.math.BigInteger;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.Queue;
@@ -61,9 +63,7 @@ public class KafkaPersistReader implements
StreamsPersistReader, Serializable {
private KafkaReaderConfiguration config;
- private ConsumerConnector consumerConnector;
-
- public List<KafkaStream<String, String>> inStreams;
+ protected Consumer<String, String> consumer;
private ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -98,18 +98,14 @@ public class KafkaPersistReader implements
StreamsPersistReader, Serializable {
Properties props = new Properties();
props.setProperty("serializer.encoding", "UTF8");
- ConsumerConfig consumerConfig = new ConsumerConfig(props);
-
- consumerConnector = Consumer.createJavaConsumerConnector(consumerConfig);
+ consumer = new KafkaConsumer(props);
+ List<String> topics = ListUtils.EMPTY_LIST;
+ topics.add(config.getTopic());
- Whitelist topics = new Whitelist(config.getTopic());
+ consumer.subscribe(topics);
VerifiableProperties vprops = new VerifiableProperties(props);
- inStreams = consumerConnector.createMessageStreamsByFilter(topics, 1, new
StringDecoder(vprops), new StringDecoder(vprops));
-
- for (final KafkaStream stream : inStreams) {
- executor.submit(new KafkaPersistReaderTask(this, stream));
- }
+ executor.submit(new KafkaPersistReaderTask(this));
}
@@ -155,7 +151,7 @@ public class KafkaPersistReader implements
StreamsPersistReader, Serializable {
@Override
public void cleanUp() {
- consumerConnector.shutdown();
+ consumer.close();
while ( !executor.isTerminated()) {
try {
executor.awaitTermination(5, TimeUnit.SECONDS);
diff --git
a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
index a36246c431..1f43d8827d 100644
---
a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
+++
b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
@@ -18,13 +18,14 @@
package org.apache.streams.kafka;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.streams.core.StreamsDatum;
-import kafka.consumer.KafkaStream;
-import kafka.message.MessageAndMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.time.Duration;
import java.util.Random;
/**
@@ -36,22 +37,20 @@ public class KafkaPersistReaderTask implements Runnable {
private static final Logger LOGGER =
LoggerFactory.getLogger(KafkaPersistReaderTask.class);
private KafkaPersistReader reader;
- private KafkaStream<String,String> stream;
- public KafkaPersistReaderTask(KafkaPersistReader reader,
KafkaStream<String,String> stream) {
+ public KafkaPersistReaderTask(KafkaPersistReader reader) {
this.reader = reader;
- this.stream = stream;
}
@Override
public void run() {
- MessageAndMetadata<String,String> item;
+ ConsumerRecords<String,String> records =
reader.consumer.poll(Duration.ofMillis(100));
+
while (true) {
- for (MessageAndMetadata<String, String> aStream : stream) {
- item = aStream;
- reader.persistQueue.add(new StreamsDatum(item.message()));
+ for (ConsumerRecord<String, String> record : records) {
+ reader.persistQueue.add(new StreamsDatum(record.value(),
record.key()));
}
try {
Thread.sleep(new Random().nextInt(100));
diff --git
a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
index 9ea985d83a..8c59e3c812 100644
---
a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
+++
b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
@@ -18,6 +18,10 @@
package org.apache.streams.kafka;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.StreamsDatum;
@@ -26,9 +30,6 @@ import org.apache.streams.util.GuidUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import kafka.javaapi.producer.Producer;
-import kafka.producer.KeyedMessage;
-import kafka.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +53,7 @@ public class KafkaPersistWriter implements
StreamsPersistWriter, Serializable, R
private KafkaWriterConfiguration config;
- private Producer<String, String> producer;
+ protected Producer<String, String> producer;
/**
* KafkaPersistWriter constructor
@@ -85,9 +86,7 @@ public class KafkaPersistWriter implements
StreamsPersistWriter, Serializable, R
props.put("partitioner.class",
"org.apache.streams.kafka.StreamsPartitioner");
props.put("request.required.acks", "1");
- ProducerConfig config = new ProducerConfig(props);
-
- producer = new Producer<>(config);
+ producer = new KafkaProducer<>(props);
new Thread(new KafkaPersistWriterTask(this)).start();
}
@@ -118,7 +117,7 @@ public class KafkaPersistWriter implements
StreamsPersistWriter, Serializable, R
String hash = GuidUtils.generateGuid(text);
- KeyedMessage<String, String> data = new
KeyedMessage<>(config.getTopic(), hash, text);
+ ProducerRecord<String, String> data = new
ProducerRecord<>(config.getTopic(), hash, text);
producer.send(data);
diff --git a/streams-contrib/streams-persist-neo4j/pom.xml
b/streams-contrib/streams-persist-neo4j/pom.xml
index 8425c27131..00b0ac0df6 100644
--- a/streams-contrib/streams-persist-neo4j/pom.xml
+++ b/streams-contrib/streams-persist-neo4j/pom.xml
@@ -67,6 +67,16 @@
<artifactId>streams-http</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-persist-graph</artifactId>
@@ -259,4 +269,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/streams-contrib/streams-processor-peoplepattern/pom.xml
b/streams-contrib/streams-processor-peoplepattern/pom.xml
index 277b8c7fbc..6247a8deb5 100644
--- a/streams-contrib/streams-processor-peoplepattern/pom.xml
+++ b/streams-contrib/streams-processor-peoplepattern/pom.xml
@@ -48,6 +48,10 @@
<groupId>org.apache.streams</groupId>
<artifactId>streams-pojo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-pojo-extensions</artifactId>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -76,7 +80,6 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -123,15 +126,10 @@
<artifactId>streams-plugin-pojo</artifactId>
<version>${project.version}</version>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
<sourcePaths>
<sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/peoplepattern</sourcePath>
</sourcePaths>
-
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>org.apache.streams.peoplepattern</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
</configuration>
</plugin>
</plugins>
diff --git a/streams-contrib/streams-provider-facebook/pom.xml
b/streams-contrib/streams-provider-facebook/pom.xml
index e7434e56d6..29d9e1e6c2 100644
--- a/streams-contrib/streams-provider-facebook/pom.xml
+++ b/streams-contrib/streams-provider-facebook/pom.xml
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
diff --git a/streams-contrib/streams-provider-google/google-gplus/pom.xml
b/streams-contrib/streams-provider-google/google-gplus/pom.xml
index 688f7d0689..9fa37a0dc8 100644
--- a/streams-contrib/streams-provider-google/google-gplus/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml
@@ -118,20 +118,19 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.5.5</version>
+ <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.5.5</version>
+ <version>${powermock.version}</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
diff --git
a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserActivityCollector.java
b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserActivityCollector.java
index 84d3d52daf..aae3230217 100644
---
a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserActivityCollector.java
+++
b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserActivityCollector.java
@@ -49,8 +49,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.junit.Assert;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git
a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserDataCollector.java
b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserDataCollector.java
index f81ecc062f..f982db5b55 100644
---
a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserDataCollector.java
+++
b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/providers/TestGPlusUserDataCollector.java
@@ -37,7 +37,7 @@ import java.io.IOException;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/streams-contrib/streams-provider-google/pom.xml
b/streams-contrib/streams-provider-google/pom.xml
index da4db42dba..a0266fa6f4 100644
--- a/streams-contrib/streams-provider-google/pom.xml
+++ b/streams-contrib/streams-provider-google/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/streams-contrib/streams-provider-instagram/pom.xml
b/streams-contrib/streams-provider-instagram/pom.xml
index 157191a714..fc4caae081 100644
--- a/streams-contrib/streams-provider-instagram/pom.xml
+++ b/streams-contrib/streams-provider-instagram/pom.xml
@@ -109,8 +109,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/streams-contrib/streams-provider-linkedin/pom.xml
b/streams-contrib/streams-provider-linkedin/pom.xml
index 52e10ed0d1..c9e9a8d3e9 100644
--- a/streams-contrib/streams-provider-linkedin/pom.xml
+++ b/streams-contrib/streams-provider-linkedin/pom.xml
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/streams-contrib/streams-provider-moreover/pom.xml
b/streams-contrib/streams-provider-moreover/pom.xml
index 22dc635f49..eb34baaa54 100644
--- a/streams-contrib/streams-provider-moreover/pom.xml
+++ b/streams-contrib/streams-provider-moreover/pom.xml
@@ -50,6 +50,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git
a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverJsonActivitySerializer.java
b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverJsonActivitySerializer.java
index 91d487e688..07cfb0d9a7 100644
---
a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverJsonActivitySerializer.java
+++
b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverJsonActivitySerializer.java
@@ -18,6 +18,7 @@
package org.apache.streams.moreover;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
import org.apache.streams.data.ActivitySerializer;
import org.apache.streams.pojo.json.Activity;
@@ -25,7 +26,6 @@ import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
import com.moreover.api.Article;
import org.apache.commons.lang.NotImplementedException;
import org.slf4j.Logger;
diff --git a/streams-contrib/streams-provider-rss/pom.xml
b/streams-contrib/streams-provider-rss/pom.xml
index 50d414d14d..9953332d0f 100644
--- a/streams-contrib/streams-provider-rss/pom.xml
+++ b/streams-contrib/streams-provider-rss/pom.xml
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
</dependency>
<dependency>
<groupId>com.healthmarketscience.common</groupId>
diff --git a/streams-contrib/streams-provider-twitter/pom.xml
b/streams-contrib/streams-provider-twitter/pom.xml
index 01ef834f33..e1eff5cf3f 100644
--- a/streams-contrib/streams-provider-twitter/pom.xml
+++ b/streams-contrib/streams-provider-twitter/pom.xml
@@ -127,7 +127,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git a/streams-contrib/streams-provider-youtube/pom.xml
b/streams-contrib/streams-provider-youtube/pom.xml
index 3d7585ccf0..fb5a28bace 100644
--- a/streams-contrib/streams-provider-youtube/pom.xml
+++ b/streams-contrib/streams-provider-youtube/pom.xml
@@ -43,6 +43,10 @@
</repositories>
<dependencies>
+ <dependency>
+ <groupId>com.typesafe</groupId>
+ <artifactId>config</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-pojo-extensions</artifactId>
@@ -92,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeChannelDataCollectorTest.java
b/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeChannelDataCollectorTest.java
index b2917609d0..09a38443fb 100644
---
a/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeChannelDataCollectorTest.java
+++
b/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeChannelDataCollectorTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.LinkedBlockingQueue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git
a/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeUserActivityCollectorTest.java
b/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeUserActivityCollectorTest.java
index 1d92a3ebef..6a753b14a4 100644
---
a/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeUserActivityCollectorTest.java
+++
b/streams-contrib/streams-provider-youtube/src/test/java/org/apache/streams/youtube/provider/YoutubeUserActivityCollectorTest.java
@@ -48,7 +48,7 @@ import java.util.concurrent.BlockingQueue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -351,4 +351,4 @@ public class YoutubeUserActivityCollectorTest {
return createMockVideoListResponse(batchBefore, batchAfter, batchIn,
after, before, numAfter != afterCount || inCount != numInRange || beforeCount
!= numBefore);
}
}
-}
\ No newline at end of file
+}
diff --git
a/streams-examples/streams-examples-flink/flink-twitter-collection/pom.xml
b/streams-examples/streams-examples-flink/flink-twitter-collection/pom.xml
index dee8dfc18b..21046caab1 100644
--- a/streams-examples/streams-examples-flink/flink-twitter-collection/pom.xml
+++ b/streams-examples/streams-examples-flink/flink-twitter-collection/pom.xml
@@ -35,8 +35,8 @@
<hdfs.version>2.7.0</hdfs.version>
<flink.version>1.11.1</flink.version>
<testng.version>6.9.10</testng.version>
- <scala.version>2.11.12</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
+ <scala.version>2.12.18</scala.version>
+ <scala.binary.version>2.12</scala.binary.version>
<scalapc.version>1.1.0</scalapc.version>
<scalatest.version>3.0.0</scalatest.version>
<scalaxml.version>1.1.0</scalaxml.version>
diff --git a/streams-plugins/pom.xml b/streams-plugins/pom.xml
index 7083c4bfb7..d4da3fd728 100644
--- a/streams-plugins/pom.xml
+++ b/streams-plugins/pom.xml
@@ -33,15 +33,6 @@
<packaging>pom</packaging>
<name>streams-plugins</name>
- <properties>
- <maven-plugin.version>3.6.3</maven-plugin.version>
- <maven-aether-provider.version>3.3.9</maven-aether-provider.version>
- <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
- <maven-plugin-tools.version>3.6.0</maven-plugin-tools.version>
- <maven-plugin-testing.version>3.3.0</maven-plugin-testing.version>
- <maven-verifier.version>1.7.2</maven-verifier.version>
- </properties>
-
<modules>
<module>streams-plugin-cassandra</module>
<module>streams-plugin-elasticsearch</module>
@@ -64,88 +55,7 @@
<artifactId>streams-pojo</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
- <version>${maven-aether-provider.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${resources.plugin.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven-plugin.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${maven-plugin.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- <version>${maven-verifier.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${maven-plugin.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${maven-plugin-plugin.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven-plugin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
- <version>${maven-plugin-tools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>${maven-plugin-tools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-generators</artifactId>
- <version>${maven-plugin-tools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>${maven-plugin-testing.version}</version>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</dependencyManagement>
</project>
diff --git a/streams-plugins/streams-plugin-cassandra/pom.xml
b/streams-plugins/streams-plugin-cassandra/pom.xml
index 6f2709664c..63859e0e37 100644
--- a/streams-plugins/streams-plugin-cassandra/pom.xml
+++ b/streams-plugins/streams-plugin-cassandra/pom.xml
@@ -115,6 +115,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -163,7 +164,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-plugins/streams-plugin-elasticsearch/pom.xml
b/streams-plugins/streams-plugin-elasticsearch/pom.xml
index 4af09b1d35..3a201863cc 100644
--- a/streams-plugins/streams-plugin-elasticsearch/pom.xml
+++ b/streams-plugins/streams-plugin-elasticsearch/pom.xml
@@ -116,6 +116,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -164,7 +165,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-plugins/streams-plugin-hbase/pom.xml
b/streams-plugins/streams-plugin-hbase/pom.xml
index f8cc43e2ce..e5099cb009 100644
--- a/streams-plugins/streams-plugin-hbase/pom.xml
+++ b/streams-plugins/streams-plugin-hbase/pom.xml
@@ -108,6 +108,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -156,7 +157,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-plugins/streams-plugin-hive/pom.xml
b/streams-plugins/streams-plugin-hive/pom.xml
index 5a1e10e2ef..193860b88a 100644
--- a/streams-plugins/streams-plugin-hive/pom.xml
+++ b/streams-plugins/streams-plugin-hive/pom.xml
@@ -110,6 +110,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -163,7 +164,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-plugins/streams-plugin-pig/pom.xml
b/streams-plugins/streams-plugin-pig/pom.xml
index 6df0600e93..cf03719ff3 100644
--- a/streams-plugins/streams-plugin-pig/pom.xml
+++ b/streams-plugins/streams-plugin-pig/pom.xml
@@ -108,6 +108,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -156,7 +157,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-plugins/streams-plugin-pojo/pom.xml
b/streams-plugins/streams-plugin-pojo/pom.xml
index cf877c4617..aeb857fbdf 100644
--- a/streams-plugins/streams-plugin-pojo/pom.xml
+++ b/streams-plugins/streams-plugin-pojo/pom.xml
@@ -101,11 +101,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -155,7 +156,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-plugins/streams-plugin-scala/pom.xml
b/streams-plugins/streams-plugin-scala/pom.xml
index 648fe0d79a..81dca12088 100644
--- a/streams-plugins/streams-plugin-scala/pom.xml
+++ b/streams-plugins/streams-plugin-scala/pom.xml
@@ -108,6 +108,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>${maven-plugin-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -156,7 +157,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven-plugin-plugin.version}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/streams-runtimes/streams-runtime-local/pom.xml
b/streams-runtimes/streams-runtime-local/pom.xml
index 56a3382dc6..966b7d5ea7 100644
--- a/streams-runtimes/streams-runtime-local/pom.xml
+++ b/streams-runtimes/streams-runtime-local/pom.xml
@@ -82,8 +82,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
index 13af233231..de8a275be1 100644
---
a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
+++
b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
@@ -69,7 +69,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
