You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/12/28 21:43:29 UTC
[incubator-streampipes] branch dev updated: [hotfix] Update some dependencies, cleanup dependency management
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 4383013 [hotfix] Update some dependencies, cleanup dependency management
new 54ce256 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
4383013 is described below
commit 4383013c66e6f43c5973db88a79abadb8c9fffb9
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Dec 28 22:43:12 2021 +0100
[hotfix] Update some dependencies, cleanup dependency management
---
pom.xml | 45 ++-
streampipes-backend/pom.xml | 4 +
.../api/ImplementationCodeGenerator.java | 2 +-
streampipes-commons/pom.xml | 6 +-
.../java/org/apache/streampipes/commons/Utils.java | 2 +-
.../commons/constants/InstanceIdExtractor.java | 2 +-
.../master/management/AdapterMasterManagement.java | 2 +-
.../connect/adapter/format/csv/CsvFormat.java | 2 +-
.../format/json/arraykey/JsonParserTest.java | 18 +-
.../json/arraynokey/JsonArrayParserTest.java | 20 +-
.../adapter/format/json/geojson/GeoJsonTest.java | 12 +-
.../format/json/object/JsonObjectParserTest.java | 18 +-
.../connect/adapter/format/json/xml/XmlTest.java | 18 +-
streampipes-container-base/pom.xml | 8 +-
streampipes-extensions/pom.xml | 62 +---
.../iiot/protocol/stream/KafkaProtocol.java | 14 +-
.../connect/iiot/protocol/stream/MqttProtocol.java | 7 +-
.../protocol/stream/pulsar/PulsarConsumer.java | 2 +-
.../streampipes-connect-adapters/pom.xml | 38 ---
.../streampipes/connect/ConnectAdapterInit.java | 1 -
.../connect/adapters/gdelt/GdeltAdapter.java | 2 +-
.../connect/protocol/stream/HDFSProtocol.java | 319 ---------------------
.../org/apache/streampipes/model/MessageLd.java | 2 +-
.../apache/streampipes/model/NotificationLd.java | 2 +-
.../org/apache/streampipes/model/SpDataStream.java | 2 +-
.../streampipes/model/util/ElementIdGenerator.java | 2 +-
.../manager/matching/DataSetGroundingSelector.java | 2 +-
.../streampipes/manager/util/TopicGenerator.java | 2 +-
streampipes-wrapper-kafka-streams/pom.xml | 6 +-
streampipes-wrapper-spark/pom.xml | 8 +-
.../wrapper/runtime/PipelineElementRuntime.java | 2 +-
31 files changed, 80 insertions(+), 552 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63beeca..cf7dc10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,21 +35,19 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dependency.locations.enabled>false</dependency.locations.enabled>
<maven.version>3.3.9</maven.version>
- <owasp.check.skip>true</owasp.check.skip>
+ <owasp.check.skip>false</owasp.check.skip>
- <activemq-client.version>5.16.0</activemq-client.version>
+ <activemq-client.version>5.16.3</activemq-client.version>
<asm.version>7.0</asm.version>
<byte-buddy.version>1.9.7</byte-buddy.version>
<cloning.version>1.9.12</cloning.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.version>
- <commons-io.version>2.6</commons-io.version>
- <commons-lang.version>2.3</commons-lang.version>
- <commons-lang3.version>3.8.1</commons-lang3.version>
+ <commons-io.version>2.11.0</commons-io.version>
+ <commons-lang3.version>3.12.0</commons-lang3.version>
<commons-logging.version>1.2</commons-logging.version>
<consul-client.version>1.5.2</consul-client.version>
<elasticsearch.version>6.6.2</elasticsearch.version>
- <empire-rdf4j.version>1.9.14</empire-rdf4j.version>
<flink.version>1.13.5</flink.version>
<fogsy-qudt.version>1.0</fogsy-qudt.version>
<fst.version>2.56</fst.version>
@@ -61,10 +59,12 @@
<httpcore-osgi.version>4.4.9</httpcore-osgi.version>
<influxdb.version>2.21</influxdb.version>
<j2html.version>1.4.0</j2html.version>
- <jackson.version>2.12.3</jackson.version>
+ <jackson.version>2.13.1</jackson.version>
<jakarta-annotation.version>1.3.5</jakarta-annotation.version>
+ <jakarta-activation-api.version>1.2.2</jakarta-activation-api.version>
<jakarta-mail.version>1.6.7</jakarta-mail.version>
<jakarta-validation.version>2.0.2</jakarta-validation.version>
+ <jakarta-xml-bind-api.version>2.3.3</jakarta-xml-bind-api.version>
<javapoet.version>1.6.1</javapoet.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-json.version>1.0.2</javax-json.version>
@@ -97,7 +97,7 @@
<rendersnake.version>1.8</rendersnake.version>
<retrofit.version>2.5.0</retrofit.version>
<shiro.version>1.7.0</shiro.version>
- <siddhi.version>5.1.16</siddhi.version>
+ <siddhi.version>5.1.20</siddhi.version>
<slf4j.version>1.7.30</slf4j.version>
<snakeyaml.version>1.26</snakeyaml.version>
<snappy-java.version>1.1.7.7</snappy-java.version>
@@ -105,7 +105,7 @@
<spring.version>5.3.13</spring.version>
<spring-boot.version>2.5.5</spring-boot.version>
<spring-security.version>5.6.0</spring-security.version>
- <swagger.version>2.1.6</swagger.version>
+ <swagger.version>2.1.11</swagger.version>
<type-parser.version>0.6.0</type-parser.version>
<underscore.version>1.47</underscore.version>
<wildfly-common.version>1.5.2.Final</wildfly-common.version>
@@ -123,7 +123,7 @@
<maven.dependency.plugin.version>3.1.1</maven.dependency.plugin.version>
<maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>
<maven.source.plugin.version>3.1.0</maven.source.plugin.version>
- <maven.dependency.check.plugin.version>5.2.2</maven.dependency.check.plugin.version>
+ <maven.dependency.check.plugin.version>6.5.1</maven.dependency.check.plugin.version>
<maven.shade.plugin.version>3.2.3</maven.shade.plugin.version>
</properties>
@@ -261,11 +261,6 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
@@ -321,6 +316,11 @@
<version>${swagger.version}</version>
</dependency>
<dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta-activation-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation.version}</version>
@@ -336,6 +336,11 @@
<version>${javax-annotation.version}</version>
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-xml-bind-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>${javax-persistence-api.version}</version>
@@ -762,16 +767,6 @@
</dependency>
<dependency>
<groupId>io.fogsy</groupId>
- <artifactId>empire-annotations</artifactId>
- <version>${empire-rdf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fogsy</groupId>
- <artifactId>empire-api</artifactId>
- <version>${empire-rdf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fogsy</groupId>
<artifactId>qudt</artifactId>
<version>${fogsy-qudt.version}</version>
</dependency>
diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml
index de22ee2..2197aba 100644
--- a/streampipes-backend/pom.xml
+++ b/streampipes-backend/pom.xml
@@ -93,6 +93,10 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-code-generation/src/main/java/org/apache/streampipes/codegeneration/api/ImplementationCodeGenerator.java b/streampipes-code-generation/src/main/java/org/apache/streampipes/codegeneration/api/ImplementationCodeGenerator.java
index f7295c4..ad39cfe 100644
--- a/streampipes-code-generation/src/main/java/org/apache/streampipes/codegeneration/api/ImplementationCodeGenerator.java
+++ b/streampipes-code-generation/src/main/java/org/apache/streampipes/codegeneration/api/ImplementationCodeGenerator.java
@@ -19,7 +19,7 @@
package org.apache.streampipes.codegeneration.api;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.commons.zip.ZipFileGenerator;
import org.apache.streampipes.model.base.ConsumableStreamPipesEntity;
import org.apache.streampipes.model.client.deployment.DeploymentConfiguration;
diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml
index 8505554..0992e71 100644
--- a/streampipes-commons/pom.xml
+++ b/streampipes-commons/pom.xml
@@ -36,12 +36,12 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/streampipes-commons/src/main/java/org/apache/streampipes/commons/Utils.java b/streampipes-commons/src/main/java/org/apache/streampipes/commons/Utils.java
index 9d4b71d..7c45e4f 100644
--- a/streampipes-commons/src/main/java/org/apache/streampipes/commons/Utils.java
+++ b/streampipes-commons/src/main/java/org/apache/streampipes/commons/Utils.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.commons;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import java.net.URI;
import java.util.ArrayList;
diff --git a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/InstanceIdExtractor.java b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/InstanceIdExtractor.java
index c8fef85..fdc4b74 100644
--- a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/InstanceIdExtractor.java
+++ b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/InstanceIdExtractor.java
@@ -17,7 +17,7 @@
*/
package org.apache.streampipes.commons.constants;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class InstanceIdExtractor {
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
index 0393e22..fc955bb 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.connect.container.master.management;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.commons.exceptions.NoServiceEndpointsAvailableException;
import org.apache.streampipes.commons.exceptions.SepaParseException;
import org.apache.streampipes.connect.adapter.GroundingService;
diff --git a/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/format/csv/CsvFormat.java b/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/format/csv/CsvFormat.java
index 4a40835..bfad4b0 100644
--- a/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/format/csv/CsvFormat.java
+++ b/streampipes-connect/src/main/java/org/apache/streampipes/connect/adapter/format/csv/CsvFormat.java
@@ -19,7 +19,7 @@
package org.apache.streampipes.connect.adapter.format.csv;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.streampipes.connect.api.IFormat;
import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
import org.apache.streampipes.connect.api.exception.ParseException;
diff --git a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java
index 50f6f24..72e1be0 100644
--- a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java
+++ b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java
@@ -18,19 +18,18 @@
package org.apache.streampipes.connect.adapter.format.json.arraykey;
-import static org.junit.Assert.assertEquals;
-import static org.apache.streampipes.connect.adapter.TestUtils.*;
-
import com.google.gson.JsonObject;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
import org.apache.streampipes.connect.api.exception.AdapterException;
+import org.junit.Test;
-import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import static org.apache.streampipes.connect.adapter.TestUtils.*;
+import static org.junit.Assert.assertEquals;
+
public class JsonParserTest {
@Test
@@ -89,13 +88,6 @@ public class JsonParserTest {
}
private InputStream getInputStream(String s) {
-
- try {
- return IOUtils.toInputStream(s, "UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
+ return IOUtils.toInputStream(s, "UTF-8");
}
}
diff --git a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java
index 6c6498c..19ad735 100644
--- a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java
+++ b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java
@@ -18,20 +18,19 @@
package org.apache.streampipes.connect.adapter.format.json.arraynokey;
-import static org.junit.Assert.assertEquals;
-import static org.apache.streampipes.connect.adapter.TestUtils.getJsonArrayWithThreeElements;
-import static org.apache.streampipes.connect.adapter.TestUtils.makeJsonObject;
-
import com.google.gson.JsonArray;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
import org.apache.streampipes.connect.api.exception.AdapterException;
+import org.junit.Test;
-import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import static org.apache.streampipes.connect.adapter.TestUtils.getJsonArrayWithThreeElements;
+import static org.apache.streampipes.connect.adapter.TestUtils.makeJsonObject;
+import static org.junit.Assert.assertEquals;
+
public class JsonArrayParserTest {
@Test
@@ -87,14 +86,7 @@ public class JsonArrayParserTest {
}
private InputStream getInputStream(String s) {
-
- try {
- return IOUtils.toInputStream(s, "UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
+ return IOUtils.toInputStream(s, "UTF-8");
}
}
diff --git a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/geojson/GeoJsonTest.java b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/geojson/GeoJsonTest.java
index 8eeaf8b..c03dfa6 100644
--- a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/geojson/GeoJsonTest.java
+++ b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/geojson/GeoJsonTest.java
@@ -19,12 +19,11 @@
package org.apache.streampipes.connect.adapter.format.json.geojson;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
import org.apache.streampipes.connect.adapter.format.geojson.GeoJsonParser;
import org.apache.streampipes.connect.api.exception.AdapterException;
import org.apache.streampipes.model.schema.EventSchema;
+import org.junit.Test;
-import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
@@ -114,14 +113,7 @@ public class GeoJsonTest {
}
private InputStream getInputStream(String s) {
-
- try {
- return IOUtils.toInputStream(s, "UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
+ return IOUtils.toInputStream(s, "UTF-8");
}
private String getOneEventExampleMultiPolygon() {
diff --git a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java
index a322a87..e0e42aa 100644
--- a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java
+++ b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java
@@ -18,19 +18,18 @@
package org.apache.streampipes.connect.adapter.format.json.object;
-import static org.junit.Assert.assertEquals;
-import static org.apache.streampipes.connect.adapter.TestUtils.makeJsonObject;
-
import com.google.gson.JsonObject;
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
import org.apache.streampipes.connect.api.exception.AdapterException;
+import org.junit.Test;
-import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import static org.apache.streampipes.connect.adapter.TestUtils.makeJsonObject;
+import static org.junit.Assert.assertEquals;
+
public class JsonObjectParserTest {
@Test
@@ -64,13 +63,6 @@ public class JsonObjectParserTest {
}
private InputStream getInputStream(String s) {
-
- try {
- return IOUtils.toInputStream(s, "UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
+ return IOUtils.toInputStream(s, "UTF-8");
}
}
diff --git a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/xml/XmlTest.java b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/xml/XmlTest.java
index d569210..2d70d8b 100644
--- a/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/xml/XmlTest.java
+++ b/streampipes-connect/src/test/java/org/apache/streampipes/connect/adapter/format/json/xml/XmlTest.java
@@ -18,15 +18,12 @@
package org.apache.streampipes.connect.adapter.format.json.xml;
-import static org.junit.Assert.assertEquals;
-
import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.apache.streampipes.connect.api.exception.AdapterException;
import org.apache.streampipes.connect.adapter.format.xml.XmlParser;
+import org.apache.streampipes.connect.api.exception.AdapterException;
import org.apache.streampipes.model.schema.EventSchema;
+import org.junit.Test;
-import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
@@ -34,6 +31,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import static org.junit.Assert.assertEquals;
+
public class XmlTest {
@Test
@@ -114,14 +113,7 @@ public class XmlTest {
*/
private InputStream getInputStream(String s) {
-
- try {
- return IOUtils.toInputStream(s, "UTF-8");
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
+ return IOUtils.toInputStream(s, "UTF-8");
}
private String getCarParkExample() {
diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml
index 2759f51..b849815 100644
--- a/streampipes-container-base/pom.xml
+++ b/streampipes-container-base/pom.xml
@@ -50,10 +50,6 @@
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
<exclusions>
@@ -74,6 +70,10 @@
<!--dependency convergence-->
<dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</dependency>
diff --git a/streampipes-extensions/pom.xml b/streampipes-extensions/pom.xml
index 4a3c99f..2b6cb29 100644
--- a/streampipes-extensions/pom.xml
+++ b/streampipes-extensions/pom.xml
@@ -83,9 +83,7 @@
<google-maps-services.version>0.10.0</google-maps-services.version>
<graalvm.js.version>21.3.0</graalvm.js.version>
<iotdb.version>0.12.0</iotdb.version>
- <jackson.version>2.10.0</jackson.version>
<java-websocket.version>1.4.0</java-websocket.version>
- <javax-validation.version>2.0.1.Final</javax-validation.version>
<javax-websocket-client-api.version>1.1</javax-websocket-client-api.version>
<jsrosbridge.version>0.2.0</jsrosbridge.version>
<jedis.version>3.3.0</jedis.version>
@@ -106,8 +104,6 @@
<snakeyaml.version>1.25</snakeyaml.version>
<xerces.version>2.9.1</xerces.version>
<zstd-jni.version>1.4.3-1</zstd-jni.version>
- <mqtt-client.version>1.12</mqtt-client.version>
- <hawtbuf.version>1.11</hawtbuf.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
<maven.javadoc.plugin.version>3.1.1</maven.javadoc.plugin.version>
@@ -121,18 +117,16 @@
<commons-text.version>1.8</commons-text.version>
<errorprone-annotations.version>2.2.0</errorprone-annotations.version>
<java-websocket.version>1.4.0</java-websocket.version>
- <javax-validation.version>2.0.1.Final</javax-validation.version>
<javax-websocket-client-api.version>1.1</javax-websocket-client-api.version>
<jcl-over-slf4j.version>1.7.30</jcl-over-slf4j.version>
<jsrosbridge.version>0.2.0</jsrosbridge.version>
<influxdb.java.version>2.14</influxdb.java.version>
- <hadoop.version>3.2.1</hadoop.version>
<eclipse.milo.version>0.5.3</eclipse.milo.version>
<mysql-binlog-connector.version>0.18.1</mysql-binlog-connector.version>
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
<netty.version>4.1.39.Final</netty.version>
<nimbus-jose-jwt.version>4.41.1</nimbus-jose-jwt.version>
- <opencsv.version>4.6</opencsv.version>
+ <opencsv.version>5.5.2</opencsv.version>
<plc4x.version>0.8.0</plc4x.version>
<protobuf.version>3.6.1</protobuf.version>
<nats.version>2.11.0</nats.version>
@@ -208,45 +202,6 @@
<version>${influxdb.java.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jetty-server</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlet</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlets</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-webapp</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-util</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>sdk-client</artifactId>
<version>${eclipse.milo.version}</version>
@@ -339,11 +294,6 @@
<version>${errorprone-annotations.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-sse</artifactId>
<version>${jersey.version}</version>
@@ -512,16 +462,6 @@
<version>${xerces.version}</version>
</dependency>
<dependency>
- <groupId>org.fusesource.mqtt-client</groupId>
- <artifactId>mqtt-client</artifactId>
- <version>${mqtt-client.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.hawtbuf</groupId>
- <artifactId>hawtbuf</artifactId>
- <version>${hawtbuf.version}</version>
- </dependency>
- <dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/KafkaProtocol.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/KafkaProtocol.java
index 5c997ce..3b2d561 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/KafkaProtocol.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/KafkaProtocol.java
@@ -33,7 +33,6 @@ import org.apache.streampipes.connect.api.IAdapterPipeline;
import org.apache.streampipes.connect.api.IFormat;
import org.apache.streampipes.connect.api.IParser;
import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.pe.shared.config.kafka.*;
import org.apache.streampipes.container.api.ResolvesContainerProvidedOptions;
import org.apache.streampipes.messaging.InternalEventProcessor;
import org.apache.streampipes.messaging.kafka.SpKafkaConsumer;
@@ -42,6 +41,8 @@ import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
import org.apache.streampipes.model.grounding.KafkaTransportProtocol;
import org.apache.streampipes.model.grounding.SimpleTopicDefinition;
import org.apache.streampipes.model.staticproperty.Option;
+import org.apache.streampipes.pe.shared.config.kafka.KafkaConfig;
+import org.apache.streampipes.pe.shared.config.kafka.KafkaConnectUtils;
import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
import org.apache.streampipes.sdk.extractor.StaticPropertyExtractor;
import org.apache.streampipes.sdk.helpers.AdapterSourceType;
@@ -50,7 +51,6 @@ import org.apache.streampipes.sdk.utils.Assets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.stream.Collectors;
@@ -130,13 +130,9 @@ public class KafkaProtocol extends BrokerProtocol implements ResolvesContainerPr
consumer.poll(1000);
consumerRecords.forEach(record -> {
- try {
- InputStream inputStream = IOUtils.toInputStream(record.value(), "UTF-8");
+ InputStream inputStream = IOUtils.toInputStream(record.value(), "UTF-8");
- nEventsByte.addAll(parser.parseNEvents(inputStream, n));
- } catch (IOException e) {
- e.printStackTrace();
- }
+ nEventsByte.addAll(parser.parseNEvents(inputStream, n));
});
if (nEventsByte.size() > n) {
@@ -279,8 +275,6 @@ public class KafkaProtocol extends BrokerProtocol implements ResolvesContainerPr
public void onEvent(byte[] payload) {
try {
parser.parse(IOUtils.toInputStream(new String(payload), "UTF-8"), stk);
- } catch (IOException e) {
- logger.error("Adapter " + ID + " could not read value!",e);
} catch (ParseException e) {
logger.error("Error while parsing: " + e.getMessage());
}
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/MqttProtocol.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/MqttProtocol.java
index 1f1cd4a..9cc2806 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/MqttProtocol.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/MqttProtocol.java
@@ -24,17 +24,18 @@ import org.apache.streampipes.connect.api.IAdapterPipeline;
import org.apache.streampipes.connect.api.IFormat;
import org.apache.streampipes.connect.api.IParser;
import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.pe.shared.config.mqtt.*;
import org.apache.streampipes.messaging.InternalEventProcessor;
import org.apache.streampipes.model.AdapterType;
import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
+import org.apache.streampipes.pe.shared.config.mqtt.MqttConfig;
+import org.apache.streampipes.pe.shared.config.mqtt.MqttConnectUtils;
+import org.apache.streampipes.pe.shared.config.mqtt.MqttConsumer;
import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
import org.apache.streampipes.sdk.extractor.StaticPropertyExtractor;
import org.apache.streampipes.sdk.helpers.AdapterSourceType;
import org.apache.streampipes.sdk.helpers.Locales;
import org.apache.streampipes.sdk.utils.Assets;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -128,7 +129,7 @@ public class MqttProtocol extends BrokerProtocol {
public void onEvent(byte[] payload) {
try {
parser.parse(IOUtils.toInputStream(new String(payload), "UTF-8"), stk);
- } catch (IOException | ParseException e) {
+ } catch (ParseException e) {
e.printStackTrace();
//logger.error("Adapter " + ID + " could not read value!",e);
}
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/pulsar/PulsarConsumer.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/pulsar/PulsarConsumer.java
index 47e4fee..750ec3b 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/pulsar/PulsarConsumer.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/protocol/stream/pulsar/PulsarConsumer.java
@@ -17,7 +17,7 @@
*/
package org.apache.streampipes.connect.iiot.protocol.stream.pulsar;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.PulsarClient;
diff --git a/streampipes-extensions/streampipes-connect-adapters/pom.xml b/streampipes-extensions/streampipes-connect-adapters/pom.xml
index 5615771..dbc70ab 100644
--- a/streampipes-extensions/streampipes-connect-adapters/pom.xml
+++ b/streampipes-extensions/streampipes-connect-adapters/pom.xml
@@ -104,44 +104,6 @@
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jetty-server</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlet</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-servlets</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-webapp</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jetty-util</artifactId>
- <groupId>org.eclipse.jetty</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
</dependency>
diff --git a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
index 035e33f..78423b8 100644
--- a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
+++ b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/ConnectAdapterInit.java
@@ -61,7 +61,6 @@ public class ConnectAdapterInit extends ExtensionsModelSubmitter {
.registerAdapter(new IssAdapter())
.registerAdapter(new FlicMQTTAdapter())
.registerAdapter(new TISensorTag())
-// .registerAdapter(new HDFSProtocol())
.build();
}
diff --git a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
index 3daf6b1..e2d5931 100644
--- a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
+++ b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/adapters/gdelt/GdeltAdapter.java
@@ -89,7 +89,7 @@ public class GdeltAdapter extends PullAdapter {
ZipInputStream zipInputStream = new ZipInputStream(zipFileUrl.openStream());
BufferedReader zipBufferedReader = new BufferedReader(new InputStreamReader(zipInputStream));
zipInputStream.getNextEntry();
- CSVReader csvReader = new CSVReader(zipBufferedReader, '\t', '"');
+ CSVReader csvReader = new CSVReader(zipBufferedReader);
String[] nextRecord;
while ((nextRecord = csvReader.readNext()) != null) {
diff --git a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java b/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
deleted file mode 100644
index 2c9f6d4..0000000
--- a/streampipes-extensions/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/protocol/stream/HDFSProtocol.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.connect.protocol.stream;
-
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.*;
-import org.apache.streampipes.connect.SendToPipeline;
-import org.apache.streampipes.connect.adapter.guess.SchemaGuesser;
-import org.apache.streampipes.connect.adapter.model.generic.Protocol;
-import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
-import org.apache.streampipes.connect.api.IAdapterPipeline;
-import org.apache.streampipes.connect.api.IFormat;
-import org.apache.streampipes.connect.api.IParser;
-import org.apache.streampipes.connect.api.exception.ParseException;
-import org.apache.streampipes.model.AdapterType;
-import org.apache.streampipes.model.connect.grounding.ProtocolDescription;
-import org.apache.streampipes.model.connect.guess.GuessSchema;
-import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.sdk.builder.adapter.ProtocolDescriptionBuilder;
-import org.apache.streampipes.sdk.helpers.AdapterSourceType;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.*;
-import java.util.stream.Collectors;
-
-public class HDFSProtocol extends Protocol {
-
- public static final String ID = "org.apache.streampipes.connect.protocol.stream.HDFS";
-
- private static String INTERVAL_PROPERTY = "intervalProperty";
- private static String URL_PROPERTY = "urlProperty";
- private static String USER_PROPERTY = "userProperty";
- private static String PASSWORD_PROPERTY = "passwordProperty";
- private static String DATA_PATH_PROPERTY = "dataPathProperty";
- private static String RECURSIVELY_PROPERTY = "recursively";
- private static String OPTIONS = "optionsFile";
-
- private long intervalProperty;
- private String dataPathProperty;
- private String urlProperty;
- private String userProperty;
- private String passwordProperty;
- private boolean recursively;
-
- private ScheduledExecutorService scheduler;
- private Logger logger = LoggerFactory.getLogger(HDFSProtocol.class);
-
- private long knownNewestFileDate;
-
- public HDFSProtocol() {
-
- }
-
- public HDFSProtocol(IParser parser, IFormat format, long intervalProperty, String dataPathProperty, String urlProperty, boolean recursively) {
- super(parser, format);
- this.intervalProperty = intervalProperty;
- this.dataPathProperty = dataPathProperty;
- this.urlProperty = urlProperty;
- this.recursively = recursively;
- }
-
- @Override
- public Protocol getInstance(ProtocolDescription protocolDescription, IParser parser, IFormat format) {
- ParameterExtractor extractor = new ParameterExtractor(protocolDescription.getConfig());
- long intervalProperty = Long.parseLong(extractor.singleValue(INTERVAL_PROPERTY));
- String urlProperty = extractor.singleValue(URL_PROPERTY);
- // String userProperty = extractor.singleValue(USER_PROPERTY);
- // String passwordProperty = extractor.singleValue(PASSWORD_PROPERTY);
- String dataPathProperty = extractor.singleValue(DATA_PATH_PROPERTY);
-
-// boolean recursively = extractor.selectedMultiValues(RECURSIVELY_PROPERTY).stream()
-// .anyMatch(o -> o.equals("recursively"));
-
- return new HDFSProtocol(parser, format, intervalProperty, dataPathProperty, urlProperty, recursively);
-
- }
-
- @Override
- public ProtocolDescription declareModel() {
- return ProtocolDescriptionBuilder.create(ID, "HDFS", "Reads messages from the Hadoop " +
- "Distributed File" +
- " System")
- .sourceType(AdapterSourceType.STREAM)
- .iconUrl("hdfs.png")
- .category(AdapterType.Generic)
- .requiredTextParameter(Labels.from(URL_PROPERTY, "HDFS-Server",
- "Example: hdfs://server:8020"))
- .requiredIntegerParameter(Labels.from(INTERVAL_PROPERTY, "Interval", "Polling interval in seconds"))
- .requiredTextParameter(Labels.from(DATA_PATH_PROPERTY, "Data Path",
- "The Data Path to watch"))
-// .requiredTextParameter(Labels.from(USER_PROPERTY, "Username", "The Username to " +
-// "login"))
-// .requiredTextParameter(Labels.from(PASSWORD_PROPERTY, "Password","The Password to" +
-// " login"))
- .build();
- }
-
- @Override
- public GuessSchema getGuessSchema() throws ParseException {
- int n = 2;
- GuessSchema result = null;
-
- InputStream inputStream = getInputStreamFromFile(getFiles().get(0));
-
- List<byte[]> dataByte = parser.parseNEvents(inputStream, n);
- if (dataByte.size() < n) {
- logger.error("Error in HDFS Protocol! Required: " + n + " elements but the resource just had: " +
- dataByte.size());
-
- dataByte.addAll(dataByte);
- }
- EventSchema eventSchema = parser.getEventSchema(dataByte);
- result = SchemaGuesser.guessSchma(eventSchema);
-
-
- return result;
- }
-
- @Override
- public List<Map<String, Object>> getNElements(int n) throws ParseException {
- List<Map<String, Object>> result = new ArrayList<>();
-
- InputStream inputStream = getInputStreamFromFile(getFiles().get(0));
-
- List<byte[]> dataByte = parser.parseNEvents(inputStream, n);
-
- // Check that result size is n. Currently just an error is logged. Maybe change to an exception
- if (dataByte.size() < n) {
- logger.error("Error in HDFS Protocol! User required: " + n + " elements but the resource just had: " +
- dataByte.size());
- }
-
- for (byte[] b : dataByte) {
- result.add(format.parse(b));
- }
-
- return result;
-
- }
-
- @Override
- public void run(IAdapterPipeline adapterPipeline) {
- logger.info("Start HDFS Adapter");
-
- this.knownNewestFileDate = 0;
-
- final Runnable errorThread = () -> {
- executeProtocolLogic(adapterPipeline);
- };
-
-
- scheduler = Executors.newScheduledThreadPool(1);
- scheduler.schedule(errorThread, 0, TimeUnit.MILLISECONDS);
- }
-
-
- private void executeProtocolLogic(IAdapterPipeline adapterPipeline) {
- final Runnable task = () -> {
- SendToPipeline stk = new SendToPipeline(format, adapterPipeline);
-
- List<LocatedFileStatus> files = getFiles(this.knownNewestFileDate);
- if (files.size() > 0) {
- this.knownNewestFileDate = files.get(files.size() - 1).getModificationTime();
- logger.info("+++ New files found, newest file Date: " + this.knownNewestFileDate + " (in milliseconds form 1970)");
- } else
- logger.info("No new files found");
- try {
- files.forEach(file -> parser.parse(getInputStreamFromFile(file), stk));
- } catch (ParseException e) {
- logger.error("Error while parsing: " + e.getMessage());
- }
- };
-
-
- scheduler = Executors.newScheduledThreadPool(1);
- ScheduledFuture<?> handle = scheduler.scheduleAtFixedRate(task, 1, this.intervalProperty, TimeUnit.SECONDS);
- try {
- handle.get();
- } catch (ExecutionException e ) {
- logger.error("Error", e);
- } catch (InterruptedException e) {
- logger.error("Error", e);
- }
- }
-
-
- @Override
- public void stop() {
- scheduler.shutdownNow();
- }
-
- @Override
- public String getId() {
- return ID;
- }
-
-
- private List<LocatedFileStatus> getFiles(long startDate) {
- List<LocatedFileStatus> files = getFiles();
-
- files = files
- .parallelStream()
- .filter(ftpFile -> ftpFile.getModificationTime() > startDate)
- .sorted(((o1, o2) -> (((Long) o2.getModificationTime()).compareTo((Long) (o1.getModificationTime())))))
- .collect(Collectors.toList());
-
- return files;
-
- }
-
- public List<LocatedFileStatus> getFiles() {
- List<LocatedFileStatus> files = new ArrayList<>();
-
- FileSystem fs = getFilesSystem();
- Path hdfsreadpath = new Path(this.dataPathProperty);
-
- RemoteIterator<LocatedFileStatus> iter = null;
- try {
- iter = fs.listFiles(hdfsreadpath, this.recursively);
- while (iter.hasNext())
- files.add(iter.next());
- } catch (IOException e) {
- logger.error(e.toString());
- } finally {
- try {
- fs.close();
- } catch (IOException e) {
- logger.error(e.toString());
- }
- }
- return files;
- }
-
-
- public static List<String> getFileNames(FileSystem fs, String route) throws IOException {
- List<String> result = new ArrayList<>();
-
- if (route.endsWith("/")) {
- Path tmp = new Path(route);
- RemoteIterator<LocatedFileStatus> i = fs.listFiles(tmp, false);
-
- while (i.hasNext()) {
- String path = i.next().getPath().toString();
- if (path.endsWith("/")) {
- result.addAll(getFileNames(fs, path));
- } else {
- result.add(path);
- }
- }
- } else {
- result.add(route);
- }
-
- return result;
- }
-
- private FileSystem getFilesSystem() {
- FileSystem fs = null;
- Configuration conf = getConfigutation();
-
- try {
- fs = FileSystem.get(URI.create(this.urlProperty), conf);
- } catch (IOException e) {
- logger.error(e.toString());
- }
- return fs;
- }
-
- private Configuration getConfigutation() {
- Configuration conf = new Configuration();
- conf.set("fs.defaultFS", this.urlProperty);
- conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
- conf.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class.getName());
- conf.set("dfs.client.use.datanode.hostname", "true");
- System.setProperty("HADOOP_USER_NAME", "hdfs");
- System.setProperty("hadoop.home.dir", "/");
-
- return conf;
- }
-
- private FSDataInputStream getInputStreamFromFile(LocatedFileStatus locatedFileStatus) throws ParseException {
- FileSystem fs = getFilesSystem();
- FSDataInputStream inputStream = null;
- try {
- inputStream = fs.open(locatedFileStatus.getPath());
- } catch (IOException e) {
- if (inputStream == null)
- throw new ParseException(e.getMessage());
- }
- return inputStream;
- }
-
-
-}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java b/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java
index 67529e4..61b3cd8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/MessageLd.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.model;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java b/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java
index 7cbb272..7b6b7b8 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/NotificationLd.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.model;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
public class NotificationLd {
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
index d6bee84..2205c3a 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/SpDataStream.java
@@ -19,7 +19,7 @@
package org.apache.streampipes.model;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
import org.apache.streampipes.model.grounding.EventGrounding;
import org.apache.streampipes.model.quality.EventStreamQualityDefinition;
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java b/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java
index 95aed3f..174ddb6 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/util/ElementIdGenerator.java
@@ -17,7 +17,7 @@
*/
package org.apache.streampipes.model.util;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
public class ElementIdGenerator {
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java
index 549ec4d..8367eb1 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/matching/DataSetGroundingSelector.java
@@ -17,7 +17,7 @@
*/
package org.apache.streampipes.manager.matching;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.config.backend.BackendConfig;
import org.apache.streampipes.config.backend.SpProtocol;
import org.apache.streampipes.manager.util.TopicGenerator;
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/TopicGenerator.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/TopicGenerator.java
index 62ca17f..a8a8af7 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/TopicGenerator.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/TopicGenerator.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.manager.util;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
public class TopicGenerator {
diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml
index a1a29c3..ab822fd 100644
--- a/streampipes-wrapper-kafka-streams/pom.xml
+++ b/streampipes-wrapper-kafka-streams/pom.xml
@@ -27,10 +27,6 @@
<artifactId>streampipes-wrapper-kafka-streams</artifactId>
- <properties>
- <jackson.version>2.7.4</jackson.version>
- </properties>
-
<dependencies>
<!-- StreamPipes dependencies -->
<dependency>
@@ -63,4 +59,4 @@
</exclusions>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml
index fbe299e..939de7a 100644
--- a/streampipes-wrapper-spark/pom.xml
+++ b/streampipes-wrapper-spark/pom.xml
@@ -29,7 +29,7 @@
<artifactId>streampipes-wrapper-spark</artifactId>
<properties>
- <spark.version>2.4.4</spark.version>
+ <spark.version>2.4.8</spark.version>
</properties>
<dependencyManagement>
@@ -142,10 +142,6 @@
<artifactId>activation</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
</dependency>
@@ -205,4 +201,4 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElementRuntime.java b/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElementRuntime.java
index 08f2751..84577d9 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElementRuntime.java
+++ b/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElementRuntime.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.wrapper.runtime;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
import org.apache.streampipes.commons.exceptions.SpRuntimeException;
public abstract class PipelineElementRuntime {