From 83bd6d0c9bed7e5bca6ecb1fd6a9814f105a1eef Mon Sep 17 00:00:00 2001 From: zehnder Date: Wed, 4 Sep 2019 17:11:22 +0000 Subject: [PATCH 01/24] [RELEASE] [skip-ci]updating poms for 0.63.1-SNAPSHOT development --- .../streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 5 ++--- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container-master/pom.xml | 6 ++---- streampipes-connect-container-worker/pom.xml | 6 ++---- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 5 ++--- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-cbor/pom.xml | 6 ++---- streampipes-dataformat-fst/pom.xml | 6 ++---- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat-smile/pom.xml | 6 ++---- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 52 files changed, 59 insertions(+), 71 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index fdb430ad65..c1216e499d 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index eb1bd7a8dd..1d50e08ff1 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index eacfd17ee0..be98d15d4a 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 981f604783..899fb786eb 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 45170095a5..1f29fc5dc2 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index 0050d22b26..8336a61b8a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,13 +16,12 @@ ~ --> - + 4.0.0 org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index ee6ca0f311..a7a4df490b 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index ae392d2b7c..7424fe98aa 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-backend jar diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index 6d76c0e457..27d4380ef0 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index 1b28257b08..5136ee1aaf 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 6466a018fb..7e29cfe2d4 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index c14e093eb5..8a470f7ef1 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -1,11 +1,9 @@ - + streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index 6ba337887e..cb4b2525e2 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -1,11 +1,9 @@ - + streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index 0825413076..a47a291933 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 23ae6a67bc..67f7037fff 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -1,10 +1,9 @@ - + org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index a5c60b6204..0b8fd55301 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index 3b418eb79a..624be3cd4c 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 1c2365537e..2a20671c5b 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-cbor/pom.xml b/streampipes-dataformat-cbor/pom.xml index b0ae0174c0..dbb03a01da 100644 --- a/streampipes-dataformat-cbor/pom.xml +++ b/streampipes-dataformat-cbor/pom.xml @@ -1,11 +1,9 @@ - + streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-fst/pom.xml b/streampipes-dataformat-fst/pom.xml index 3518c472fe..172ddf99b4 100644 --- a/streampipes-dataformat-fst/pom.xml +++ b/streampipes-dataformat-fst/pom.xml @@ -1,11 +1,9 @@ - + streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index 1bff70e8fe..e879367b77 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-smile/pom.xml b/streampipes-dataformat-smile/pom.xml index 2dc0a2c5ed..3255ff5366 100644 --- a/streampipes-dataformat-smile/pom.xml +++ b/streampipes-dataformat-smile/pom.xml @@ -1,11 +1,9 @@ - + streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index ef60e757f7..f10dab5ff5 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index 8b8413ad46..c53e432d33 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 0d09977a91..82bcd02182 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index 7ce462e31e..bec6304b85 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index 5a4f59acfe..0dbf66d31f 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 6826346849..73a8e5c73d 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 27c99cc569..2afd524a12 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index e763fcf60e..7539ef49c2 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index 1cc28edcfa..4dfd74e4d2 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 04c5f053dc..4ba18a45be 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 38ae3386b8..4d4ae55eb7 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 04c2cda56b..5204307eef 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index cdc5100ab3..04c4e95535 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index f3b2f49155..18978ca77c 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index cc9a57a190..173246abed 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index d909f8d8c6..3da61fff8a 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index 09da048eb7..0da3c6f5eb 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index 4c4e2751b1..55c350cecf 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 533d66a7a7..8fda6ce49a 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 6468ad976a..9e3a5e3929 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index e26d60d0bf..e92f8b5783 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index 5848e71f5d..a8d3adc491 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index c57fd60283..58bc32f679 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index fca8bef9d9..4890d09425 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 3b194a02da..6de3050bd0 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index ff00af8349..1e527e22da 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index 7d1e37fe7e..3efbb20395 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index 0dba75dc06..95ccda3160 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index bb35ee9377..31ea7823df 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 6494ce8d67..8fd44dd2d0 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT streampipes-wrapper From 108b53a5bed9e741de9a79e6935c41d51fd5dfbf Mon Sep 17 00:00:00 2001 From: zehnder Date: Thu, 5 Sep 2019 06:03:20 +0000 Subject: [PATCH 02/24] [RELEASE] [skip-ci]updating develop poms to master versions to avoid merge conflicts --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container-master/pom.xml | 2 +- streampipes-connect-container-worker/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-cbor/pom.xml | 2 +- streampipes-dataformat-fst/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat-smile/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index c1216e499d..1957938600 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 1d50e08ff1..b2536a5813 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index be98d15d4a..70cd542982 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 899fb786eb..299651c895 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 1f29fc5dc2..8eb3a32057 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index 8336a61b8a..a143e91851 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index a7a4df490b..7b810cbc33 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 7424fe98aa..b9e6ae6d0c 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-backend jar diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index 27d4380ef0..61a894ff53 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index 5136ee1aaf..edc5cfa361 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 7e29cfe2d4..1237ad62c5 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index 8a470f7ef1..49f1d670f0 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index cb4b2525e2..94b0fc8009 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index a47a291933..373f03ce96 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 67f7037fff..d483615e74 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 0b8fd55301..fc44c77951 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index 624be3cd4c..b4547335e9 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 2a20671c5b..ad7f7da19d 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-cbor/pom.xml b/streampipes-dataformat-cbor/pom.xml index dbb03a01da..767c53754f 100644 --- a/streampipes-dataformat-cbor/pom.xml +++ b/streampipes-dataformat-cbor/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-dataformat-fst/pom.xml b/streampipes-dataformat-fst/pom.xml index 172ddf99b4..475af659f3 100644 --- a/streampipes-dataformat-fst/pom.xml +++ b/streampipes-dataformat-fst/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index e879367b77..81febf7660 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-dataformat-smile/pom.xml b/streampipes-dataformat-smile/pom.xml index 3255ff5366..cfe4dcd2c2 100644 --- a/streampipes-dataformat-smile/pom.xml +++ b/streampipes-dataformat-smile/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index f10dab5ff5..44a61d8d5d 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index c53e432d33..78ad84acd4 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 82bcd02182..5e685dedc3 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index bec6304b85..ebc9bfa587 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index 0dbf66d31f..fbec3ad056 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 73a8e5c73d..da066bc8ff 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 2afd524a12..3cf73e49e8 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index 7539ef49c2..6976632630 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index 4dfd74e4d2..c516c8ec14 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 4ba18a45be..0b04d0764a 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 4d4ae55eb7..fe18689cbc 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 5204307eef..94d2028563 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 04c4e95535..fcb6084050 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index 18978ca77c..2c6b6efe58 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index 173246abed..4e44ab22ed 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index 3da61fff8a..8cc83c1a23 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index 0da3c6f5eb..9518f6c4a8 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index 55c350cecf..e85ba56171 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 8fda6ce49a..aef0274d4f 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 9e3a5e3929..ee003336ed 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index e92f8b5783..20dbdfae7c 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index a8d3adc491..f4255ad269 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 58bc32f679..7ad01f1359 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index 4890d09425..e68e2a5255 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 6de3050bd0..1b6322bc57 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 1e527e22da..f80a5dc3b8 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index 3efbb20395..7da1e05d42 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.63.0 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index 95ccda3160..6161037d22 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index 31ea7823df..bc27ac1b17 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 8fd44dd2d0..afc327ef6d 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.63.0 streampipes-wrapper From 0a731d97b6d7b20659dcb699bba74d2b3fe19184 Mon Sep 17 00:00:00 2001 From: zehnder Date: Thu, 5 Sep 2019 06:03:23 +0000 Subject: [PATCH 03/24] [RELEASE] [skip-ci]Updating develop poms back to pre merge state --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container-master/pom.xml | 2 +- streampipes-connect-container-worker/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-cbor/pom.xml | 2 +- streampipes-dataformat-fst/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat-smile/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-esper/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index 1957938600..c1216e499d 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index b2536a5813..1d50e08ff1 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 70cd542982..be98d15d4a 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 299651c895..899fb786eb 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 8eb3a32057..1f29fc5dc2 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -4,7 +4,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index a143e91851..8336a61b8a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index 7b810cbc33..a7a4df490b 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index b9e6ae6d0c..7424fe98aa 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-backend jar diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index 61a894ff53..27d4380ef0 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index edc5cfa361..5136ee1aaf 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 1237ad62c5..7e29cfe2d4 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index 49f1d670f0..8a470f7ef1 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index 94b0fc8009..cb4b2525e2 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index 373f03ce96..a47a291933 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index d483615e74..67f7037fff 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -3,7 +3,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index fc44c77951..0b8fd55301 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index b4547335e9..624be3cd4c 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index ad7f7da19d..2a20671c5b 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-cbor/pom.xml b/streampipes-dataformat-cbor/pom.xml index 767c53754f..dbb03a01da 100644 --- a/streampipes-dataformat-cbor/pom.xml +++ b/streampipes-dataformat-cbor/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-fst/pom.xml b/streampipes-dataformat-fst/pom.xml index 475af659f3..172ddf99b4 100644 --- a/streampipes-dataformat-fst/pom.xml +++ b/streampipes-dataformat-fst/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index 81febf7660..e879367b77 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-smile/pom.xml b/streampipes-dataformat-smile/pom.xml index cfe4dcd2c2..3255ff5366 100644 --- a/streampipes-dataformat-smile/pom.xml +++ b/streampipes-dataformat-smile/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index 44a61d8d5d..f10dab5ff5 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index 78ad84acd4..c53e432d33 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 5e685dedc3..82bcd02182 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index ebc9bfa587..bec6304b85 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index fbec3ad056..0dbf66d31f 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index da066bc8ff..73a8e5c73d 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 3cf73e49e8..2afd524a12 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index 6976632630..7539ef49c2 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index c516c8ec14..4dfd74e4d2 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 0b04d0764a..4ba18a45be 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index fe18689cbc..4d4ae55eb7 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 94d2028563..5204307eef 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index fcb6084050..04c4e95535 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index 2c6b6efe58..18978ca77c 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index 4e44ab22ed..173246abed 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index 8cc83c1a23..3da61fff8a 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index 9518f6c4a8..0da3c6f5eb 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index e85ba56171..55c350cecf 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index aef0274d4f..8fda6ce49a 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index ee003336ed..9e3a5e3929 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index 20dbdfae7c..e92f8b5783 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index f4255ad269..a8d3adc491 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 7ad01f1359..58bc32f679 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml index e68e2a5255..4890d09425 100644 --- a/streampipes-wrapper-esper/pom.xml +++ b/streampipes-wrapper-esper/pom.xml @@ -3,7 +3,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 1b6322bc57..6de3050bd0 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index f80a5dc3b8..1e527e22da 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index 7da1e05d42..3efbb20395 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.0 + 0.63.1-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index 6161037d22..95ccda3160 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index bc27ac1b17..31ea7823df 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index afc327ef6d..8fd44dd2d0 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.0 + 0.63.1-SNAPSHOT streampipes-wrapper From bf89ac434315bf8682279192621754659905b9ac Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 5 Sep 2019 22:19:54 +0200 Subject: [PATCH 04/24] Modify README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81ab072901..1c08d27f54 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Travis Badge](https://travis-ci.org/streampipes/streampipes-ce.svg?branch=dev)](https://travis-ci.org/streampipes/streampipes-ce.svg?branch=dev) +[![Travis Badge](https://travis-ci.org/streampipes/streampipes.svg?branch=dev)](https://travis-ci.org/streampipes/streampipes.svg?branch=dev) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/34a7e26be4fc4fa284ee5201b6d386ea)](https://www.codacy.com/app/dominikriemer/streampipes-ce?utm_source=github.com&utm_medium=referral&utm_content=streampipes/streampipes-ce&utm_campaign=Badge_Grade) [![Docker pulls](https://img.shields.io/docker/pulls/streampipes/backend.svg)](https://hub.docker.com/r/streampipes/backend/) [![Maven central](https://img.shields.io/maven-central/v/org.streampipes/streampipes-backend.svg)](https://img.shields.io/maven-central/v/org.streampipes/streampipes-backend.svg) From acfe52c8160e81b0c741873695a0e5b9d4791acf Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Tue, 17 Sep 2019 21:43:14 +0200 Subject: [PATCH 05/24] Delete some unused files --- archetypes/command | 6 - package-lock.json | 3 - streampipes-wrapper-storm/pom.xml | 88 ----------- .../cep/sepa/storm/config/StormConfig.java | 14 -- .../cep/sepa/storm/messaging/KafkaSender.java | 51 ------- .../sepa/storm/topology/KafkaSepaSpout.java | 5 - .../cep/sepa/storm/topology/SepaSpout.java | 102 ------------- .../storm/topology/SepaTopologyBuilder.java | 46 ------ .../cep/sepa/storm/topology/SinkSepaBolt.java | 139 ------------------ .../fzi/cep/sepa/storm/utils/Constants.java | 11 -- .../fzi/cep/sepa/storm/utils/JsonScheme.java | 49 ------ .../fzi/cep/sepa/storm/utils/Parameters.java | 19 --- .../fzi/cep/sepa/storm/utils/Serializer.java | 24 --- .../fzi/cep/sepa/storm/utils/StormUtils.java | 29 ---- .../de/fzi/cep/sepa/storm/utils/Utils.java | 84 ----------- 15 files changed, 670 deletions(-) delete mode 100644 archetypes/command delete mode 100644 package-lock.json delete mode 100644 streampipes-wrapper-storm/pom.xml delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/config/StormConfig.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/messaging/KafkaSender.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/KafkaSepaSpout.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaSpout.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaTopologyBuilder.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SinkSepaBolt.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Constants.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/JsonScheme.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Parameters.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Serializer.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/StormUtils.java delete mode 100644 streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Utils.java diff --git a/archetypes/command b/archetypes/command deleted file mode 100644 index 44c8177b51..0000000000 --- a/archetypes/command +++ /dev/null @@ -1,6 +0,0 @@ -mvn archetype:generate \ - -DarchetypeGroupId=de.fzi.cep.sepa \ - -DarchetypeArtifactId=streampipes-archetype-storm-topology \ - -DarchetypeVersion=0.0.1-SNAPSHOT \ - -DgroupId=de.fzi.cep.sepa.storm.count \ - -DartifactId=semantic-epa-storm-topology-count diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 48e341a095..0000000000 --- a/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -} diff --git a/streampipes-wrapper-storm/pom.xml b/streampipes-wrapper-storm/pom.xml deleted file mode 100644 index 2b5aca86fc..0000000000 --- a/streampipes-wrapper-storm/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - 4.0.0 - - org.streampipes - streampipes-parent - 0.41.0-SNAPSHOT - - streampipes-wrapper-storm - StreamPipes Wrapper for Apache Storm - - - org.streampipes - streampipes-wrapper-standalone - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - ch.qos.logback - logback-classic - - - org.apache.httpcomponents - httpcore - - - - - org.apache.storm - storm-core - 0.9.5 - provided - - - org.apache.storm - storm-kafka - 0.9.5 - - - - org.streampipes - streampipes-storage - - - org.streampipes - streampipes-container-standalone - - - org.streampipes - streampipes-commons - - - org.streampipes - streampipes-messaging-kafka - - - org.streampipes - streampipes-messaging-jms - - - org.json - json - 20160212 - - - \ No newline at end of file diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/config/StormConfig.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/config/StormConfig.java deleted file mode 100644 index cc94ea453e..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/config/StormConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.fzi.cep.sepa.storm.config; - -public class StormConfig { - public final static String serverUrl; - public final static int port; - public final static String iconBaseUrl; - - - static { - serverUrl = "http://localhost:8093/"; - port = 8090; - iconBaseUrl = "http://localhost:8080/semantic-epa-backend/img"; - } -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/messaging/KafkaSender.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/messaging/KafkaSender.java deleted file mode 100644 index c630771641..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/messaging/KafkaSender.java +++ /dev/null @@ -1,51 +0,0 @@ -package de.fzi.cep.sepa.storm.messaging; - -import de.fzi.cep.sepa.messaging.kafka.StreamPipesKafkaProducer; -import de.fzi.cep.sepa.model.impl.graph.SepaInvocation; -import de.fzi.cep.sepa.runtime.EPEngine; -import de.fzi.cep.sepa.runtime.OutputCollector; -import org.streampipes.wrapper.param.BindingParameters; -import org.streampipes.wrapper.param.EngineParameters; -import de.fzi.cep.sepa.storm.utils.Serializer; - -import java.io.IOException; -import java.util.Map; - - -//TODO Do I need this class? -public class KafkaSender implements EPEngine{ - - private StreamPipesKafkaProducer kafkaDataProducer; - private StreamPipesKafkaProducer kafkaConfigProducer; - private String configurationId; - - public KafkaSender(String producerKafkaUrl, String producerTopic, String configurationId) - { - this.configurationId = configurationId; - } - - @Override - public void bind(EngineParameters parameters, OutputCollector collector, - SepaInvocation graph) { - // TODO Auto-generated method stub - - } - - @Override - public void onEvent(Map event, String sourceInfo) { - try { - event.put("configurationId", configurationId); - kafkaDataProducer.publish(Serializer.serialize(event)); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void discard() { - //TODO - } - - -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/KafkaSepaSpout.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/KafkaSepaSpout.java deleted file mode 100644 index 1bc325b19f..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/KafkaSepaSpout.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.fzi.cep.sepa.storm.topology; - -public class KafkaSepaSpout { - -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaSpout.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaSpout.java deleted file mode 100644 index 0c4795c0ca..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaSpout.java +++ /dev/null @@ -1,102 +0,0 @@ -package de.fzi.cep.sepa.storm.topology; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import backtype.storm.spout.Scheme; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichSpout; -import de.fzi.cep.sepa.model.impl.EventStream; -import de.fzi.cep.sepa.storm.utils.StormUtils; -import de.fzi.cep.sepa.storm.utils.Utils; -import kafka.consumer.ConsumerConfig; -import kafka.consumer.ConsumerIterator; -import kafka.consumer.KafkaStream; -import kafka.javaapi.consumer.ConsumerConnector; -import kafka.message.MessageAndMetadata; - -public class SepaSpout extends BaseRichSpout { - - private static final long serialVersionUID = 1402529305108380459L; - - - - - protected String id; - protected Scheme scheme; - protected String zookeeper; - protected String topic; - - private ConsumerConnector consumer; - - public SepaSpout(String id, EventStream eventStream) { - this.id = id; - this.scheme = StormUtils.getScheme(eventStream); - this.zookeeper = Utils.getZookeeperUrl(eventStream); - this.topic = eventStream.getEventGrounding().getTransportProtocol().getTopicName(); - } - - - private ConsumerIterator consumerIterator; - - protected SpoutOutputCollector collector; - - @Override - public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) { - outputFieldsDeclarer.declareStream(Utils.SEPA_DATA_STREAM, scheme.getOutputFields()); - } - - @SuppressWarnings("rawtypes") - @Override - public void open(Map map, TopologyContext topologyContext, SpoutOutputCollector spoutOutputCollector) { - this.collector = spoutOutputCollector; - int numThreads = 1; - - consumer = kafka.consumer.Consumer.createJavaConsumerConnector(createConsumerConfig(zookeeper, id)); - - - Map topicCountMap = new HashMap(); - topicCountMap.put(topic, new Integer(numThreads)); - Map>> consumerMap = consumer.createMessageStreams(topicCountMap); - List> streams = consumerMap.get(topic); - KafkaStream messageAndMetadatas = streams.get(0); - this.consumerIterator = messageAndMetadatas.iterator(); - - } - - private ConsumerConfig createConsumerConfig(String zookeeperUrl, String groupId) { - Properties props = new Properties(); - props.put("zookeeper.connect", zookeeperUrl); - props.put("group.id", groupId); - props.put("zookeeper.session.timeout.ms", "60000"); - props.put("zookeeper.sync.time.ms", "20000"); - props.put("auto.commit.interval.ms", "10000"); - - return new ConsumerConfig(props); - } - - @Override - public void nextTuple() { - if (consumerIterator.hasNext()) { - MessageAndMetadata message = consumerIterator.next(); - byte[] messagePayload = message.message(); - - collector.emit(Utils.SEPA_DATA_STREAM, scheme.deserialize(messagePayload)); - - } - } - - @Override - public void close() { - this.consumer.shutdown(); - } - - public String getId() { - return id; - } - -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaTopologyBuilder.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaTopologyBuilder.java deleted file mode 100644 index 919285e0ba..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SepaTopologyBuilder.java +++ /dev/null @@ -1,46 +0,0 @@ -package de.fzi.cep.sepa.storm.topology; - -import java.util.UUID; - -import storm.kafka.BrokerHosts; -import storm.kafka.KafkaSpout; -import storm.kafka.SpoutConfig; -import storm.kafka.StringKeyValueScheme; -import storm.kafka.ZkHosts; -import backtype.storm.generated.StormTopology; -import backtype.storm.spout.SchemeAsMultiScheme; -import backtype.storm.topology.IRichBolt; -import backtype.storm.topology.TopologyBuilder; - -public class SepaTopologyBuilder { - - public static StormTopology buildSimpleTopology(IRichBolt bolt, String zookeeperUrl) - { - TopologyBuilder builder = new TopologyBuilder(); - - - String topicName = "SEPA.SEP.Twitter.Sample"; - BrokerHosts hosts = new ZkHosts("ipe-koi04.fzi.de:2181"); - SpoutConfig spoutConfig = new SpoutConfig(hosts, topicName, "/", UUID.randomUUID().toString()); - spoutConfig.scheme = new SchemeAsMultiScheme(new StringKeyValueScheme()); - KafkaSpout kafkaSpout = new KafkaSpout(spoutConfig); - - - - - - -// SepaSpout sepaSpout = new SepaSpout("sepaspout", zookeeperUrl); -// SinkSepaBolt sinkSepaBolt = new SinkSepaBolt<>("sinkbolt"); -// -// builder.setSpout(sepaSpout.getId(), sepaSpout); -// builder.setBolt("sentiment", bolt) -// .shuffleGrouping(sepaSpout.getId(), SepaSpout.SEPA_DATA_STREAM); -//// .shuffleGrouping(sepaSpout.getId()); -// builder.setBolt(sinkSepaBolt.getId(), sinkSepaBolt) -// .shuffleGrouping("sentiment", SepaSpout.SEPA_DATA_STREAM); - - return builder.createTopology(); - } - -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SinkSepaBolt.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SinkSepaBolt.java deleted file mode 100644 index 4188e5296d..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/topology/SinkSepaBolt.java +++ /dev/null @@ -1,139 +0,0 @@ -package de.fzi.cep.sepa.storm.topology; - -import backtype.storm.spout.Scheme; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; -import com.google.gson.Gson; -import de.fzi.cep.sepa.messaging.jms.ActiveMQPublisher; -import de.fzi.cep.sepa.messaging.kafka.StreamPipesKafkaProducer; -import de.fzi.cep.sepa.model.impl.EventStream; -import de.fzi.cep.sepa.model.impl.KafkaTransportProtocol; -import org.streampipes.wrapper.param.BindingParameters; -import org.streampipes.wrapper.util.ThriftSerializer; -import de.fzi.cep.sepa.storm.utils.StormUtils; -import org.apache.thrift.TException; -import org.apache.thrift.TSerializer; -import org.apache.thrift.protocol.TBinaryProtocol; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.jms.JMSException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -public class SinkSepaBolt extends BaseRichBolt { - -private static final long serialVersionUID = -3694170770048756860L; - - private String id; - private String broker; - private String topic; - private Scheme scheme; - - private static Logger log = LoggerFactory.getLogger(SinkSepaBolt.class); - - private Gson gson; - private TSerializer serializer; - private ActiveMQPublisher activeMqProducer; - private StreamPipesKafkaProducer kafkaProducer; - private EventStream eventStream; - - public SinkSepaBolt(String id, EventStream eventStream) { - this.id = id; - this.broker = eventStream.getEventGrounding().getTransportProtocol().toString(); - this.topic = eventStream.getEventGrounding().getTransportProtocol().getTopicName(); - this.scheme = StormUtils.getScheme(eventStream); - this.eventStream = eventStream; - this.activeMqProducer = null; - this.kafkaProducer = null; - } - - - @Override - public void prepare(Map map, TopologyContext topologyContext, OutputCollector outputCollector) { - - if (eventStream.getEventGrounding().getTransportProtocol() instanceof KafkaTransportProtocol) { - this.kafkaProducer = new StreamPipesKafkaProducer(broker, topic); - } else { - try { - this.activeMqProducer = new ActiveMQPublisher(broker, topic); - } catch (JMSException e) { - e.printStackTrace(); - } - } - - this.gson = new Gson(); - this.serializer = new TSerializer(new TBinaryProtocol.Factory()); - - } - - @Override - public void declareOutputFields(OutputFieldsDeclarer outputFieldsDeclarer) { - } - - private void send(Map event) { - if (kafkaProducer != null) { - sendToKafka(event); - } else if (activeMqProducer != null) { - sendToJms(event); - } - } - - - private void sendToJms(Map event) { - try { - activeMqProducer.sendText(new String(toJsonOutputFormat(event))); - } catch (JMSException e) { - e.printStackTrace(); - }; - } - - private void sendToKafka(Map event) - { - kafkaProducer.publish(toJsonOutputFormat(event)); - } - - private byte[] toOutputFormat(Map event, B parameters) throws TException - { - if (StormUtils.isJson(parameters.getGraph().getOutputStream())) - return toJsonOutputFormat(event); - else - return toThriftOutputFormat(event); - } - - - private byte[] toThriftOutputFormat(Map event) throws TException { - return serializer.serialize(new ThriftSerializer().toSimpleEvent(event)); - } - - private byte[] toJsonOutputFormat(Map event) { - return gson.toJson(event).getBytes(); - } - - @Override - public void execute(Tuple tuple) { - Map result = new HashMap<>(); - - List fields = scheme.getOutputFields().toList(); - - for (String field : fields) { -// if (tuple.contains(field)) - result.put(field, tuple.getValueByField(field)); - } - - send(result); - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Constants.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Constants.java deleted file mode 100644 index a8d9ae3840..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Constants.java +++ /dev/null @@ -1,11 +0,0 @@ -package de.fzi.cep.sepa.storm.utils; - -//TODO Do I need this class -public class Constants { - -// public static final String SEPA_PREFIX = "de.fzi.cep.sepa.storm"; - -// public static final String SEPA_DATA = ".data"; - -// public static final String SEPA_CONFIG = ".config"; -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/JsonScheme.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/JsonScheme.java deleted file mode 100644 index c469c0fb13..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/JsonScheme.java +++ /dev/null @@ -1,49 +0,0 @@ -package de.fzi.cep.sepa.storm.utils; - -import java.util.ArrayList; -import java.util.List; - -import org.json.JSONObject; - -import backtype.storm.spout.Scheme; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import de.fzi.cep.sepa.model.impl.EventSchema; -import de.fzi.cep.sepa.model.impl.EventStream; -import de.fzi.cep.sepa.model.impl.eventproperty.EventProperty; - -public class JsonScheme implements Scheme { - private List fields; - - public JsonScheme(EventStream eventStream) { - EventSchema eventSchema = eventStream.getEventSchema(); - - fields = new ArrayList(); - - for (EventProperty property : eventSchema.getEventProperties()) { - // TODO add support for Nested and List Properties - fields.add(property.getRuntimeName()); - } - } - - @Override - public List deserialize(byte[] ser) { - String l = new String(ser); - JSONObject j = new JSONObject(l); - Object[] list = new Object[fields.size()]; - - for (int i = 0; i < fields.size(); i++) { - list[i]= (j.get(fields.get(i))); - } - - - - return new Values(list); - } - - @Override - public Fields getOutputFields() { - return new Fields(fields); - } - -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Parameters.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Parameters.java deleted file mode 100644 index b2846c0a80..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Parameters.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.fzi.cep.sepa.storm.utils; - - -import de.fzi.cep.sepa.model.impl.graph.SepaInvocation; -import org.streampipes.wrapper.param.BindingParameters; - -public class Parameters extends BindingParameters { - - - /** - * - */ - private static final long serialVersionUID = 1L; - - public Parameters(SepaInvocation graph) { - super(graph); - } - -} \ No newline at end of file diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Serializer.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Serializer.java deleted file mode 100644 index 9b51290aa3..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Serializer.java +++ /dev/null @@ -1,24 +0,0 @@ -package de.fzi.cep.sepa.storm.utils; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -public class Serializer { - - public static byte[] serialize(Object obj) throws IOException { - ByteArrayOutputStream b = new ByteArrayOutputStream(); - ObjectOutputStream o = new ObjectOutputStream(b); - o.writeObject(obj); - return b.toByteArray(); - } - - public static Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException { - ByteArrayInputStream b = new ByteArrayInputStream(bytes); - ObjectInputStream o = new ObjectInputStream(b); - return o.readObject(); - } - -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/StormUtils.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/StormUtils.java deleted file mode 100644 index ff5a153621..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/StormUtils.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.fzi.cep.sepa.storm.utils; - -import backtype.storm.spout.Scheme; -import de.fzi.cep.sepa.model.impl.EventStream; -import de.fzi.cep.sepa.model.vocabulary.MessageFormat; -import scala.NotImplementedError; - -import java.net.URI; - -public class StormUtils { - public static Scheme getScheme(EventStream eventStream) { - if (isJson(eventStream)) { - return new JsonScheme(eventStream); - } else { - throw new NotImplementedError(); - } - - } - - - public static boolean isJson(EventStream eventStream) { - return eventStream - .getEventGrounding() - .getTransportFormats() - .get(0) - .getRdfType() - .contains(URI.create(MessageFormat.Json)); - } -} diff --git a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Utils.java b/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Utils.java deleted file mode 100644 index aa97cf9337..0000000000 --- a/streampipes-wrapper-storm/src/main/java/de/fzi/cep/sepa/storm/utils/Utils.java +++ /dev/null @@ -1,84 +0,0 @@ -package de.fzi.cep.sepa.storm.utils; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URI; - -import org.lightcouch.Response; - -import de.fzi.cep.sepa.model.impl.EventStream; -import de.fzi.cep.sepa.model.impl.KafkaTransportProtocol; -import de.fzi.cep.sepa.model.impl.eventproperty.EventProperty; -import de.fzi.cep.sepa.model.impl.graph.SepaInvocation; -import de.fzi.cep.sepa.storage.impl.SepaInvocationStorageImpl; - -public class Utils { - - public static String NIMBUS_HOST = "ipe-koi05.fzi.de"; - public static int NIMBUS_THRIFT_PORT = 6627; - public static final String SEPA_DATA_STREAM = "SEPA_DATA_STREAM"; - - - - - public static String getZookeeperUrl(EventStream eventStream) { - KafkaTransportProtocol tp = (KafkaTransportProtocol) eventStream.getEventGrounding().getTransportProtocol(); - return tp.getZookeeperHost() + ":" + tp.getZookeeperPort(); - - } - - - public static EventProperty getEventPropertyById(URI id, EventStream eventStream) { - - for (EventProperty p : eventStream.getEventSchema().getEventProperties()) { - if (p.getElementName() != null && p.getElementName().equals(id.toString())) { - return p; - } - } - - return null; - } - - public static SepaInvocation getSepaInvocation(String id) { - SepaInvocationStorageImpl invocationStorage = new SepaInvocationStorageImpl(); - return invocationStorage.getSepaInvovation(id); - - } - - public static Response storeSepaInvocation(SepaInvocation invocation) { - SepaInvocationStorageImpl impl = new SepaInvocationStorageImpl(); - return impl.storeSepaInvocation(invocation); - - } - - public static boolean removeSepaInvocation(String id, String rev) { - SepaInvocationStorageImpl impl = new SepaInvocationStorageImpl(); - return impl.removeSepaInvovation(id, rev); - - } - - public static String executeCommand(String command) { - - StringBuffer output = new StringBuffer(); - - Process p; - try { - p = Runtime.getRuntime().exec(command); - p.waitFor(); - BufferedReader reader = - new BufferedReader(new InputStreamReader(p.getInputStream())); - - String line = ""; - - while ((line = reader.readLine())!= null) { - output.append(line + "\n"); - } - - } catch (Exception e) { - e.printStackTrace(); - } - - return output.toString(); - - } -} From 18db42ae688bd2ffd601740e827a821ac396e6f5 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Tue, 17 Sep 2019 21:44:29 +0200 Subject: [PATCH 06/24] Add license header to some files --- .github/ISSUE_TEMPLATE/bug.md | 18 ++++++++++++++++++ .github/ISSUE_TEMPLATE/feature.md | 18 ++++++++++++++++++ .gitlab-ci.yml | 16 ++++++++++++++++ .gitlab/issue_templates/bug.md | 18 ++++++++++++++++++ .gitlab/issue_templates/feature.md | 18 ++++++++++++++++++ .travis.yml | 16 ++++++++++++++++ CHANGELOG.md | 18 ++++++++++++++++++ README.md | 18 ++++++++++++++++++ pom.xml | 5 +++++ 9 files changed, 145 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 6cff1d4271..832f6b409e 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -1,3 +1,21 @@ + + --- name: 'Bug report' about: 'Create a report to help us improve StreamPipes!' diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md index b383e1267a..df41d78eb4 100644 --- a/.github/ISSUE_TEMPLATE/feature.md +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -1,3 +1,21 @@ + + --- name: 'Feature request' about: 'Suggest a new idea for StreamPipes!' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af5226535e..056e966ccd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + variables: IMAGE_NAME: $REGISTRY_HOST/$CI_PROJECT_PATH HARBOR_IMAGE_NAME: $HARBOR_REGISTRY_HOST/$CI_PROJECT_PATH diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index fb067dc9d5..7c6b9260ba 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -1,3 +1,21 @@ + + **Describe the bug** A clear and concise description of what the bug is. diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md index d5ac51c912..75aac1ff48 100644 --- a/.gitlab/issue_templates/feature.md +++ b/.gitlab/issue_templates/feature.md @@ -1,3 +1,21 @@ + + **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] diff --git a/.travis.yml b/.travis.yml index 7900289320..ff7e154e74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + language: java jdk: openjdk8 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bebf78ea0..7c7f1cc2d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ + + # Changelog All notable changes to this project will be documented in this file. diff --git a/README.md b/README.md index 1c08d27f54..2791d53685 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ + + [![Travis Badge](https://travis-ci.org/streampipes/streampipes.svg?branch=dev)](https://travis-ci.org/streampipes/streampipes.svg?branch=dev) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/34a7e26be4fc4fa284ee5201b6d386ea)](https://www.codacy.com/app/dominikriemer/streampipes-ce?utm_source=github.com&utm_medium=referral&utm_content=streampipes/streampipes-ce&utm_campaign=Badge_Grade) [![Docker pulls](https://img.shields.io/docker/pulls/streampipes/backend.svg)](https://hub.docker.com/r/streampipes/backend/) diff --git a/pom.xml b/pom.xml index 8336a61b8a..ebb5b1dc26 100644 --- a/pom.xml +++ b/pom.xml @@ -762,6 +762,11 @@ + + + + + org.apache.maven.plugins maven-dependency-plugin From ae8d5243145ccde0757dffd1fe90083595d12f88 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 12:06:56 +0200 Subject: [PATCH 07/24] #280: Add new base module for all StreamPipes microservices --- pom.xml | 16 ++++++- streampipes-backend/pom.xml | 12 ++--- .../StreamPipesBackendApplication.java | 8 +++- .../master/init/AdapterMasterContainer.java | 8 +++- streampipes-connect-container-worker/pom.xml | 16 ------- .../worker/init/AdapterWorkerContainer.java | 8 +++- streampipes-connect-container/pom.xml | 25 +---------- streampipes-container-base/pom.xml | 44 +++++++++++++++++++ streampipes-container-standalone/pom.xml | 24 +--------- .../init/StandaloneModelSubmitter.java | 8 +++- 10 files changed, 92 insertions(+), 77 deletions(-) create mode 100644 streampipes-container-base/pom.xml diff --git a/pom.xml b/pom.xml index ebb5b1dc26..cb74083d74 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,8 @@ 1.3.5 2.9.9 2.1 - 3.1.0 + 4.0.1 + 2.0.1.FINAL 3.19.0-GA 2.27 9.4.19.v20190610 @@ -40,7 +41,7 @@ 1.0.2 2.4.5 1.2.3 - 2.1.6.RELEASE + 2.1.8.RELEASE 1.9.11 2.0.0 0.6.0 @@ -67,6 +68,11 @@ logback-classic ${logback-classic.version} + + javax.validation + validation-api + ${javax-validation.version} + javax.ws.rs javax.ws.rs-api @@ -504,6 +510,11 @@ streampipes-logging ${project.version} + + org.streampipes + streampipes-container-base + ${project.version} + com.github.tomakehurst wiremock @@ -659,6 +670,7 @@ streampipes-wrapper-standalone streampipes-connect-container-master streampipes-connect-container-worker + streampipes-container-base diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 7424fe98aa..553b7d0508 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -13,17 +13,17 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-jersey - javax.validation - validation-api + org.springframework.boot + spring-boot-starter-tomcat + + org.streampipes + streampipes-container-base + org.streampipes streampipes-rest diff --git a/streampipes-backend/src/main/java/org/streampipes/backend/StreamPipesBackendApplication.java b/streampipes-backend/src/main/java/org/streampipes/backend/StreamPipesBackendApplication.java index a27fbd1a20..370055ba51 100644 --- a/streampipes-backend/src/main/java/org/streampipes/backend/StreamPipesBackendApplication.java +++ b/streampipes-backend/src/main/java/org/streampipes/backend/StreamPipesBackendApplication.java @@ -23,11 +23,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.streampipes.app.file.export.application.AppFileExportApplication; import org.streampipes.manager.operations.Operations; import org.streampipes.model.client.pipeline.PipelineOperationStatus; @@ -41,7 +43,9 @@ import javax.servlet.ServletContextListener; import javax.servlet.http.HttpServlet; -@SpringBootApplication +@Configuration +@EnableAutoConfiguration +@Import({ StreamPipesResourceConfig.class, WelcomePageController.class }) public class StreamPipesBackendApplication { private static final Logger LOG = LoggerFactory.getLogger(StreamPipesBackendApplication.class.getCanonicalName()); diff --git a/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/init/AdapterMasterContainer.java b/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/init/AdapterMasterContainer.java index 96d975bd2a..d939d28c3a 100644 --- a/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/init/AdapterMasterContainer.java +++ b/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/init/AdapterMasterContainer.java @@ -20,12 +20,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.streampipes.connect.config.ConnectContainerConfig; import java.util.Collections; -@SpringBootApplication +@Configuration +@EnableAutoConfiguration +@Import({ AdapterMasterContainerResourceConfig.class }) public class AdapterMasterContainer { private static final Logger LOG = LoggerFactory.getLogger(AdapterMasterContainer.class); diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index cb4b2525e2..280690fc7f 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -10,25 +10,9 @@ streampipes-connect-container-worker - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.streampipes streampipes-connect-container - - - org.apache.tomcat.embed - tomcat-embed-el - - \ No newline at end of file diff --git a/streampipes-connect-container-worker/src/main/java/org/streampipes/connect/container/worker/init/AdapterWorkerContainer.java b/streampipes-connect-container-worker/src/main/java/org/streampipes/connect/container/worker/init/AdapterWorkerContainer.java index 06d1171d79..b2b67662fc 100644 --- a/streampipes-connect-container-worker/src/main/java/org/streampipes/connect/container/worker/init/AdapterWorkerContainer.java +++ b/streampipes-connect-container-worker/src/main/java/org/streampipes/connect/container/worker/init/AdapterWorkerContainer.java @@ -20,7 +20,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.streampipes.connect.adapter.Adapter; import org.streampipes.connect.adapter.model.generic.Protocol; import org.streampipes.connect.container.worker.management.MasterRestClient; @@ -33,7 +35,9 @@ import java.util.Collections; import java.util.List; -@SpringBootApplication +@Configuration +@EnableAutoConfiguration +@Import({ AdapterWorkerContainerResourceConfig.class }) public abstract class AdapterWorkerContainer { private static final Logger LOG = LoggerFactory.getLogger(AdapterWorkerContainer.class); diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index a47a291933..1372af3b0b 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -11,28 +11,8 @@ - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jetty + org.streampipes + streampipes-container-base org.streampipes @@ -82,6 +62,5 @@ okio 1.15.0 - \ No newline at end of file diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml new file mode 100644 index 0000000000..95210e873c --- /dev/null +++ b/streampipes-container-base/pom.xml @@ -0,0 +1,44 @@ + + + + streampipes-parent + org.streampipes + 0.63.1-SNAPSHOT + + 4.0.0 + + streampipes-container-base + + + org.springframework + spring-aop + 5.1.9.RELEASE + + + org.springframework + spring-context + 5.1.9.RELEASE + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-undertow + 2.1.8.RELEASE + + + \ No newline at end of file diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index 624be3cd4c..a40227abf5 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -32,28 +32,8 @@ streampipes-container - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jetty + org.streampipes + streampipes-container-base \ No newline at end of file diff --git a/streampipes-container-standalone/src/main/java/org/streampipes/container/standalone/init/StandaloneModelSubmitter.java b/streampipes-container-standalone/src/main/java/org/streampipes/container/standalone/init/StandaloneModelSubmitter.java index ffbf7efacf..a0956f3eec 100644 --- a/streampipes-container-standalone/src/main/java/org/streampipes/container/standalone/init/StandaloneModelSubmitter.java +++ b/streampipes-container-standalone/src/main/java/org/streampipes/container/standalone/init/StandaloneModelSubmitter.java @@ -21,7 +21,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.streampipes.container.init.DeclarersSingleton; import org.streampipes.container.init.ModelSubmitter; import org.streampipes.container.init.RunningInstances; @@ -32,7 +34,9 @@ import javax.annotation.PreDestroy; -@SpringBootApplication +@Configuration +@EnableAutoConfiguration +@Import({ PipelineElementContainerResourceConfig.class }) public abstract class StandaloneModelSubmitter extends ModelSubmitter { private static final Logger LOG = From 4775cb5ea6311ecdaf9a27e1de58d2959e28790b Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 12:10:34 +0200 Subject: [PATCH 08/24] Fix dependency version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb74083d74..3910dc8aac 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.9.9 2.1 4.0.1 - 2.0.1.FINAL + 2.0.1.Final 3.19.0-GA 2.27 9.4.19.v20190610 From 1cf0b18c6d570e95fb103912fec963e591ebab2c Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 13:34:48 +0200 Subject: [PATCH 09/24] #281: Use AdoptOpenJDK as base Docker image --- streampipes-backend/Dockerfile | 2 +- streampipes-connect-container-master/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/streampipes-backend/Dockerfile b/streampipes-backend/Dockerfile index 6397670dfc..77d4f134cb 100644 --- a/streampipes-backend/Dockerfile +++ b/streampipes-backend/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java +FROM adoptopenjdk/openjdk8-openj9:alpine-slim EXPOSE 8030 ENV CONSUL_LOCATION consul diff --git a/streampipes-connect-container-master/Dockerfile b/streampipes-connect-container-master/Dockerfile index e456a32a6b..70e2345ee1 100644 --- a/streampipes-connect-container-master/Dockerfile +++ b/streampipes-connect-container-master/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8 +FROM adoptopenjdk/openjdk8-openj9:alpine-slim ENV CONSUL_LOCATION consul From 0d44d12b9b759d9c7c620373e6eb3837551ff34a Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 14:43:44 +0200 Subject: [PATCH 10/24] #281: Use AdopOpenJDK in archetype Docker images --- .../src/main/resources/archetype-resources/Dockerfile | 2 +- .../src/main/resources/archetype-resources/Dockerfile | 2 +- .../src/main/resources/archetype-resources/Dockerfile | 2 +- .../src/main/resources/archetype-resources/Dockerfile | 2 +- .../src/main/resources/archetype-resources/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/Dockerfile b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/Dockerfile index 06f89bbaae..f129c2f809 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/Dockerfile +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8 +FROM adoptopenjdk/openjdk8-openj9:alpine-slim EXPOSE 8090 ENV CONSUL_LOCATION consul diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/Dockerfile b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/Dockerfile index 06f89bbaae..f129c2f809 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/Dockerfile +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8 +FROM adoptopenjdk/openjdk8-openj9:alpine-slim EXPOSE 8090 ENV CONSUL_LOCATION consul diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/Dockerfile b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/Dockerfile index 06f89bbaae..f129c2f809 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/Dockerfile +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8 +FROM adoptopenjdk/openjdk8-openj9:alpine-slim EXPOSE 8090 ENV CONSUL_LOCATION consul diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/Dockerfile b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/Dockerfile index 06f89bbaae..f129c2f809 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/Dockerfile +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8 +FROM adoptopenjdk/openjdk8-openj9:alpine-slim EXPOSE 8090 ENV CONSUL_LOCATION consul diff --git a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/Dockerfile b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/Dockerfile index 9716ca8075..6d60ed3ad9 100644 --- a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/Dockerfile +++ b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/Dockerfile @@ -1,4 +1,4 @@ -FROM anapsix/alpine-java:8 +FROM adoptopenjdk/openjdk8-openj9:alpine-slim ENV CONSUL_LOCATION consul From beb8aa6253acb6695a7ae743e081027c4d621144 Mon Sep 17 00:00:00 2001 From: Christofer Dutz Date: Wed, 18 Sep 2019 15:39:47 +0200 Subject: [PATCH 11/24] - Added PowerMock annotations to avoid problems with Java 11 and above. --- .../connect/container/master/DescriptionManagementTest.java | 2 ++ .../container/master/management/SourcesManagementTest.java | 2 ++ .../container/master/management/UnitMasterManagementTest.java | 2 ++ .../container/master/management/WorkerRestClientTest.java | 2 ++ .../worker/management/AdapterWorkerManagementTest.java | 2 ++ .../test/java/org/streampipes/rest/impl/ConsulConfigTest.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/DescriptionManagementTest.java b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/DescriptionManagementTest.java index 4f9d50eaab..3a4eba1768 100644 --- a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/DescriptionManagementTest.java +++ b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/DescriptionManagementTest.java @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.streampipes.connect.adapter.AdapterRegistry; @@ -37,6 +38,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ AdapterRegistry.class }) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"}) public class DescriptionManagementTest { diff --git a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/SourcesManagementTest.java b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/SourcesManagementTest.java index 7e301cfb3b..bc9ecf64db 100644 --- a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/SourcesManagementTest.java +++ b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/SourcesManagementTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.streampipes.connect.adapter.exception.AdapterException; @@ -42,6 +43,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ WorkerRestClient.class }) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"}) public class SourcesManagementTest { private final static String ID = "id_1234"; diff --git a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/UnitMasterManagementTest.java b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/UnitMasterManagementTest.java index d6e7b1f9c2..93fdcc41bd 100644 --- a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/UnitMasterManagementTest.java +++ b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/UnitMasterManagementTest.java @@ -27,6 +27,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -40,6 +41,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ UnitProvider.class, UnitFactory.class }) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"}) public class UnitMasterManagementTest { @Test(expected = AdapterException.class) diff --git a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/WorkerRestClientTest.java b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/WorkerRestClientTest.java index 563011b962..5829d7e2cf 100644 --- a/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/WorkerRestClientTest.java +++ b/streampipes-connect-container-master/src/test/java/org/streampipes/connect/container/master/management/WorkerRestClientTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.streampipes.connect.adapter.exception.AdapterException; @@ -33,6 +34,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ WorkerRestClient.class }) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"}) public class WorkerRestClientTest { /** diff --git a/streampipes-connect-container-worker/src/test/java/org/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java b/streampipes-connect-container-worker/src/test/java/org/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java index 93b4cd8aae..23a7cb17a6 100644 --- a/streampipes-connect-container-worker/src/test/java/org/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java +++ b/streampipes-connect-container-worker/src/test/java/org/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.streampipes.connect.RunningAdapterInstances; @@ -40,6 +41,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ AdapterRegistry.class }) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"}) public class AdapterWorkerManagementTest { @Test diff --git a/streampipes-rest/src/test/java/org/streampipes/rest/impl/ConsulConfigTest.java b/streampipes-rest/src/test/java/org/streampipes/rest/impl/ConsulConfigTest.java index 20399a2499..7fe7435a55 100644 --- a/streampipes-rest/src/test/java/org/streampipes/rest/impl/ConsulConfigTest.java +++ b/streampipes-rest/src/test/java/org/streampipes/rest/impl/ConsulConfigTest.java @@ -26,6 +26,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.streampipes.config.model.ConfigItem; @@ -37,6 +38,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ ConsulUtil.class }) +@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"}) public class ConsulConfigTest { @Test From c882c329d002f26b1d02715daa61049fe95a957a Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 18:57:19 +0200 Subject: [PATCH 12/24] Fix #282: Upgrade jgrapht library to version 1.3.1 --- streampipes-pipeline-management/pom.xml | 2 +- .../manager/data/PipelineEdgeFactory.java | 29 ------------------- .../manager/data/PipelineGraph.java | 4 +-- .../manager/data/PipelineGraphBuilder.java | 6 +++- 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineEdgeFactory.java diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 4ba18a45be..2ab51e79b5 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -95,7 +95,7 @@ org.jgrapht jgrapht-core - 1.0.0 + 1.3.1 uk.com.robust-it diff --git a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineEdgeFactory.java b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineEdgeFactory.java deleted file mode 100644 index 6181392e7a..0000000000 --- a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineEdgeFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2018 FZI Forschungszentrum Informatik - * - * Licensed 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.streampipes.manager.data; - -import org.streampipes.model.base.NamedStreamPipesEntity; -import org.jgrapht.EdgeFactory; - -public class PipelineEdgeFactory implements EdgeFactory { - - @Override - public String createEdge(NamedStreamPipesEntity sourceVertex, NamedStreamPipesEntity targetVertex) { - return sourceVertex.getDOM() +"-" +targetVertex.getDOM(); - } -} diff --git a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraph.java b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraph.java index c4e63c8a8e..04724e48f2 100644 --- a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraph.java +++ b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraph.java @@ -17,12 +17,12 @@ package org.streampipes.manager.data; -import org.streampipes.model.base.NamedStreamPipesEntity; import org.jgrapht.graph.SimpleDirectedGraph; +import org.streampipes.model.base.NamedStreamPipesEntity; public class PipelineGraph extends SimpleDirectedGraph { public PipelineGraph() { - super(new PipelineEdgeFactory()); + super(String.class); } } diff --git a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraphBuilder.java b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraphBuilder.java index 619588c933..9408c98381 100644 --- a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraphBuilder.java +++ b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/data/PipelineGraphBuilder.java @@ -58,7 +58,7 @@ public PipelineGraph buildGraph() { for(NamedStreamPipesEntity source : allPipelineElements) { List targets = findTargets(source.getDOM()); - targets.forEach(t -> pipelineGraph.addEdge(source, t)); + targets.forEach(t -> pipelineGraph.addEdge(source, t, createEdge(source, t))); } return pipelineGraph; @@ -71,4 +71,8 @@ private List findTargets(String domId) { .collect(Collectors.toList()); } + private String createEdge(NamedStreamPipesEntity sourceVertex, + NamedStreamPipesEntity targetVertex) { + return sourceVertex.getDOM() + "-" + targetVertex.getDOM(); + } } From 82e63dabeec72bc4eb0e8d65874d839266fc7b9f Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 18:57:48 +0200 Subject: [PATCH 13/24] #280: Use Tomcat as backend container --- streampipes-backend/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 553b7d0508..af3ecd2396 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -13,17 +13,17 @@ org.springframework.boot spring-boot-starter-web + + + org.streampipes + streampipes-container-base org.springframework.boot - spring-boot-starter-tomcat + spring-boot-starter-undertow - - org.streampipes - streampipes-container-base - org.streampipes streampipes-rest From aac946233246ec33117d580470b04cd426afba52 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 19:03:09 +0200 Subject: [PATCH 14/24] Fix #283: Remove Esper wrapper --- pom.xml | 6 - streampipes-wrapper-esper/pom.xml | 31 ---- .../wrapper/esper/AbstractQueueRunnable.java | 68 ------- .../wrapper/esper/EsperEngineSettings.java | 85 --------- .../wrapper/esper/EsperEventEngine.java | 175 ------------------ .../wrapper/esper/StatementAwareQueue.java | 35 ---- .../esper/config/EsperEngineConfig.java | 14 -- .../wrapper/esper/writer/SEPAWriter.java | 30 --- .../wrapper/esper/writer/Writer.java | 8 - 9 files changed, 452 deletions(-) delete mode 100644 streampipes-wrapper-esper/pom.xml delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/AbstractQueueRunnable.java delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEngineSettings.java delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEventEngine.java delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/StatementAwareQueue.java delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/config/EsperEngineConfig.java delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/SEPAWriter.java delete mode 100644 streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/Writer.java diff --git a/pom.xml b/pom.xml index 3910dc8aac..2e1bf256c6 100644 --- a/pom.xml +++ b/pom.xml @@ -445,11 +445,6 @@ streampipes-messaging-jms ${project.version} - - org.streampipes - streampipes-wrapper-esper - ${project.version} - org.streampipes streampipes-user-management @@ -662,7 +657,6 @@ streampipes-vocabulary streampipes-wrapper streampipes-wrapper-distributed - streampipes-wrapper-esper streampipes-wrapper-flink streampipes-wrapper-kafka-streams streampipes-wrapper-siddhi diff --git a/streampipes-wrapper-esper/pom.xml b/streampipes-wrapper-esper/pom.xml deleted file mode 100644 index 4890d09425..0000000000 --- a/streampipes-wrapper-esper/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - streampipes-parent - org.streampipes - 0.63.1-SNAPSHOT - - 4.0.0 - - streampipes-wrapper-esper - - - - org.streampipes - streampipes-wrapper-standalone - - - com.espertech - esper - 5.2.0 - - - log4j - log4j - - - - - - - \ No newline at end of file diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/AbstractQueueRunnable.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/AbstractQueueRunnable.java deleted file mode 100644 index 311d214959..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/AbstractQueueRunnable.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.streampipes.wrapper.esper; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; - -public abstract class AbstractQueueRunnable extends Thread { - - private static final Logger LOG = LoggerFactory.getLogger(AbstractQueueRunnable.class); - - protected BlockingQueue queue; - protected long closeAfter = 0; - protected long currentTimestamp; - protected boolean autoClose; - private boolean running; - - public AbstractQueueRunnable(int maxQueueSize, int closeAfter) { - queue = new ArrayBlockingQueue<>(maxQueueSize); - this.autoClose = true; - this.closeAfter = closeAfter * 1000; - this.currentTimestamp = System.currentTimeMillis(); - } - - public AbstractQueueRunnable(int maxQueueSize) { - queue = new ArrayBlockingQueue(maxQueueSize); - this.autoClose = false; - this.currentTimestamp = System.currentTimeMillis(); - } - - @Override - public void run() { - running = true; - while (running) { - if (autoClose) { - if (System.currentTimeMillis() - currentTimestamp > closeAfter) { - break; - } - } - try { - T data = queue.take(); - currentTimestamp = System.currentTimeMillis(); - doNext(data); - } catch (Exception e) { - e.printStackTrace(); - if (e instanceof InterruptedException) { - Thread.currentThread().interrupt(); - } else { - e.printStackTrace(); - } - } - } - LOG.info("Interrupted"); - } - - public void interrupt() { - running = false; - } - - public void add(T data) throws InterruptedException { - if (data != null) { - queue.put(data); - } - } - - protected abstract void doNext(T data) throws Exception; -} \ No newline at end of file diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEngineSettings.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEngineSettings.java deleted file mode 100644 index 2db5f976a5..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEngineSettings.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.streampipes.wrapper.esper; - -import com.espertech.esper.client.Configuration; -import com.espertech.esper.client.EPServiceProvider; -import com.espertech.esper.client.EPServiceProviderManager; -import com.espertech.esper.client.EPStatement; -import com.espertech.esper.client.EventBean; -import com.espertech.esper.client.UpdateListener; -import com.espertech.esper.client.metric.EngineMetric; -import com.espertech.esper.client.metric.StatementMetric; -import com.espertech.esper.client.time.CurrentTimeEvent; - -public class EsperEngineSettings implements Runnable { - - public static EPServiceProvider epService; - - private static final String brokerUrl = "tcp://localhost:61616"; - private static final String sourceTopic = "FZI.Timer"; - - static { - long initialTime = 1356994980000L; - Configuration config = new Configuration(); -// config.getEngineDefaults().getThreading().setThreadPoolInbound(true); -// config.getEngineDefaults().getThreading().setThreadPoolInboundNumThreads(5); -// config.getEngineDefaults().getThreading().setThreadPoolOutbound(true); -// config.getEngineDefaults().getThreading().setThreadPoolOutboundNumThreads(5); - //config.setMetricsReportingEnabled(); -// config.getEngineDefaults().getThreading().setInternalTimerEnabled(false); -// config.getEngineDefaults().getStreamSelection() -// .setDefaultStreamSelector(StreamSelector.RSTREAM_ISTREAM_BOTH); - epService = EPServiceProviderManager.getDefaultProvider(config); - epService.getEPRuntime().sendEvent(new CurrentTimeEvent(0)); - //enableMetrics(); - } - - public EsperEngineSettings() - { - - } - - private static void enableMetrics() { - - EPStatement engineMetrics = epService.getEPAdministrator().createEPL("select * from com.espertech.esper.client.metric.EngineMetric"); - engineMetrics.addListener(new UpdateListener() { - - @Override - public void update(EventBean[] arg0, EventBean[] arg1) { - // TODO Auto-generated method stub - for(EventBean bean : arg0) - { - System.out.println("***"); - EngineMetric engineMetric = (EngineMetric) bean.getUnderlying(); - System.out.println("Input Count: " +engineMetric.getInputCount()); - System.out.println("Input Count Delta: " +engineMetric.getInputCountDelta()); - } - } - }); - engineMetrics.start(); - - EPStatement statementMetrics = epService.getEPAdministrator().createEPL("select * from com.espertech.esper.client.metric.StatementMetric"); - statementMetrics.addListener(new UpdateListener() { - - @Override - public void update(EventBean[] arg0, EventBean[] arg1) { - // TODO Auto-generated method stub - for(EventBean bean : arg0) - { - StatementMetric statementMetric = (StatementMetric) bean.getUnderlying(); - System.out.println("***"); - System.out.println(statementMetric.getStatementName()); - System.out.println("CPU Time: " +statementMetric.getCpuTime()); - } - } - }); - //statementMetrics.start(); - - } - - @Override - public void run() { - //ActiveMQConsumer consumer = new ActiveMQConsumer(brokerUrl, sourceTopic); - //consumer.setListener(this); - } - -} diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEventEngine.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEventEngine.java deleted file mode 100644 index 68ab1055bf..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/EsperEventEngine.java +++ /dev/null @@ -1,175 +0,0 @@ -package org.streampipes.wrapper.esper; - -import com.espertech.esper.client.ConfigurationException; -import com.espertech.esper.client.EPServiceProvider; -import com.espertech.esper.client.EPStatement; -import com.espertech.esper.client.EventBean; -import com.espertech.esper.client.UpdateListener; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.streampipes.commons.Utils; -import org.streampipes.model.runtime.Event; -import org.streampipes.wrapper.context.EventProcessorRuntimeContext; -import org.streampipes.wrapper.esper.config.EsperEngineConfig; -import org.streampipes.wrapper.esper.writer.Writer; -import org.streampipes.wrapper.params.binding.EventProcessorBindingParams; -import org.streampipes.wrapper.routing.SpOutputCollector; -import org.streampipes.wrapper.runtime.EventProcessor; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -public abstract class EsperEventEngine implements - EventProcessor { - - protected EPServiceProvider epService; - protected List epStatements; - - private AbstractQueueRunnable queue; - private List eventTypeNames = new ArrayList<>(); - - private static final Logger LOG = LoggerFactory.getLogger(EsperEventEngine.class); - - - @Override - public void onInvocation(T parameters, SpOutputCollector collector, EventProcessorRuntimeContext runtimeContext) { - if (parameters.getInEventTypes().size() != parameters.getGraph().getInputStreams().size()) { - throw new IllegalArgumentException("Input parameters do not match!"); - } - - epService = EsperEngineSettings.epService; - - LOG.info("Configuring event types for graph " + parameters.getGraph().getName()); - parameters.getInEventTypes().entrySet().forEach(e -> { - Map inTypeMap = e.getValue(); - checkAndRegisterEventType(e.getKey(), inTypeMap); - }); - - //MapUtils.debugPrint(System.out, "topic://" +graph.getOutputStream().getEventGrounding().getTopicName(), parameters.getOutEventType()); - checkAndRegisterEventType(parameters.getGraph().getOutputStream().getEventGrounding() - .getTransportProtocol().getTopicDefinition().getActualTopicName(), parameters.getOutEventType()); - - List statements = statements(parameters); - registerStatements(statements, collector, runtimeContext); - - } - - private void checkAndRegisterEventType(String key, Map typeMap) { - Map newTypeMap = new HashMap<>(); - Iterator it = typeMap.keySet().iterator(); - while (it.hasNext()) { - String objKey = it.next(); - Object obj = typeMap.get(objKey); - if (obj instanceof List) { - String eventName = StringUtils.capitalize(objKey); - registerEventTypeIfNotExists(eventName, (Map) ((List) obj).get(0)); - newTypeMap.put(objKey, eventName + "[]"); - } else { - newTypeMap.put(objKey, obj); - } - } - //MapUtils.debugPrint(System.out, key, newTypeMap); - registerEventTypeIfNotExists(key, newTypeMap); - - } - - private void registerEventTypeIfNotExists(String eventTypeName, Map typeMap) { - try { - LOG.info("Registering event type, " + eventTypeName); - epService.getEPAdministrator().getConfiguration().addEventType(eventTypeName, typeMap); - eventTypeNames.add(eventTypeName); - } catch (ConfigurationException e) { - e.printStackTrace(); - LOG.error("Event type does already exist, " + eventTypeName); - } - } - - private void registerStatements(List statements, SpOutputCollector collector, - EventProcessorRuntimeContext runtimeContext) { - toEpStatement(statements); - queue = new StatementAwareQueue(getWriter(collector, runtimeContext), 500000); - queue.start(); - for (EPStatement epStatement : epStatements) { - LOG.info("Registering statement " + epStatement.getText()); - - if (epStatement.getText().startsWith("select")) { - epStatement.addListener(listenerSendingTo(queue)); - } - epStatement.start(); - - } - - } - - private void toEpStatement(List statements) { - if (epStatements == null) { - epStatements = new ArrayList<>(); - } - for (String statement : statements) { - epStatements.add(epService.getEPAdministrator().createEPL(statement)); - } - } - - @Override - public void onEvent(Event event, SpOutputCollector collector) { - //MapUtils.debugPrint(System.out, "", event); - //if (i % 10000 == 0) System.out.println(i +" in Esper."); - epService.getEPRuntime().sendEvent(event.getRaw(), event.getSourceInfo().getSourceId()); - } - - @Override - public void onDetach() { - LOG.info("Removing existing statements"); - for (EPStatement epStatement : epStatements) { - epService.getEPAdministrator().getStatement(epStatement.getName()).removeAllListeners(); - epService.getEPAdministrator().getStatement(epStatement.getName()).stop(); - epService.getEPAdministrator().getStatement(epStatement.getName()).destroy(); - } - epStatements.clear(); - for (String eventName : eventTypeNames) { - try { - epService.getEPAdministrator().getConfiguration().removeEventType(eventName, false); - } catch (ConfigurationException ce) { - LOG.error("Event type used in another statement which is still running, skipping..."); - } - } - - queue.interrupt(); - } - - private static UpdateListener listenerSendingTo(AbstractQueueRunnable queue) { - return new UpdateListener() { - - @Override - public void update(EventBean[] newEvents, EventBean[] oldEvents) { - try { - if (newEvents != null) { - queue.add(newEvents); - } else { - queue.add(oldEvents); - } - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }; - } - - protected abstract List statements(final T bindingParameters); - - protected String fixEventName(String eventName) { - return "`" + eventName + "`"; - } - - protected List makeStatementList(String statement) { - return Utils.createList(statement); - } - - protected Writer getWriter(SpOutputCollector collector, EventProcessorRuntimeContext runtimeContext) { - return EsperEngineConfig.getDefaultWriter(collector, runtimeContext); - } -} diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/StatementAwareQueue.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/StatementAwareQueue.java deleted file mode 100644 index 943d541a1f..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/StatementAwareQueue.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.streampipes.wrapper.esper; - -import com.espertech.esper.client.EventBean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.streampipes.wrapper.esper.writer.Writer; - -public class StatementAwareQueue extends AbstractQueueRunnable { - - private static final Logger LOG = LoggerFactory.getLogger(StatementAwareQueue.class); - - private int counter = 0; - private Writer writer; - - public StatementAwareQueue(Writer writer, int maxQueueSize, int closeAfter) { - super(maxQueueSize, closeAfter); - this.writer = writer; - } - - public StatementAwareQueue(Writer writer, int maxQueueSize) { - super(maxQueueSize); - this.writer = writer; - } - - @Override - protected void doNext(EventBean[] newEvents) throws Exception { - currentTimestamp = System.currentTimeMillis(); - counter++; - if (counter % 100000 == 0) { - LOG.info("{} Events received.", counter); - } - writer.onEvent(newEvents[0]); - } - -} diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/config/EsperEngineConfig.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/config/EsperEngineConfig.java deleted file mode 100644 index 99818649a9..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/config/EsperEngineConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.streampipes.wrapper.esper.config; - -import org.streampipes.wrapper.context.EventProcessorRuntimeContext; -import org.streampipes.wrapper.esper.writer.SEPAWriter; -import org.streampipes.wrapper.esper.writer.Writer; -import org.streampipes.wrapper.routing.SpOutputCollector; - -public class EsperEngineConfig { - - - public static Writer getDefaultWriter(SpOutputCollector collector, EventProcessorRuntimeContext runtimeContext) { - return new SEPAWriter(collector, runtimeContext); - } -} diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/SEPAWriter.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/SEPAWriter.java deleted file mode 100644 index f2fd7dfd7e..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/SEPAWriter.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.streampipes.wrapper.esper.writer; - -import com.espertech.esper.client.EventBean; -import org.streampipes.model.runtime.Event; -import org.streampipes.model.runtime.EventFactory; -import org.streampipes.wrapper.context.EventProcessorRuntimeContext; -import org.streampipes.wrapper.routing.SpOutputCollector; - -import java.util.Map; - -public class SEPAWriter implements Writer { - - private SpOutputCollector collector; - private EventProcessorRuntimeContext runtimeContext; - - public SEPAWriter(SpOutputCollector collector, EventProcessorRuntimeContext runtimeContext) { - this.collector = collector; - this.runtimeContext = runtimeContext; - } - - @Override - public void onEvent(EventBean bean) { - //System.out.println(new Gson().toJson(bean.getUnderlying())); - Event event = EventFactory.fromMap((Map) bean.getUnderlying(), runtimeContext - .getOutputSourceInfo(), - runtimeContext.getOutputSchemaInfo()); - collector.collect(event); - } - -} diff --git a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/Writer.java b/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/Writer.java deleted file mode 100644 index 463a29578c..0000000000 --- a/streampipes-wrapper-esper/src/main/java/org/streampipes/wrapper/esper/writer/Writer.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.streampipes.wrapper.esper.writer; - -import com.espertech.esper.client.EventBean; - -public interface Writer { - - void onEvent(EventBean bean); -} From 6d041e1ba2b0bc97d18720ebcb49dd1737186fbf Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 20:14:25 +0200 Subject: [PATCH 15/24] Fix #284: Remove dependencies to org.json and unirest --- pom.xml | 5 + streampipes-app-file-export/pom.xml | 6 +- .../app/file/export/impl/Elasticsearch.java | 35 ++- streampipes-connect/pom.xml | 5 +- .../connect/adapter/format/xml/XmlParser.java | 19 +- .../connect/adapter/TestUtils.java | 46 +++ .../format/json/arraykey/JsonParserTest.java | 99 +++--- .../json/arraynokey/JsonArrayParserTest.java | 99 +++--- .../json/object/JsonObjectParserTest.java | 24 +- streampipes-container/pom.xml | 10 +- .../container/util/ConsulUtil.java | 291 +++++++++--------- streampipes-pipeline-management/pom.xml | 5 - .../runtime/SepStoppedMonitoring.java | 262 ++++++++-------- 13 files changed, 465 insertions(+), 441 deletions(-) create mode 100644 streampipes-connect/src/test/java/org/streampipes/connect/adapter/TestUtils.java diff --git a/pom.xml b/pom.xml index 2e1bf256c6..d079b86c57 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,11 @@ jackson-databind ${jackson.version} + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + com.fasterxml.jackson.core jackson-core diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index a7a4df490b..2fdab3adc6 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -42,9 +42,9 @@ streampipes-storage-couchdb - com.mashape.unirest - unirest-java - 1.4.9 + org.apache.httpcomponents + fluent-hc + 4.5.5 com.jayway.restassured diff --git a/streampipes-app-file-export/src/main/java/org/streampipes/app/file/export/impl/Elasticsearch.java b/streampipes-app-file-export/src/main/java/org/streampipes/app/file/export/impl/Elasticsearch.java index 70dbbe43f8..25e54fd652 100644 --- a/streampipes-app-file-export/src/main/java/org/streampipes/app/file/export/impl/Elasticsearch.java +++ b/streampipes-app-file-export/src/main/java/org/streampipes/app/file/export/impl/Elasticsearch.java @@ -19,15 +19,17 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.mashape.unirest.http.HttpResponse; -import com.mashape.unirest.http.JsonNode; -import com.mashape.unirest.http.Unirest; -import com.mashape.unirest.http.exceptions.UnirestException; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; -import org.elasticsearch.action.search.*; +import org.apache.http.client.fluent.Request; +import org.elasticsearch.action.search.ClearScrollRequest; +import org.elasticsearch.action.search.ClearScrollResponse; +import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; @@ -47,7 +49,9 @@ import org.streampipes.app.file.export.model.IndexInfo; import org.streampipes.storage.couchdb.utils.Utils; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -158,9 +162,9 @@ public Response getFile(@PathParam("fileName") String fileName) { public Response getIndices() { String url = ElasticsearchConfig.INSTANCE.getElasticsearchURL() + "/_cat/indices?v"; try { - HttpResponse jsonResponse = unirestGet(url); + JsonElement jsonResponse = get(url); - JsonArray response = new JsonParser().parse(jsonResponse.getBody().toString()).getAsJsonArray(); + JsonArray response = jsonResponse.getAsJsonArray(); List availableIndices = new ArrayList<>(); for(int i = 0; i < response.size(); i++) { JsonObject object = response.get(i).getAsJsonObject(); @@ -171,7 +175,7 @@ public Response getIndices() { } } return Response.ok(availableIndices).build(); - } catch (UnirestException e) { + } catch (IOException e) { e.printStackTrace(); return Response.serverError().build(); } @@ -216,12 +220,13 @@ private FileOutputStream getFileStream(String filePath) throws IOException { return new FileOutputStream(filePath); } - private HttpResponse unirestGet(String url) throws UnirestException { - HttpResponse jsonResponse = Unirest.get(url) - .header("accept", "application/json") - .header("Content-Type", "application/json") - .asJson(); - return jsonResponse; + private JsonElement get(String url) throws IOException { + String jsonResponse = Request.Get(url) + .addHeader("accept", "application/json") + .addHeader("Content-Type", "application/json") + .execute() + .returnContent().asString(); + return new JsonParser().parse(jsonResponse); } private RestHighLevelClient getRestHighLevelClient() { diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 67f7037fff..d7adc42787 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -96,9 +96,8 @@ 1.8 - org.json - json - 20171018 + com.fasterxml.jackson.dataformat + jackson-dataformat-xml \ No newline at end of file diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java index dc5618e373..80067e328f 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java @@ -16,20 +16,18 @@ package org.streampipes.connect.adapter.format.xml; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.google.common.base.Charsets; import com.google.common.io.CharStreams; import com.google.gson.Gson; -import org.json.JSONException; -import org.json.JSONObject; -import org.json.XML; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.streampipes.commons.exceptions.SpRuntimeException; import org.streampipes.connect.EmitBinaryEvent; -import org.streampipes.connect.adapter.model.generic.Parser; +import org.streampipes.connect.adapter.exception.ParseException; import org.streampipes.connect.adapter.format.util.JsonEventProperty; +import org.streampipes.connect.adapter.model.generic.Parser; import org.streampipes.connect.adapter.sdk.ParameterExtractor; -import org.streampipes.connect.adapter.exception.ParseException; import org.streampipes.dataformat.json.JsonDataFormatDefinition; import org.streampipes.model.connect.grounding.FormatDescription; import org.streampipes.model.schema.EventProperty; @@ -38,7 +36,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.*; +import java.util.List; +import java.util.Map; public class XmlParser extends Parser { @@ -68,12 +67,10 @@ public void parse(InputStream data, EmitBinaryEvent emitBinaryEvent) throws Pars try { String dataString = CharStreams.toString(new InputStreamReader(data, Charsets.UTF_8)); - JSONObject xmlJSONObj = XML.toJSONObject(dataString); - searchAndEmitEvents(xmlJSONObj.toMap(), tag, emitBinaryEvent); + XmlMapper xmlMapper = new XmlMapper(); + Map map = xmlMapper.readValue(dataString.getBytes(), Map.class); + searchAndEmitEvents(map, tag, emitBinaryEvent); - } catch (JSONException e) { - logger.error(e.toString()); - throw new ParseException(e.getMessage()); } catch (IOException e) { logger.error(e.toString()); throw new ParseException(e.getMessage()); diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/TestUtils.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/TestUtils.java new file mode 100644 index 0000000000..1e9d9d0eaa --- /dev/null +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/TestUtils.java @@ -0,0 +1,46 @@ +/* +Copyright 2019 FZI Forschungszentrum Informatik + +Licensed 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.streampipes.connect.adapter; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; + +import java.util.Arrays; + +public class TestUtils { + + public static String getJsonArrayWithThreeElements() { + JsonObject jsonObject = new JsonObject(); + jsonObject.add("key0", makeJsonArray( + makeJsonObject("one", 1), + makeJsonObject("one", 2), + makeJsonObject("one", 3))); + return jsonObject.toString(); + } + + public static JsonObject makeJsonObject(String key, Integer value) { + JsonObject jsonObject = new JsonObject(); + jsonObject.add(key, new JsonPrimitive(value)); + return jsonObject; + } + + public static JsonArray makeJsonArray(JsonObject... jsonObjects) { + JsonArray jsonArray = new JsonArray(); + Arrays.stream(jsonObjects).forEach(jsonArray::add); + return jsonArray; + } +} diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java index 16153de575..2cd58a16da 100644 --- a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraykey/JsonParserTest.java @@ -17,9 +17,11 @@ package org.streampipes.connect.adapter.format.json.arraykey; +import static org.junit.Assert.assertEquals; +import static org.streampipes.connect.adapter.TestUtils.*; + +import com.google.gson.JsonObject; import org.apache.commons.io.IOUtils; -import org.json.JSONArray; -import org.json.JSONObject; import org.junit.Test; import org.streampipes.connect.adapter.exception.AdapterException; @@ -28,82 +30,71 @@ import java.nio.charset.StandardCharsets; import java.util.List; -import static org.junit.Assert.assertEquals; - - public class JsonParserTest { - @Test - public void parseOneEvent() throws AdapterException { + @Test + public void parseOneEvent() throws AdapterException { - String jo = getJsonArrayWithThreeElements(); + String jo = getJsonArrayWithThreeElements(); - JsonParser parser = new JsonParser(true, "key0"); + JsonParser parser = new JsonParser(true, "key0"); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 1); + List parsedEvent = parser.parseNEvents(getInputStream(jo), 1); - assertEquals(parsedEvent.size(), 1); - String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); + assertEquals(parsedEvent.size(), 1); + String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals(parsedStringEvent, "{\"one\":1}"); - } + assertEquals(parsedStringEvent, "{\"one\":1}"); + } - @Test - public void parseThreeEvents() throws AdapterException { + @Test + public void parseThreeEvents() throws AdapterException { - String jo = getJsonArrayWithThreeElements(); - JsonParser parser = new JsonParser(true, "key0"); + String jo = getJsonArrayWithThreeElements(); + JsonParser parser = new JsonParser(true, "key0"); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 3); + List parsedEvent = parser.parseNEvents(getInputStream(jo), 3); - assertEquals(3, parsedEvent.size()); - String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - String parsedStringEventTwo = new String(parsedEvent.get(1), StandardCharsets.UTF_8); - String parsedStringEventThree = new String(parsedEvent.get(2), StandardCharsets.UTF_8); + assertEquals(3, parsedEvent.size()); + String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); + String parsedStringEventTwo = new String(parsedEvent.get(1), StandardCharsets.UTF_8); + String parsedStringEventThree = new String(parsedEvent.get(2), StandardCharsets.UTF_8); - assertEquals( "{\"one\":1}", parsedStringEventOne); - assertEquals("{\"one\":2}", parsedStringEventTwo); - assertEquals("{\"one\":3}", parsedStringEventThree); - } + assertEquals("{\"one\":1}", parsedStringEventOne); + assertEquals("{\"one\":2}", parsedStringEventTwo); + assertEquals("{\"one\":3}", parsedStringEventThree); + } - private String getJsonArrayWithThreeElements() { - return new JSONObject() - .put("key0", new JSONArray() - .put(new JSONObject().put("one", 1)) - .put(new JSONObject().put("one", 2)) - .put(new JSONObject().put("one", 3)) - ).toString(); - } - @Test - public void parseMoreThenExist() throws AdapterException { - String jo = new JSONObject() - .put("key0", new JSONArray() - .put(new JSONObject().put("one", 1)) - ).toString(); - JsonParser parser = new JsonParser(true, "key0"); + @Test + public void parseMoreThenExist() throws AdapterException { - List parsedEvent = parser.parseNEvents(getInputStream(jo), 10); + JsonObject jo = new JsonObject(); + jo.add("key0", makeJsonArray( + makeJsonObject("one", 1))); + JsonParser parser = new JsonParser(true, "key0"); - assertEquals(1, parsedEvent.size()); - String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); + List parsedEvent = parser.parseNEvents(getInputStream(jo.toString()), 10); - assertEquals( "{\"one\":1}", parsedStringEventOne); - } + assertEquals(1, parsedEvent.size()); + String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - private InputStream getInputStream(String s) { + assertEquals("{\"one\":1}", parsedStringEventOne); + } - try { - return IOUtils.toInputStream(s, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } + private InputStream getInputStream(String s) { - return null; + try { + return IOUtils.toInputStream(s, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); } + + return null; + } } \ No newline at end of file diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java index ecd040d9f0..e5b4378c76 100644 --- a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/arraynokey/JsonArrayParserTest.java @@ -17,9 +17,12 @@ package org.streampipes.connect.adapter.format.json.arraynokey; +import static org.junit.Assert.assertEquals; +import static org.streampipes.connect.adapter.TestUtils.getJsonArrayWithThreeElements; +import static org.streampipes.connect.adapter.TestUtils.makeJsonObject; + +import com.google.gson.JsonArray; import org.apache.commons.io.IOUtils; -import org.json.JSONArray; -import org.json.JSONObject; import org.junit.Test; import org.streampipes.connect.adapter.exception.AdapterException; @@ -28,81 +31,69 @@ import java.nio.charset.StandardCharsets; import java.util.List; -import static org.junit.Assert.assertEquals; - public class JsonArrayParserTest { - @Test - public void parseOneEvent() throws AdapterException { + @Test + public void parseOneEvent() throws AdapterException { - String jo = getJsonArrayWithThreeElements(); + String jo = getJsonArrayWithThreeElements(); - JsonArrayParser parser = new JsonArrayParser(); + JsonArrayParser parser = new JsonArrayParser(); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 1); + List parsedEvent = parser.parseNEvents(getInputStream(jo), 1); - assertEquals(parsedEvent.size(), 1); - String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); + assertEquals(parsedEvent.size(), 1); + String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals(parsedStringEvent, "{\"one\":1}"); - } + assertEquals(parsedStringEvent, "{\"one\":1}"); + } - @Test - public void parseThreeEvents() throws AdapterException { + @Test + public void parseThreeEvents() throws AdapterException { - String jo = getJsonArrayWithThreeElements(); - JsonArrayParser parser = new JsonArrayParser(); + String jo = getJsonArrayWithThreeElements(); + JsonArrayParser parser = new JsonArrayParser(); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 3); + List parsedEvent = parser.parseNEvents(getInputStream(jo), 3); - assertEquals(3, parsedEvent.size()); - String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - String parsedStringEventTwo = new String(parsedEvent.get(1), StandardCharsets.UTF_8); - String parsedStringEventThree = new String(parsedEvent.get(2), StandardCharsets.UTF_8); + assertEquals(3, parsedEvent.size()); + String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); + String parsedStringEventTwo = new String(parsedEvent.get(1), StandardCharsets.UTF_8); + String parsedStringEventThree = new String(parsedEvent.get(2), StandardCharsets.UTF_8); - assertEquals( "{\"one\":1}", parsedStringEventOne); - assertEquals("{\"one\":2}", parsedStringEventTwo); - assertEquals("{\"one\":3}", parsedStringEventThree); - } - - private String getJsonArrayWithThreeElements() { - return new JSONObject() - .put("key0", new JSONArray() - .put(new JSONObject().put("one", 1)) - .put(new JSONObject().put("one", 2)) - .put(new JSONObject().put("one", 3)) - ).toString(); - } + assertEquals("{\"one\":1}", parsedStringEventOne); + assertEquals("{\"one\":2}", parsedStringEventTwo); + assertEquals("{\"one\":3}", parsedStringEventThree); + } - @Test - public void parseMoreThenExist() throws AdapterException { + @Test + public void parseMoreThenExist() throws AdapterException { - String jo = new JSONArray() - .put(new JSONObject().put("one", 1)) - .toString(); + JsonArray jsonArray = new JsonArray(); + jsonArray.add(makeJsonObject("one", 1)); - JsonArrayParser parser = new JsonArrayParser(); + JsonArrayParser parser = new JsonArrayParser(); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 10); + List parsedEvent = parser.parseNEvents(getInputStream(jsonArray.toString()), 10); - assertEquals(1, parsedEvent.size()); - String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); + assertEquals(1, parsedEvent.size()); + String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals( "{\"one\":1}", parsedStringEventOne); - } + assertEquals("{\"one\":1}", parsedStringEventOne); + } - private InputStream getInputStream(String s) { + private InputStream getInputStream(String s) { - try { - return IOUtils.toInputStream(s, "UTF-8"); - } catch (IOException e) { - e.printStackTrace(); - } - - return null; + try { + return IOUtils.toInputStream(s, "UTF-8"); + } catch (IOException e) { + e.printStackTrace(); } + return null; + } + } \ No newline at end of file diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java index f113b8fe5b..b1470d2dbd 100644 --- a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/object/JsonObjectParserTest.java @@ -17,8 +17,11 @@ package org.streampipes.connect.adapter.format.json.object; +import static org.junit.Assert.assertEquals; +import static org.streampipes.connect.adapter.TestUtils.makeJsonObject; + +import com.google.gson.JsonObject; import org.apache.commons.io.IOUtils; -import org.json.JSONObject; import org.junit.Test; import org.streampipes.connect.adapter.exception.AdapterException; @@ -27,23 +30,16 @@ import java.nio.charset.StandardCharsets; import java.util.List; -import static org.junit.Assert.assertEquals; - public class JsonObjectParserTest { @Test public void parseOneEvent() throws AdapterException { -// String jo = getJsonArrayWithThreeElements(); - - String jo = new JSONObject() - .put("one", 1) - .toString(); - + JsonObject jo = makeJsonObject("one", 1); JsonObjectParser parser = new JsonObjectParser(); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 1); + List parsedEvent = parser.parseNEvents(getInputStream(jo.toString()), 1); assertEquals(parsedEvent.size(), 1); String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); @@ -54,13 +50,11 @@ public void parseOneEvent() throws AdapterException { @Test public void parseMoreThenExist() throws AdapterException { - String jo = new JSONObject() - .put("one", 1) - .toString(); + JsonObject jo = makeJsonObject("one", 1); JsonObjectParser parser = new JsonObjectParser(); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 10); + List parsedEvent = parser.parseNEvents(getInputStream(jo.toString()), 10); assertEquals(1, parsedEvent.size()); String parsedStringEventOne = new String(parsedEvent.get(0), StandardCharsets.UTF_8); @@ -78,6 +72,4 @@ private InputStream getInputStream(String s) { return null; } - - } \ No newline at end of file diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 2a20671c5b..7d27c59587 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -61,14 +61,14 @@ javax.ws.rs javax.ws.rs-api - - com.mashape.unirest - unirest-java - 1.4.9 - com.orbitz.consul consul-client + + org.apache.httpcomponents + fluent-hc + 4.5.5 + \ No newline at end of file diff --git a/streampipes-container/src/main/java/org/streampipes/container/util/ConsulUtil.java b/streampipes-container/src/main/java/org/streampipes/container/util/ConsulUtil.java index a47921ae4c..1d7df0d7f6 100644 --- a/streampipes-container/src/main/java/org/streampipes/container/util/ConsulUtil.java +++ b/streampipes-container/src/main/java/org/streampipes/container/util/ConsulUtil.java @@ -17,19 +17,21 @@ package org.streampipes.container.util; -import com.mashape.unirest.http.HttpResponse; -import com.mashape.unirest.http.JsonNode; -import com.mashape.unirest.http.Unirest; -import com.mashape.unirest.http.exceptions.UnirestException; -import com.orbitz.consul.*; +import com.orbitz.consul.AgentClient; +import com.orbitz.consul.Consul; +import com.orbitz.consul.HealthClient; +import com.orbitz.consul.KeyValueClient; import com.orbitz.consul.model.ConsulResponse; import com.orbitz.consul.model.health.HealthCheck; import com.orbitz.consul.model.health.Service; import com.orbitz.consul.model.health.ServiceHealth; import com.orbitz.consul.model.kv.Value; +import org.apache.http.client.fluent.Request; +import org.apache.http.entity.StringEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; @@ -39,37 +41,37 @@ public class ConsulUtil { - private static final String PROTOCOL = "http://"; + private static final String PROTOCOL = "http://"; - private static final String HEALTH_CHECK_INTERVAL = "10s"; - //private static final String HEALTH_CHECK_TTL = "15s"; - //private static final String CONSUL_DEREGISTER_SERIVER_AFTER = "10s"; - private static final String PE_SERVICE_NAME = "pe"; + private static final String HEALTH_CHECK_INTERVAL = "10s"; + //private static final String HEALTH_CHECK_TTL = "15s"; + //private static final String CONSUL_DEREGISTER_SERIVER_AFTER = "10s"; + private static final String PE_SERVICE_NAME = "pe"; - private static final String CONSUL_ENV_LOCATION = "CONSUL_LOCATION"; - private static final String CONSUL_URL_REGISTER_SERVICE = "v1/agent/service/register"; + private static final String CONSUL_ENV_LOCATION = "CONSUL_LOCATION"; + private static final String CONSUL_URL_REGISTER_SERVICE = "v1/agent/service/register"; - static Logger LOG = LoggerFactory.getLogger(ConsulUtil.class); + static Logger LOG = LoggerFactory.getLogger(ConsulUtil.class); - public static Consul consulInstance() { - return Consul.builder().withUrl(consulURL()).build(); - } + public static Consul consulInstance() { + return Consul.builder().withUrl(consulURL()).build(); + } - public static void registerPeService(String serviceID, String url, int port) { - registerService(PE_SERVICE_NAME, serviceID, url, port, "pe"); - } + public static void registerPeService(String serviceID, String url, int port) { + registerService(PE_SERVICE_NAME, serviceID, url, port, "pe"); + } - public static void registerService(String serviceName, String serviceID, String url, int port, String tag) { - String body = createServiceRegisterBody(serviceName, serviceID, url, port, tag); - try { - registerServiceHttpClient(body); - LOG.info("Register service " + serviceID, "succesful"); - } catch (UnirestException e) { - LOG.error("Register service: " + serviceID, " - " + e.toString()); - } + public static void registerService(String serviceName, String serviceID, String url, int port, String tag) { + String body = createServiceRegisterBody(serviceName, serviceID, url, port, tag); + try { + registerServiceHttpClient(body); + LOG.info("Register service " + serviceID, "succesful"); + } catch (IOException e) { + LOG.error("Register service: " + serviceID, " - " + e.toString()); } + } - //NOT TESTED + //NOT TESTED /* public static void subcribeHealthService() { Consul consul = consulInstance(); HealthClient healthClient = consul.healthClient(); @@ -87,138 +89,139 @@ public void notify(Map map) { } */ - public static Map getPEServices() { - LOG.info("Load PE service status"); - Consul consul = consulInstance(); - AgentClient agent = consul.agentClient(); - - Map services = consul.agentClient().getServices(); - Map checks = agent.getChecks(); - - Map peServices = new HashMap<>(); - - for(Map.Entry entry : services.entrySet()) { - if(entry.getValue().getTags().contains(PE_SERVICE_NAME)) { - String serviceId = entry.getValue().getId(); - String serviceStatus = "critical"; - if(checks.containsKey("service:" + entry.getKey())) { - serviceStatus = checks.get("service:" + entry.getKey()).getStatus(); - } - LOG.info("Service id: " + serviceId + " service status: " + serviceStatus); - peServices.put(serviceId, serviceStatus); - } + public static Map getPEServices() { + LOG.info("Load PE service status"); + Consul consul = consulInstance(); + AgentClient agent = consul.agentClient(); + + Map services = consul.agentClient().getServices(); + Map checks = agent.getChecks(); + + Map peServices = new HashMap<>(); + + for (Map.Entry entry : services.entrySet()) { + if (entry.getValue().getTags().contains(PE_SERVICE_NAME)) { + String serviceId = entry.getValue().getId(); + String serviceStatus = "critical"; + if (checks.containsKey("service:" + entry.getKey())) { + serviceStatus = checks.get("service:" + entry.getKey()).getStatus(); } - return peServices; + LOG.info("Service id: " + serviceId + " service status: " + serviceStatus); + peServices.put(serviceId, serviceStatus); + } } + return peServices; + } - public static Map getKeyValue(String route) { - Consul consul = consulInstance(); - KeyValueClient keyValueClient = consul.keyValueClient(); + public static Map getKeyValue(String route) { + Consul consul = consulInstance(); + KeyValueClient keyValueClient = consul.keyValueClient(); - Map keyValues = new HashMap<>(); + Map keyValues = new HashMap<>(); - ConsulResponse> consulResponseWithValues = keyValueClient.getConsulResponseWithValues(route); + ConsulResponse> consulResponseWithValues = keyValueClient.getConsulResponseWithValues(route); - if(consulResponseWithValues.getResponse() != null) { - for (Value value: consulResponseWithValues.getResponse()) { - String key = value.getKey(); - String v = ""; - if(value.getValueAsString().isPresent()) { - v = value.getValueAsString().get(); - } - LOG.info("Load key: " + route + " value: " + v); - keyValues.put(key, v); - } + if (consulResponseWithValues.getResponse() != null) { + for (Value value : consulResponseWithValues.getResponse()) { + String key = value.getKey(); + String v = ""; + if (value.getValueAsString().isPresent()) { + v = value.getValueAsString().get(); } - return keyValues; + LOG.info("Load key: " + route + " value: " + v); + keyValues.put(key, v); + } } + return keyValues; + } - public static void updateConfig(String key, String entry, boolean password) { - Consul consul = consulInstance(); - KeyValueClient keyValueClient = consul.keyValueClient(); + public static void updateConfig(String key, String entry, boolean password) { + Consul consul = consulInstance(); + KeyValueClient keyValueClient = consul.keyValueClient(); - if(!password) { - keyValueClient.putValue(key, entry); - } + if (!password) { + keyValueClient.putValue(key, entry); + } // keyValueClient.putValue(key + "_description", description); // keyValueClient.putValue(key + "_type", valueType); - LOG.info("Updated config - key:" + key + - " value: " + entry); + LOG.info("Updated config - key:" + key + + " value: " + entry); // + // " description: " + description + // " type: " + valueType); + } + + public static List getActivePEServicesEndPoints() { + LOG.info("Load active PE services endpoints"); + Consul consul = consulInstance(); + HealthClient healthClient = consul.healthClient(); + List endpoints = new LinkedList<>(); + + List nodes = healthClient.getHealthyServiceInstances(PE_SERVICE_NAME).getResponse(); + for (ServiceHealth node : nodes) { + String endpoint = node.getService().getAddress() + ":" + node.getService().getPort(); + LOG.info("Active PE endpoint:" + endpoint); + endpoints.add(endpoint); } - - public static List getActivePEServicesEndPoints() { - LOG.info("Load active PE services endpoints"); - Consul consul = consulInstance(); - HealthClient healthClient = consul.healthClient(); - List endpoints = new LinkedList<>(); - - List nodes = healthClient.getHealthyServiceInstances(PE_SERVICE_NAME).getResponse(); - for (ServiceHealth node: nodes) { - String endpoint = node.getService().getAddress() + ":" + node.getService().getPort(); - LOG.info("Active PE endpoint:" + endpoint); - endpoints.add(endpoint); - } - return endpoints; - } - - public static void deregisterService(String serviceId) { - Consul consul = consulInstance(); - - consul.agentClient().deregister(serviceId); - LOG.info("Deregistered Service: " + serviceId); - } - - private static int registerServiceHttpClient(String body) throws UnirestException { - HttpResponse jsonResponse = Unirest.put(consulURL().toString() + "/" + CONSUL_URL_REGISTER_SERVICE) - .header("accept", "application/json") - .body(body) - .asJson(); - return jsonResponse.getStatus(); - } - - private static String createServiceRegisterBody(String name, String id, String url, int port, String tag) { - String healthCheckURL = PROTOCOL + url + ":" + port; - - return "{" + - "\"ID\": \"" + id + "\"," + - "\"Name\": \"" + name + "\"," + - "\"Tags\": [" + - " \"" + tag + "\"" + ",\"urlprefix-/" +id +" strip=/" +id +"\"" + - " ]," + - " \"Address\": \""+ PROTOCOL +url + "\"," + - " \"Port\":" + port + "," + - " \"EnableTagOverride\": true" + "," + - "\"Check\": {" + - " \"Method\": \"GET\"" + "," + - " \"http\":" + "\"" + healthCheckURL + "\"," + - // " \"DeregisterCriticalServiceAfter\":" + "\"" + CONSUL_DEREGISTER_SERIVER_AFTER + "\"," + - " \"interval\":" + "\"" + HEALTH_CHECK_INTERVAL + "\"" + //"," + - //" \"TTL\":" + "\"" + HEALTH_CHECK_TTL + "\"" + - " }" + - "}"; - } - - private static URL consulURL() { - Map env = System.getenv(); - URL url = null; - - if (env.containsKey(CONSUL_ENV_LOCATION)) { - try { - url = new URL("http", env.get(CONSUL_ENV_LOCATION), 8500, ""); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } else { - try { - url = new URL("http", "localhost", 8500, ""); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - return url; + return endpoints; + } + + public static void deregisterService(String serviceId) { + Consul consul = consulInstance(); + + consul.agentClient().deregister(serviceId); + LOG.info("Deregistered Service: " + serviceId); + } + + private static int registerServiceHttpClient(String body) throws IOException { + return Request.Put(consulURL().toString() + "/" + CONSUL_URL_REGISTER_SERVICE) + .addHeader("accept", "application/json") + .body(new StringEntity(body)) + .execute() + .returnResponse() + .getStatusLine().getStatusCode(); + } + + private static String createServiceRegisterBody(String name, String id, String url, int port, String tag) { + String healthCheckURL = PROTOCOL + url + ":" + port; + + return "{" + + "\"ID\": \"" + id + "\"," + + "\"Name\": \"" + name + "\"," + + "\"Tags\": [" + + " \"" + tag + "\"" + ",\"urlprefix-/" + id + " strip=/" + id + "\"" + + " ]," + + " \"Address\": \"" + PROTOCOL + url + "\"," + + " \"Port\":" + port + "," + + " \"EnableTagOverride\": true" + "," + + "\"Check\": {" + + " \"Method\": \"GET\"" + "," + + " \"http\":" + "\"" + healthCheckURL + "\"," + + // " \"DeregisterCriticalServiceAfter\":" + "\"" + CONSUL_DEREGISTER_SERIVER_AFTER + "\"," + + " \"interval\":" + "\"" + HEALTH_CHECK_INTERVAL + "\"" + //"," + + //" \"TTL\":" + "\"" + HEALTH_CHECK_TTL + "\"" + + " }" + + "}"; + } + + private static URL consulURL() { + Map env = System.getenv(); + URL url = null; + + if (env.containsKey(CONSUL_ENV_LOCATION)) { + try { + url = new URL("http", env.get(CONSUL_ENV_LOCATION), 8500, ""); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } else { + try { + url = new URL("http", "localhost", 8500, ""); + } catch (MalformedURLException e) { + e.printStackTrace(); + } } + return url; + } } diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 2ab51e79b5..97eb4196a4 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -112,11 +112,6 @@ javax.ws.rs-api 2.0.1 - - org.json - json - 20180130 - org.streampipes streampipes-container diff --git a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/monitoring/runtime/SepStoppedMonitoring.java b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/monitoring/runtime/SepStoppedMonitoring.java index 914f46f657..1ccd4b3b00 100644 --- a/streampipes-pipeline-management/src/main/java/org/streampipes/manager/monitoring/runtime/SepStoppedMonitoring.java +++ b/streampipes-pipeline-management/src/main/java/org/streampipes/manager/monitoring/runtime/SepStoppedMonitoring.java @@ -17,7 +17,8 @@ package org.streampipes.manager.monitoring.runtime; -import org.json.JSONObject; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import org.streampipes.commons.exceptions.NoMatchingFormatException; import org.streampipes.commons.exceptions.NoMatchingProtocolException; import org.streampipes.commons.exceptions.NoMatchingSchemaException; @@ -41,137 +42,136 @@ import java.util.Map; /** - * - * + * */ public class SepStoppedMonitoring implements EpRuntimeMonitoring, Runnable { - private Map> streamToObserver; - private Map streamToStoppedMonitoringPipeline; - private SpKafkaConsumer kafkaConsumerGroup; - - @Override - public boolean register(PipelineObserver observer) { - - try { - Pipeline pipeline = new PipelineStorageImpl().getPipeline(observer.getPipelineId()); - - List allStreams = new ArrayList<>(); - pipeline.getStreams().forEach((s) -> allStreams.add(s)); - - for (SpDataStream s : allStreams) { - if (streamToObserver.get(s.getElementId()) == null) { - List po = new ArrayList<>(); - po.add(observer); - - // TODO fix this s.getSourceId() is always null - String streamId = s.getElementId(); - String sourceId = streamId.substring(0, streamId.lastIndexOf("/")); - - streamToObserver.put(streamId, po); - Pipeline p = new SepStoppedMonitoringPipelineBuilder(sourceId, streamId).buildPipeline(); - Operations.startPipeline(p, false, false, false); - streamToStoppedMonitoringPipeline.put(streamId, p); - - } else { - streamToObserver.get(s.getElementId()).add(observer); - } - } - - } catch (URISyntaxException e) { - e.printStackTrace(); - } catch (NoMatchingFormatException e) { - e.printStackTrace(); - } catch (NoMatchingSchemaException e) { - e.printStackTrace(); - } catch (NoMatchingProtocolException e) { - e.printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - } - - return false; - } - - @Override - public boolean remove(PipelineObserver observer) { - - Pipeline pipeline = new PipelineStorageImpl().getPipeline(observer.getPipelineId()); - List streams = pipeline.getStreams(); - - for (SpDataStream sc : streams) { - String streamId = sc.getElementId(); - List po = streamToObserver.get(streamId); - if (po.size() == 1) { - streamToObserver.remove(streamId); - - Operations.stopPipeline(streamToStoppedMonitoringPipeline.get(streamId), false, false, false); - streamToStoppedMonitoringPipeline.remove(streamId); - } else { - po.remove(observer); - } - - } - - return false; - } - - private class KafkaCallback implements InternalEventProcessor { - - @Override - public void onEvent(byte[] payload) { - String str = new String(payload, StandardCharsets.UTF_8); - JSONObject jo = new JSONObject(str); - - List listPos = streamToObserver.get(jo.get("topic")); - for (PipelineObserver po : listPos) { - po.update(); - } - - - } - - } - - @Override - public void run() { - streamToObserver = new HashMap<>(); - streamToStoppedMonitoringPipeline = new HashMap<>(); - - String topic = "internal.streamepipes.sec.stopped"; - - kafkaConsumerGroup = new SpKafkaConsumer(BackendConfig.INSTANCE.getKafkaUrl(), topic, - new KafkaCallback()); - Thread thread = new Thread(kafkaConsumerGroup); - thread.start(); - - } - - public static void main(String[] args) throws IOException { - SepStoppedMonitoring monitoring = new SepStoppedMonitoring(); - monitoring.run(); - - // Montrac 01 - String id = "baaaf5b2-5412-4ac1-a7eb-04aeaf0e12b8"; - PipelineObserver observer1 = new PipelineObserver(id); - - // Montrac 02 - id = "ef915142-2a08-4166-8bea-8d946ae31cd6"; - PipelineObserver observer2 = new PipelineObserver(id); - - // Random Number Stream - id = "b3c0b6ad-05df-4670-a078-83775eeb550b"; - PipelineObserver observer3 = new PipelineObserver(id); - - monitoring.register(observer1); - monitoring.register(observer2); - monitoring.register(observer3); - - BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); - String s = br.readLine(); - monitoring.remove(observer1); - monitoring.remove(observer2); - monitoring.remove(observer3); - System.out.println("laalal"); - } + private Map> streamToObserver; + private Map streamToStoppedMonitoringPipeline; + private SpKafkaConsumer kafkaConsumerGroup; + + @Override + public boolean register(PipelineObserver observer) { + + try { + Pipeline pipeline = new PipelineStorageImpl().getPipeline(observer.getPipelineId()); + + List allStreams = new ArrayList<>(); + pipeline.getStreams().forEach((s) -> allStreams.add(s)); + + for (SpDataStream s : allStreams) { + if (streamToObserver.get(s.getElementId()) == null) { + List po = new ArrayList<>(); + po.add(observer); + + // TODO fix this s.getSourceId() is always null + String streamId = s.getElementId(); + String sourceId = streamId.substring(0, streamId.lastIndexOf("/")); + + streamToObserver.put(streamId, po); + Pipeline p = new SepStoppedMonitoringPipelineBuilder(sourceId, streamId).buildPipeline(); + Operations.startPipeline(p, false, false, false); + streamToStoppedMonitoringPipeline.put(streamId, p); + + } else { + streamToObserver.get(s.getElementId()).add(observer); + } + } + + } catch (URISyntaxException e) { + e.printStackTrace(); + } catch (NoMatchingFormatException e) { + e.printStackTrace(); + } catch (NoMatchingSchemaException e) { + e.printStackTrace(); + } catch (NoMatchingProtocolException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + + return false; + } + + @Override + public boolean remove(PipelineObserver observer) { + + Pipeline pipeline = new PipelineStorageImpl().getPipeline(observer.getPipelineId()); + List streams = pipeline.getStreams(); + + for (SpDataStream sc : streams) { + String streamId = sc.getElementId(); + List po = streamToObserver.get(streamId); + if (po.size() == 1) { + streamToObserver.remove(streamId); + + Operations.stopPipeline(streamToStoppedMonitoringPipeline.get(streamId), false, false, false); + streamToStoppedMonitoringPipeline.remove(streamId); + } else { + po.remove(observer); + } + + } + + return false; + } + + private class KafkaCallback implements InternalEventProcessor { + + @Override + public void onEvent(byte[] payload) { + String str = new String(payload, StandardCharsets.UTF_8); + JsonObject jo = new JsonParser().parse(str).getAsJsonObject(); + + List listPos = streamToObserver.get(jo.get("topic").getAsString()); + for (PipelineObserver po : listPos) { + po.update(); + } + + + } + + } + + @Override + public void run() { + streamToObserver = new HashMap<>(); + streamToStoppedMonitoringPipeline = new HashMap<>(); + + String topic = "internal.streamepipes.sec.stopped"; + + kafkaConsumerGroup = new SpKafkaConsumer(BackendConfig.INSTANCE.getKafkaUrl(), topic, + new KafkaCallback()); + Thread thread = new Thread(kafkaConsumerGroup); + thread.start(); + + } + + public static void main(String[] args) throws IOException { + SepStoppedMonitoring monitoring = new SepStoppedMonitoring(); + monitoring.run(); + + // Montrac 01 + String id = "baaaf5b2-5412-4ac1-a7eb-04aeaf0e12b8"; + PipelineObserver observer1 = new PipelineObserver(id); + + // Montrac 02 + id = "ef915142-2a08-4166-8bea-8d946ae31cd6"; + PipelineObserver observer2 = new PipelineObserver(id); + + // Random Number Stream + id = "b3c0b6ad-05df-4670-a078-83775eeb550b"; + PipelineObserver observer3 = new PipelineObserver(id); + + monitoring.register(observer1); + monitoring.register(observer2); + monitoring.register(observer3); + + BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); + String s = br.readLine(); + monitoring.remove(observer1); + monitoring.remove(observer2); + monitoring.remove(observer3); + System.out.println("laalal"); + } } From 303001de0be600dbf3dde69b00d635eeb3173dfd Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Wed, 18 Sep 2019 20:16:36 +0200 Subject: [PATCH 16/24] Fix #284: Remove dependencies to org.json and unirest --- .../util/TestConsulServiceDiscovery.java | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 streampipes-container/src/test/java/org/streampipes/container/util/TestConsulServiceDiscovery.java diff --git a/streampipes-container/src/test/java/org/streampipes/container/util/TestConsulServiceDiscovery.java b/streampipes-container/src/test/java/org/streampipes/container/util/TestConsulServiceDiscovery.java deleted file mode 100644 index b5a37188e1..0000000000 --- a/streampipes-container/src/test/java/org/streampipes/container/util/TestConsulServiceDiscovery.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2018 FZI Forschungszentrum Informatik - * - * Licensed 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.streampipes.container.util; - -import com.mashape.unirest.http.exceptions.UnirestException; - -public class TestConsulServiceDiscovery { - - public static void main(String[] args) throws UnirestException { - /* ConsulServiceDiscovery.registerPeService("t2", - "t2", - "http://141.21.14.94", - 8090); - */ - //getActivePEServicesRdfEndPoints(); - - } -} From 47124b2cb9b4c853e133ff28e81e50fa7978025b Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 19 Sep 2019 05:32:29 +0200 Subject: [PATCH 17/24] #284: Replace XML parser from org.json with underscore parser --- streampipes-connect/pom.xml | 5 +- .../adapter/format/xml/XmlMapConverter.java | 59 ++++++++ .../connect/adapter/format/xml/XmlParser.java | 130 +++++++++--------- .../adapter/format/json/xml/XmlTest.java | 13 +- 4 files changed, 136 insertions(+), 71 deletions(-) create mode 100644 streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index d7adc42787..ebef12cdc2 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -96,8 +96,9 @@ 1.8 - com.fasterxml.jackson.dataformat - jackson-dataformat-xml + com.github.javadev + underscore + 1.47 \ No newline at end of file diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java new file mode 100644 index 0000000000..733a22d5a8 --- /dev/null +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java @@ -0,0 +1,59 @@ +/* +Copyright 2019 FZI Forschungszentrum Informatik + +Licensed 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.streampipes.connect.adapter.format.xml; + +import java.util.List; +import java.util.Map; + +public class XmlMapConverter { + + private Map inMap; + + public XmlMapConverter(Map inMap) { + this.inMap = inMap; + } + + public Map convert() { + convert(inMap); + return this.inMap; + } + + @SuppressWarnings({"unchecked"}) + private void convert(Map map) { + for (String key : map.keySet()) { + Object value = map.get(key); + if (value instanceof Map) { + convert((Map) map.get(key)); + } else if (value instanceof String) { + String stringValue = String.valueOf(value); + if (isInteger(stringValue)) { + map.put(key, Integer.parseInt(stringValue)); + } + } else if (value instanceof List) { + ((List) value).forEach(item -> convert((Map) item)); + } + } + } + + private Boolean isInteger(String value) { + try { + Integer integer = Integer.parseInt(value); + return true; + } catch (NumberFormatException e) { + return false; + } + } +} diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java index 80067e328f..09288530ab 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java @@ -16,7 +16,8 @@ package org.streampipes.connect.adapter.format.xml; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.underscore.lodash.U; import com.google.common.base.Charsets; import com.google.common.io.CharStreams; import com.google.gson.Gson; @@ -41,91 +42,96 @@ public class XmlParser extends Parser { - Logger logger = LoggerFactory.getLogger(XmlParser.class); + private static final Logger logger = LoggerFactory.getLogger(XmlParser.class); + private static final String ENCODING = "#encoding"; - private String tag; + private String tag; + private ObjectMapper objectMapper; - public XmlParser() { + public XmlParser() { + this.objectMapper = new ObjectMapper(); + } - } - - public XmlParser(String tag) { - this.tag = tag; - } + public XmlParser(String tag) { + this(); + this.tag = tag; + } - @Override - public Parser getInstance(FormatDescription formatDescription) { - ParameterExtractor extractor = new ParameterExtractor(formatDescription.getConfig()); - String tag = extractor.singleValue("tag"); + @Override + public Parser getInstance(FormatDescription formatDescription) { + ParameterExtractor extractor = new ParameterExtractor(formatDescription.getConfig()); + String tag = extractor.singleValue("tag"); - return new XmlParser(tag); - } - - @Override - public void parse(InputStream data, EmitBinaryEvent emitBinaryEvent) throws ParseException { + return new XmlParser(tag); + } - try { - String dataString = CharStreams.toString(new InputStreamReader(data, Charsets.UTF_8)); + @SuppressWarnings({"unchecked"}) + @Override + public void parse(InputStream data, EmitBinaryEvent emitBinaryEvent) throws ParseException { - XmlMapper xmlMapper = new XmlMapper(); - Map map = xmlMapper.readValue(dataString.getBytes(), Map.class); - searchAndEmitEvents(map, tag, emitBinaryEvent); + try { + String dataString = CharStreams.toString(new InputStreamReader(data, Charsets.UTF_8)); - } catch (IOException e) { - logger.error(e.toString()); - throw new ParseException(e.getMessage()); - } + Map map = + (Map) U.fromXmlWithoutNamespacesAndAttributes(dataString); + map.remove(ENCODING); + Map convertedMap = new XmlMapConverter(map).convert(); + searchAndEmitEvents(convertedMap, tag, emitBinaryEvent); + } catch (IOException e) { + logger.error(e.toString()); + throw new ParseException(e.getMessage()); } + } - @Override - public EventSchema getEventSchema(List oneEvent) { - EventSchema resultSchema = new EventSchema(); + @Override + public EventSchema getEventSchema(List oneEvent) { + EventSchema resultSchema = new EventSchema(); - JsonDataFormatDefinition jsonDefinition = new JsonDataFormatDefinition(); + JsonDataFormatDefinition jsonDefinition = new JsonDataFormatDefinition(); - Map exampleEvent = null; + Map exampleEvent = null; - try { - exampleEvent = jsonDefinition.toMap(oneEvent.get(0)); - } catch (SpRuntimeException e) { - logger.error(e.toString()); - } - - for (Map.Entry entry : exampleEvent.entrySet()) - { EventProperty p = JsonEventProperty.getEventProperty(entry.getKey(), entry.getValue()); - resultSchema.addEventProperty(p); - } + try { + exampleEvent = jsonDefinition.toMap(oneEvent.get(0)); + } catch (SpRuntimeException e) { + logger.error(e.toString()); + } - return resultSchema; + for (Map.Entry entry : exampleEvent.entrySet()) { + EventProperty p = JsonEventProperty.getEventProperty(entry.getKey(), entry.getValue()); + resultSchema.addEventProperty(p); } - private void searchAndEmitEvents(Map map, String key, EmitBinaryEvent emitBinaryEvent) { - Gson gson = new Gson(); + return resultSchema; + } - for (Map.Entry entry : map.entrySet()) { - if(entry.getKey().equals(key)) { + private void searchAndEmitEvents(Map map, String key, EmitBinaryEvent emitBinaryEvent) { + Gson gson = new Gson(); - if(entry.getValue() instanceof List) { - List list = (List) entry.getValue(); + for (Map.Entry entry : map.entrySet()) { + if (entry.getKey().equals(key)) { - list.forEach(listEntry -> emitBinaryEvent.emit(gson.toJson(listEntry).getBytes())); + if (entry.getValue() instanceof List) { + List list = (List) entry.getValue(); - } else if(entry.getValue() instanceof Map) { - byte[] bytes = gson.toJson(entry.getValue()).getBytes(); - emitBinaryEvent.emit(bytes); + list.forEach(listEntry -> emitBinaryEvent.emit(gson.toJson(listEntry).getBytes())); - } else { - logger.error("Events are found, but could not disjunct: " + entry.toString()); - } + } else if (entry.getValue() instanceof Map) { + byte[] bytes = gson.toJson(entry.getValue()).getBytes(); + emitBinaryEvent.emit(bytes); - } else if (entry.getValue() instanceof Map) { - searchAndEmitEvents((Map)entry.getValue(), key, emitBinaryEvent); - } else if (entry.getValue() instanceof List) { - List list = (List)entry.getValue(); - list.forEach(listEntry -> searchAndEmitEvents((Map)listEntry, key, emitBinaryEvent)); - } + } else { + logger.error("Events are found, but could not disjunct: " + entry.toString()); } + + } else if (entry.getValue() instanceof Map) { + searchAndEmitEvents((Map) entry.getValue(), key, emitBinaryEvent); + } else if (entry.getValue() instanceof List) { + List list = (List) entry.getValue(); + list.forEach(listEntry -> searchAndEmitEvents((Map) listEntry, key, emitBinaryEvent)); + } } + } } diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java index 6f9a8884a9..60dce2de37 100644 --- a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java @@ -16,10 +16,12 @@ package org.streampipes.connect.adapter.format.json.xml; +import static org.junit.Assert.assertEquals; + import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.streampipes.connect.adapter.format.xml.XmlParser; import org.streampipes.connect.adapter.exception.AdapterException; +import org.streampipes.connect.adapter.format.xml.XmlParser; import org.streampipes.model.schema.EventSchema; import java.io.IOException; @@ -30,8 +32,6 @@ import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; - public class XmlTest { @Test @@ -41,14 +41,13 @@ public void parseEventCarPark() throws AdapterException { XmlParser parser = new XmlParser("parkhaus"); - List parsedEvent = parser.parseNEvents(getInputStream(jo), 1); - assertEquals(parsedEvent.size(), 6); + assertEquals(6, parsedEvent.size()); String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals(parsedStringEvent, "{\"frei\":\"000\",\"tendenz\":3,\"bezeichnung\":\"bahnhof.txt\"," + - "\"zeitstempel\":\"25.07.2018 10:45\",\"gesamt\":114,\"lfdnr\":1,\"status\":1}"); + assertEquals("{\"lfdnr\":1,\"bezeichnung\":\"bahnhof.txt\",\"gesamt\":114,\"frei\":0," + + "\"status\":1,\"zeitstempel\":\"25.07.2018 10:45\",\"tendenz\":3}", parsedStringEvent); } @Test From 686fca92cfbd16cf51607ebd1dcc2a72ded3e6db Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 19 Sep 2019 07:28:33 +0200 Subject: [PATCH 18/24] #284: Fix tests after migration to new parser --- .../adapter/format/xml/XmlMapConverter.java | 44 ++++++++++++++++++- .../connect/adapter/format/xml/XmlParser.java | 2 +- .../adapter/format/json/xml/XmlTest.java | 10 +++-- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java index 733a22d5a8..fad6004dce 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlMapConverter.java @@ -15,6 +15,8 @@ */ package org.streampipes.connect.adapter.format.xml; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,6 +30,7 @@ public XmlMapConverter(Map inMap) { public Map convert() { convert(inMap); + this.inMap = replaceKeys(inMap); return this.inMap; } @@ -41,6 +44,8 @@ private void convert(Map map) { String stringValue = String.valueOf(value); if (isInteger(stringValue)) { map.put(key, Integer.parseInt(stringValue)); + } else if (isFloat(stringValue)) { + map.put(key, Float.parseFloat(stringValue)); } } else if (value instanceof List) { ((List) value).forEach(item -> convert((Map) item)); @@ -48,9 +53,46 @@ private void convert(Map map) { } } + @SuppressWarnings({"unchecked"}) + private Map replaceKeys(Map map) { + Map outMap = new HashMap<>(); + for (String key : map.keySet()) { + String newKey = key; + if (key.startsWith("-")) { + newKey = key.substring(1); + } + if (!key.equals("-self-closing")) { + outMap.put(newKey, makeObject(map.get(key))); + } + } + return outMap; + } + + @SuppressWarnings({"unchecked"}) + private Object makeObject(Object value) { + if (value instanceof List) { + List> values = new ArrayList<>(); + ((List) value).forEach(item -> values.add(replaceKeys((Map) item))); + return values; + } else if (value instanceof Map) { + return replaceKeys((Map) value); + } else { + return value; + } + } + private Boolean isInteger(String value) { try { - Integer integer = Integer.parseInt(value); + Integer.parseInt(value); + return true; + } catch (NumberFormatException e) { + return false; + } + } + + private Boolean isFloat(String value) { + try { + Float.parseFloat(value); return true; } catch (NumberFormatException e) { return false; diff --git a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java index 09288530ab..27272e6245 100644 --- a/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java +++ b/streampipes-connect/src/main/java/org/streampipes/connect/adapter/format/xml/XmlParser.java @@ -73,7 +73,7 @@ public void parse(InputStream data, EmitBinaryEvent emitBinaryEvent) throws Pars String dataString = CharStreams.toString(new InputStreamReader(data, Charsets.UTF_8)); Map map = - (Map) U.fromXmlWithoutNamespacesAndAttributes(dataString); + (Map) U.fromXmlWithoutNamespaces(dataString); map.remove(ENCODING); Map convertedMap = new XmlMapConverter(map).convert(); searchAndEmitEvents(convertedMap, tag, emitBinaryEvent); diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java index 60dce2de37..1c662458ca 100644 --- a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java @@ -62,19 +62,21 @@ public void parseEventParkingFaciltyStatus() throws AdapterException { List parsedEvent = parserStatus.parseNEvents(getInputStream(jo), 1); assertEquals(parsedEvent.size(), 2); String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals(parsedStringEvent, "{\"parkingAreaReference\":{\"targetClass\":\"ParkingArea\",\"id\":" + + assertEquals("{\"parkingAreaReference\":{\"targetClass\":\"ParkingArea\",\"id\":" + "\"1001[Stadtmitte]\",\"version\":1.0},\"totalParkingCapacityLongTermOverride\":3376," + "\"parkingAreaTotalNumberOfVacantParkingSpaces\":1268,\"totalParkingCapacityShortTermOverride\":3376," + - "\"parkingAreaOccupancy\":0.6244076,\"parkingAreaStatusTime\":\"2018-07-25T13:17:00.087+02:00\"}"); + "\"parkingAreaOccupancy\":0.6244076," + + "\"parkingAreaStatusTime\":\"2018-07-25T13:17:00.087+02:00\"}", parsedStringEvent); parsedEvent = parserFacility.parseNEvents(getInputStream(jo), 1); assertEquals(parsedEvent.size(), 10); parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals(parsedStringEvent, "{\"parkingFacilityReference\":{\"targetClass\":\"ParkingFacility\",\"id\"" + + assertEquals("{\"parkingFacilityReference\":{\"targetClass\":\"ParkingFacility\",\"id\"" + ":\"7[City Point]\",\"version\":1.0},\"parkingFacilityStatus\":\"open\"," + "\"totalNumberOfOccupiedParkingSpaces\":123,\"totalNumberOfVacantParkingSpaces\":97," + "\"totalParkingCapacityShortTermOverride\":220,\"totalParkingCapacityOverride\":220," + - "\"parkingFacilityStatusTime\":\"2018-07-25T13:17:00.087+02:00\",\"parkingFacilityOccupancy\":0.5590909}"); + "\"parkingFacilityStatusTime\":\"2018-07-25T13:17:00.087+02:00\"," + + "\"parkingFacilityOccupancy\":0.5590909}", parsedStringEvent); } @Test From 2ed8846fd73bfa21194010d5c9ab96395b6403c5 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 19 Sep 2019 07:36:29 +0200 Subject: [PATCH 19/24] #284: Fix parser test --- .../streampipes/connect/adapter/format/json/xml/XmlTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java index 1c662458ca..22bd1bb95c 100644 --- a/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java +++ b/streampipes-connect/src/test/java/org/streampipes/connect/adapter/format/json/xml/XmlTest.java @@ -46,8 +46,7 @@ public void parseEventCarPark() throws AdapterException { assertEquals(6, parsedEvent.size()); String parsedStringEvent = new String(parsedEvent.get(0), StandardCharsets.UTF_8); - assertEquals("{\"lfdnr\":1,\"bezeichnung\":\"bahnhof.txt\",\"gesamt\":114,\"frei\":0," + - "\"status\":1,\"zeitstempel\":\"25.07.2018 10:45\",\"tendenz\":3}", parsedStringEvent); + assertEquals("{\"frei\":0,\"tendenz\":3,\"bezeichnung\":\"bahnhof.txt\",\"zeitstempel\":\"25.07.2018 10:45\",\"gesamt\":114,\"lfdnr\":1,\"status\":1}", parsedStringEvent); } @Test From 0365e6201394801bbe8fde480999372a453657c9 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 19 Sep 2019 07:52:47 +0200 Subject: [PATCH 20/24] #284: Add httpclient dependency to connect-master module --- pom.xml | 11 +++++++++++ streampipes-app-file-export/pom.xml | 1 - streampipes-connect-container-master/pom.xml | 4 ++++ .../container/master/management/WorkerRestClient.java | 5 ++--- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d079b86c57..e9743c4b7d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ 1.9.2 1.3.5 + 4.5.5 2.9.9 2.1 4.0.1 @@ -200,6 +201,16 @@ shiro-web ${shiro.version} + + org.apache.httpcomponents + fluent-hc + ${httpclient.version} + + + org.apache.httpcomponents + httpmime + ${httpclient.version} + org.eclipse.rdf4j rdf4j-queryresultio-api diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index 2fdab3adc6..31f1056508 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -44,7 +44,6 @@ org.apache.httpcomponents fluent-hc - 4.5.5 com.jayway.restassured diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index 8a470f7ef1..a546522feb 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -14,6 +14,10 @@ org.streampipes streampipes-connect-container + + org.apache.httpcomponents + httpmime + diff --git a/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/management/WorkerRestClient.java b/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/management/WorkerRestClient.java index 742ad2ad3a..d46a0da7a9 100644 --- a/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/management/WorkerRestClient.java +++ b/streampipes-connect-container-master/src/main/java/org/streampipes/connect/container/master/management/WorkerRestClient.java @@ -18,7 +18,6 @@ package org.streampipes.connect.container.master.management; import com.google.gson.Gson; -import org.apache.http.HttpEntity; import org.apache.http.client.fluent.Request; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntity; @@ -155,8 +154,8 @@ public static String saveFileAtWorker(String baseUrl, InputStream inputStream, S logger.info("Trying to start save file on endpoint: " + url); - HttpEntity httpEntity = new MultipartEntity(); - ((MultipartEntity) httpEntity).addPart("file_upload", new InputStreamBody(inputStream, fileName)); + MultipartEntity httpEntity = new MultipartEntity(); + httpEntity.addPart("file_upload", new InputStreamBody(inputStream, fileName)); try { String responseString = Request.Post(url) From 460701120a7ab7620f29a3e8f93a151a3676d86a Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 19 Sep 2019 10:00:44 +0200 Subject: [PATCH 21/24] #285: Add license header to missing files, enable apache-rat-plugin --- .../README.md | 17 ++++ .../pom.xml | 17 ++++ .../projects/basic/archetype.properties | 17 ++++ .../README.md | 17 ++++ .../pom.xml | 17 ++++ .../projects/basic/archetype.properties | 17 ++++ .../README.md | 17 ++++ .../pom.xml | 17 ++++ .../projects/basic/archetype.properties | 17 ++++ .../README.md | 17 ++++ .../pom.xml | 17 ++++ .../projects/basic/archetype.properties | 17 ++++ .../README.md | 17 ++++ .../streampipes-archetype-pe-sources/pom.xml | 17 ++++ install.sh | 16 ++++ pom.xml | 82 +++++++++++++++++-- sonar-project.properties | 17 ++++ streampipes-backend/Dockerfile | 16 ++++ streampipes-backend/development/env | 16 ++++ streampipes-backend/pom.xml | 17 ++++ .../src/main/resources/application.properties | 17 ++++ .../src/main/resources/shiro.ini | 16 ++++ .../src/main/resources/static/index.html | 17 ++++ .../Dockerfile | 16 ++++ .../development/env | 16 ++++ streampipes-connect-container-master/pom.xml | 17 ++++ streampipes-connect-container-worker/pom.xml | 17 ++++ streampipes-connect-container/development/env | 16 ++++ streampipes-connect-container/pom.xml | 17 ++++ .../src/test/SpConnectResourceTest.java | 17 ++++ streampipes-connect/pom.xml | 17 ++++ streampipes-container-base/pom.xml | 17 ++++ .../streampipes/container/util/UtilTest.java | 22 ++++- streampipes-dataformat-cbor/pom.xml | 17 ++++ streampipes-dataformat-fst/pom.xml | 17 ++++ streampipes-dataformat-smile/pom.xml | 17 ++++ .../logging/impl/EventStatisticLogger.java | 17 ++++ .../org/streampipes/logging/model/Log.java | 17 ++++ .../streampipes/logging/model/LogRequest.java | 17 ++++ .../main/resources/empire.config.properties | 26 ------ .../examples.empire.annotation.config | 2 - .../org/streampipes/model/ResponseTest.java | 17 ++++ .../matching/v2/ListPropertyMatchTest.java | 17 ++++ .../org/streampipes/rest/api/ICouchdb.java | 17 ++++ .../org/streampipes/rest/impl/Couchdb.java | 17 ++++ .../main/resources/CouchDbMapReduceFunctions | 46 ----------- .../test/java/org/streampipes/rest/Mock.java | 17 ++++ .../java/org/streampipes/rest/TestUtil.java | 17 ++++ .../DataLakeNoUserManagementV3Test.java | 17 ++++ .../test/java/TestBackgroundKnowledge.java | 26 ------ .../src/test/java/TestGson.java | 30 ------- .../java/TestInvocationGraphToCouchDb.java | 32 -------- .../src/test/java/TestPipelineStorage.java | 37 --------- .../src/test/java/TestTransformation.java | 68 --------------- .../couchdb/impl/AdapterStorageImpl.java | 17 ++++ .../wrapper/flink/logger/StatisticLogger.java | 17 ++++ .../wrapper/spark/AbstractSparkDeclarer.java | 40 +++++---- .../wrapper/spark/AbstractSparkDeclarer.java | 7 -- 58 files changed, 890 insertions(+), 303 deletions(-) delete mode 100644 streampipes-model/src/main/resources/empire.config.properties delete mode 100644 streampipes-model/src/main/resources/examples.empire.annotation.config delete mode 100644 streampipes-rest/src/main/resources/CouchDbMapReduceFunctions delete mode 100644 streampipes-storage-api/src/test/java/TestBackgroundKnowledge.java delete mode 100644 streampipes-storage-api/src/test/java/TestGson.java delete mode 100644 streampipes-storage-api/src/test/java/TestInvocationGraphToCouchDb.java delete mode 100644 streampipes-storage-api/src/test/java/TestPipelineStorage.java delete mode 100644 streampipes-storage-api/src/test/java/TestTransformation.java delete mode 100644 streampipes-wrapper-spark/src/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java diff --git a/archetypes/streampipes-archetype-pe-processors-flink/README.md b/archetypes/streampipes-archetype-pe-processors-flink/README.md index d816988436..d3dbac986a 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/README.md +++ b/archetypes/streampipes-archetype-pe-processors-flink/README.md @@ -1,3 +1,20 @@ + + ## StreamPipes Maven Archetype for Flink-based Data Processors ### Usage diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index c1216e499d..02ff508900 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -1,4 +1,21 @@ + + 4.0.0 diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties index 48bcb20ea5..fa6d511e05 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# +# + #Tue Nov 21 10:33:48 CET 2017 package=org.streampipes.test version=0.1-SNAPSHOT diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/README.md b/archetypes/streampipes-archetype-pe-processors-jvm/README.md index 2de7d4dc28..5f5d5ba68d 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/README.md +++ b/archetypes/streampipes-archetype-pe-processors-jvm/README.md @@ -1,3 +1,20 @@ + + ## StreamPipes Maven Archetype for Standalone Processors ### Usage diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 1d50e08ff1..509e77fcb4 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -1,4 +1,21 @@ + + 4.0.0 diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties index 48bcb20ea5..fa6d511e05 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# +# + #Tue Nov 21 10:33:48 CET 2017 package=org.streampipes.test version=0.1-SNAPSHOT diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/README.md b/archetypes/streampipes-archetype-pe-sinks-flink/README.md index be9a0350c0..8bd513123b 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/README.md +++ b/archetypes/streampipes-archetype-pe-sinks-flink/README.md @@ -1,3 +1,20 @@ + + ## StreamPipes Maven Archetype for Flink-based Sinks ### Usage diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index be98d15d4a..93115bb0b7 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -1,4 +1,21 @@ + + 4.0.0 diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties index 48bcb20ea5..fa6d511e05 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# +# + #Tue Nov 21 10:33:48 CET 2017 package=org.streampipes.test version=0.1-SNAPSHOT diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/README.md b/archetypes/streampipes-archetype-pe-sinks-jvm/README.md index 5b289af5b3..e52ad95a93 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/README.md +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/README.md @@ -1,3 +1,20 @@ + + ## StreamPipes Maven Archetype for Standalone Sinks ### Usage diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index 899fb786eb..ffab4faf46 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -1,4 +1,21 @@ + + 4.0.0 diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties b/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties index 48bcb20ea5..fa6d511e05 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,20 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# +# + #Tue Nov 21 10:33:48 CET 2017 package=org.streampipes.test version=0.1-SNAPSHOT diff --git a/archetypes/streampipes-archetype-pe-sources/README.md b/archetypes/streampipes-archetype-pe-sources/README.md index 842ed9bea3..8520237dda 100644 --- a/archetypes/streampipes-archetype-pe-sources/README.md +++ b/archetypes/streampipes-archetype-pe-sources/README.md @@ -1,3 +1,20 @@ + + ## StreamPipes Maven Archetype for custom Data Sources ### Usage diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 1f29fc5dc2..2a7d75351b 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -1,4 +1,21 @@ + + 4.0.0 diff --git a/install.sh b/install.sh index 266955956c..17a16ce86b 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,20 @@ #!/bin/sh +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + set -e # Usage: diff --git a/pom.xml b/pom.xml index e9743c4b7d..5aa2feb419 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ~ ~ Licensed 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 + ~ you may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ @@ -781,14 +781,84 @@ spring-boot-maven-plugin ${spring.version} + + org.apache.rat + apache-rat-plugin + 0.13 + + true + + - - - - - + + org.apache.rat + apache-rat-plugin + + + license-check + false + verify + + check + + + + + false + true + + + **/.git/** + **/.gitignore + + + **/UNLICENSE + + + **/target/** + target/** + + + **/.project + **/.settings/** + **/.classpath + **/.factorypath + + + **/.idea/** + **/*.iml + + + **/*.json + **/*.jsonld + **/*.txt + + **/system + + + streampipes-code-generation/src/main/resources/pom + streampipes-code-generation/src/main/resources/web + streampipes-code-generation/src/test/resources/*_java + streampipes-code-generation/src/test/resources/expected_pom_xml + streampipes-code-generation/src/test/resources/expected_web_xml + + + **/*.en + + + archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/** + archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/** + archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/** + archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/** + archetypes/streampipes-archetype-pe-sources/src/main/resources/** + + + streampipes-measurement-units/src/main/resources/onto/** + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/sonar-project.properties b/sonar-project.properties index d144dce22d..d9f4bcbb66 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,3 +1,20 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# +# + sonar.projectKey=streampipes_streampipes sonar.projectName=StreamPipes sonar.projectVersion=0.61.1-SNAPSHOT diff --git a/streampipes-backend/Dockerfile b/streampipes-backend/Dockerfile index 77d4f134cb..bf10480b23 100644 --- a/streampipes-backend/Dockerfile +++ b/streampipes-backend/Dockerfile @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + FROM adoptopenjdk/openjdk8-openj9:alpine-slim EXPOSE 8030 diff --git a/streampipes-backend/development/env b/streampipes-backend/development/env index 4d1b5a96bd..5eeb333ff1 100644 --- a/streampipes-backend/development/env +++ b/streampipes-backend/development/env @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + SP_COUCHDB_HOST=localhost uri=http://localhost:8031/rdf4j-server SP_KAFKA_HOST=localhost diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index af3ecd2396..ae54dd6857 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -1,3 +1,20 @@ + + 4.0.0 diff --git a/streampipes-backend/src/main/resources/application.properties b/streampipes-backend/src/main/resources/application.properties index 29c9141ec2..a6839674db 100644 --- a/streampipes-backend/src/main/resources/application.properties +++ b/streampipes-backend/src/main/resources/application.properties @@ -1,3 +1,20 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# +# + server.port=8030 server.servlet.context-path=/streampipes-backend server.tomcat.additional-tld-skip-patterns=*.jar \ No newline at end of file diff --git a/streampipes-backend/src/main/resources/shiro.ini b/streampipes-backend/src/main/resources/shiro.ini index a37a722835..80ca512092 100644 --- a/streampipes-backend/src/main/resources/shiro.ini +++ b/streampipes-backend/src/main/resources/shiro.ini @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + # Users and their roles [users] diff --git a/streampipes-backend/src/main/resources/static/index.html b/streampipes-backend/src/main/resources/static/index.html index 510d2cd07f..8f8dd8e7e1 100644 --- a/streampipes-backend/src/main/resources/static/index.html +++ b/streampipes-backend/src/main/resources/static/index.html @@ -1,3 +1,20 @@ + + StreamPipes API diff --git a/streampipes-connect-container-master/Dockerfile b/streampipes-connect-container-master/Dockerfile index 70e2345ee1..8f673a0a19 100644 --- a/streampipes-connect-container-master/Dockerfile +++ b/streampipes-connect-container-master/Dockerfile @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + FROM adoptopenjdk/openjdk8-openj9:alpine-slim ENV CONSUL_LOCATION consul diff --git a/streampipes-connect-container-master/development/env b/streampipes-connect-container-master/development/env index 1479317fea..f699bf1536 100644 --- a/streampipes-connect-container-master/development/env +++ b/streampipes-connect-container-master/development/env @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + # Those parameters are used by IntelliJ to set the default consul parameters for development SP_BACKEND_HOST=localhost SP_KAFKA_HOST=localhost diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index a546522feb..0fe0b90208 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -1,4 +1,21 @@ + + streampipes-parent diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index 280690fc7f..41be6c794e 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -1,4 +1,21 @@ + + streampipes-parent diff --git a/streampipes-connect-container/development/env b/streampipes-connect-container/development/env index 1479317fea..f699bf1536 100644 --- a/streampipes-connect-container/development/env +++ b/streampipes-connect-container/development/env @@ -1,3 +1,19 @@ +# +# Copyright 2018 FZI Forschungszentrum Informatik +# +# Licensed 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. +# + # Those parameters are used by IntelliJ to set the default consul parameters for development SP_BACKEND_HOST=localhost SP_KAFKA_HOST=localhost diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index 1372af3b0b..f9d2465e02 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -1,4 +1,21 @@ + + streampipes-parent diff --git a/streampipes-connect-container/src/test/SpConnectResourceTest.java b/streampipes-connect-container/src/test/SpConnectResourceTest.java index ae1891ca84..a89a35f5be 100644 --- a/streampipes-connect-container/src/test/SpConnectResourceTest.java +++ b/streampipes-connect-container/src/test/SpConnectResourceTest.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.rest.impl.connect; import com.jayway.restassured.RestAssured; diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index ebef12cdc2..49450b28b6 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -1,4 +1,21 @@ + + org.streampipes diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml index 95210e873c..b43140766a 100644 --- a/streampipes-container-base/pom.xml +++ b/streampipes-container-base/pom.xml @@ -1,4 +1,21 @@ + + diff --git a/streampipes-container/src/test/java/org/streampipes/container/util/UtilTest.java b/streampipes-container/src/test/java/org/streampipes/container/util/UtilTest.java index 3000c73918..d193bc4516 100644 --- a/streampipes-container/src/test/java/org/streampipes/container/util/UtilTest.java +++ b/streampipes-container/src/test/java/org/streampipes/container/util/UtilTest.java @@ -1,10 +1,28 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.container.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import org.junit.Test; import org.streampipes.model.Response; -import static org.junit.Assert.*; - public class UtilTest { @Test diff --git a/streampipes-dataformat-cbor/pom.xml b/streampipes-dataformat-cbor/pom.xml index dbb03a01da..b57c221890 100644 --- a/streampipes-dataformat-cbor/pom.xml +++ b/streampipes-dataformat-cbor/pom.xml @@ -1,4 +1,21 @@ + + streampipes-parent diff --git a/streampipes-dataformat-fst/pom.xml b/streampipes-dataformat-fst/pom.xml index 172ddf99b4..0b04e83924 100644 --- a/streampipes-dataformat-fst/pom.xml +++ b/streampipes-dataformat-fst/pom.xml @@ -1,4 +1,21 @@ + + streampipes-parent diff --git a/streampipes-dataformat-smile/pom.xml b/streampipes-dataformat-smile/pom.xml index 3255ff5366..5a29275f0c 100644 --- a/streampipes-dataformat-smile/pom.xml +++ b/streampipes-dataformat-smile/pom.xml @@ -1,4 +1,21 @@ + + streampipes-parent diff --git a/streampipes-logging/src/main/java/org/streampipes/logging/impl/EventStatisticLogger.java b/streampipes-logging/src/main/java/org/streampipes/logging/impl/EventStatisticLogger.java index 4f1da96eae..de736c0361 100644 --- a/streampipes-logging/src/main/java/org/streampipes/logging/impl/EventStatisticLogger.java +++ b/streampipes-logging/src/main/java/org/streampipes/logging/impl/EventStatisticLogger.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.logging.impl; import java.io.Serializable; diff --git a/streampipes-logging/src/main/java/org/streampipes/logging/model/Log.java b/streampipes-logging/src/main/java/org/streampipes/logging/model/Log.java index aaae2f783d..fbe4bec35b 100644 --- a/streampipes-logging/src/main/java/org/streampipes/logging/model/Log.java +++ b/streampipes-logging/src/main/java/org/streampipes/logging/model/Log.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.logging.model; public class Log { diff --git a/streampipes-logging/src/main/java/org/streampipes/logging/model/LogRequest.java b/streampipes-logging/src/main/java/org/streampipes/logging/model/LogRequest.java index 384ed28240..ff547fcfc9 100644 --- a/streampipes-logging/src/main/java/org/streampipes/logging/model/LogRequest.java +++ b/streampipes-logging/src/main/java/org/streampipes/logging/model/LogRequest.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.logging.model; public class LogRequest { diff --git a/streampipes-model/src/main/resources/empire.config.properties b/streampipes-model/src/main/resources/empire.config.properties deleted file mode 100644 index 98a9167126..0000000000 --- a/streampipes-model/src/main/resources/empire.config.properties +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright 2018 FZI Forschungszentrum Informatik -# -# Licensed 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. -# -# - -annotation.index = examples.empire.annotation.config - -0.name = oreilly -0.factory = sesame -0.url = http://localhost:9160 -0.repo = SEPAKEYSPACE - -# You can obtain this file at http://inkdroid.org/journal/2009/12/22/hacking-oreilly-rdfa/ -0.files = c:\\workspace\\semantic-epa-parent\\semantic-epa-model\\src\\main\\resources\\sepa-5.jsonld \ No newline at end of file diff --git a/streampipes-model/src/main/resources/examples.empire.annotation.config b/streampipes-model/src/main/resources/examples.empire.annotation.config deleted file mode 100644 index 183b1cbcf2..0000000000 --- a/streampipes-model/src/main/resources/examples.empire.annotation.config +++ /dev/null @@ -1,2 +0,0 @@ -com.clarkparsia.empire.annotation.RdfsClass=de.fzi.cep.sepa.model.examples.Book, de.fzi.cep.sepa.model.examples.Manifestation -javax.persistence.NamedQuery= diff --git a/streampipes-model/src/test/java/org/streampipes/model/ResponseTest.java b/streampipes-model/src/test/java/org/streampipes/model/ResponseTest.java index 94579196eb..62ea053cfc 100644 --- a/streampipes-model/src/test/java/org/streampipes/model/ResponseTest.java +++ b/streampipes-model/src/test/java/org/streampipes/model/ResponseTest.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.model; import org.junit.Test; diff --git a/streampipes-pipeline-management/src/test/java/org/streampipes/manager/matching/v2/ListPropertyMatchTest.java b/streampipes-pipeline-management/src/test/java/org/streampipes/manager/matching/v2/ListPropertyMatchTest.java index ea2aa7e118..dddffcf099 100644 --- a/streampipes-pipeline-management/src/test/java/org/streampipes/manager/matching/v2/ListPropertyMatchTest.java +++ b/streampipes-pipeline-management/src/test/java/org/streampipes/manager/matching/v2/ListPropertyMatchTest.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.manager.matching.v2; import org.junit.Test; diff --git a/streampipes-rest/src/main/java/org/streampipes/rest/api/ICouchdb.java b/streampipes-rest/src/main/java/org/streampipes/rest/api/ICouchdb.java index 83474561bf..244367fe2d 100644 --- a/streampipes-rest/src/main/java/org/streampipes/rest/api/ICouchdb.java +++ b/streampipes-rest/src/main/java/org/streampipes/rest/api/ICouchdb.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.rest.api; import javax.ws.rs.core.Response; diff --git a/streampipes-rest/src/main/java/org/streampipes/rest/impl/Couchdb.java b/streampipes-rest/src/main/java/org/streampipes/rest/impl/Couchdb.java index 48167153ad..b669ff691e 100644 --- a/streampipes-rest/src/main/java/org/streampipes/rest/impl/Couchdb.java +++ b/streampipes-rest/src/main/java/org/streampipes/rest/impl/Couchdb.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.rest.impl; import com.google.gson.Gson; diff --git a/streampipes-rest/src/main/resources/CouchDbMapReduceFunctions b/streampipes-rest/src/main/resources/CouchDbMapReduceFunctions deleted file mode 100644 index fb153e9098..0000000000 --- a/streampipes-rest/src/main/resources/CouchDbMapReduceFunctions +++ /dev/null @@ -1,46 +0,0 @@ -/** - * - * This file contains the necessary MapReduce functions for the CouchDB instance. - * - * Created by robin on 17.06.15. - */ - - -// user -{ - "_id": "_design/user", - "language": "javascript", - "views": { - "pipelines" - } -} - -function(doc) { - if (doc.pipelines) { - for (i=0; i sepas = StorageManager.INSTANCE.getStorageAPI().getAllSEPAs(); -// -// Graph graph; -// try { -// graph = new JsonLdTransformer().toJsonLd(sepas.get(0)); -// System.out.println(Utils.asString(graph)); -// -// DataProcessorDescription sepa = new JsonLdTransformer().fromJsonLd(Utils.asString(graph), DataProcessorDescription.class); -// System.out.println(sepa.getElementId()); -// -// } catch (IllegalAccessException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (IllegalArgumentException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (InvocationTargetException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (SecurityException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (ClassNotFoundException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (InvalidRdfException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (RDFHandlerException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (RDFParseException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (UnsupportedRDFormatException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (RepositoryException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } catch (IOException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } -// -// -// -// } -//} diff --git a/streampipes-storage-couchdb/src/main/java/org/streampipes/storage/couchdb/impl/AdapterStorageImpl.java b/streampipes-storage-couchdb/src/main/java/org/streampipes/storage/couchdb/impl/AdapterStorageImpl.java index 4aa17bc6da..d6b70d5a7f 100644 --- a/streampipes-storage-couchdb/src/main/java/org/streampipes/storage/couchdb/impl/AdapterStorageImpl.java +++ b/streampipes-storage-couchdb/src/main/java/org/streampipes/storage/couchdb/impl/AdapterStorageImpl.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.storage.couchdb.impl; import org.slf4j.Logger; diff --git a/streampipes-wrapper-flink/src/main/java/org/streampipes/wrapper/flink/logger/StatisticLogger.java b/streampipes-wrapper-flink/src/main/java/org/streampipes/wrapper/flink/logger/StatisticLogger.java index 75cbfefbdd..748b1e43ba 100644 --- a/streampipes-wrapper-flink/src/main/java/org/streampipes/wrapper/flink/logger/StatisticLogger.java +++ b/streampipes-wrapper-flink/src/main/java/org/streampipes/wrapper/flink/logger/StatisticLogger.java @@ -1,3 +1,20 @@ +/* + * Copyright 2018 FZI Forschungszentrum Informatik + * + * Licensed 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.streampipes.wrapper.flink.logger; import org.apache.flink.api.common.functions.FlatMapFunction; diff --git a/streampipes-wrapper-spark/src/main/java/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java b/streampipes-wrapper-spark/src/main/java/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java index 89ef57f747..f43f9ae126 100644 --- a/streampipes-wrapper-spark/src/main/java/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java +++ b/streampipes-wrapper-spark/src/main/java/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java @@ -23,31 +23,29 @@ import org.streampipes.model.base.NamedStreamPipesEntity; public abstract class AbstractSparkDeclarer implements InvocableDeclarer { - protected SR runtime; - protected I graph; + protected SR runtime; + protected I graph; - @Override - public Response invokeRuntime(I sepaInvocation) { - runtime = getRuntime(sepaInvocation); - graph = sepaInvocation; + @Override + public Response invokeRuntime(I sepaInvocation) { + runtime = getRuntime(sepaInvocation); + graph = sepaInvocation; - if (runtime.startExecution()) { - return new Response(graph.getElementId(), true); - } - else { - return new Response(graph.getElementId(), false); - } + if (runtime.startExecution()) { + return new Response(graph.getElementId(), true); + } else { + return new Response(graph.getElementId(), false); } + } - @Override - public Response detachRuntime(String s) { - if (runtime.stop()) { - return new Response(graph.getElementId(), true); - } - else { - return new Response(graph.getElementId(), false); - } + @Override + public Response detachRuntime(String s) { + if (runtime.stop()) { + return new Response(graph.getElementId(), true); + } else { + return new Response(graph.getElementId(), false); } + } - protected abstract SR getRuntime(I graph); + protected abstract SR getRuntime(I graph); } diff --git a/streampipes-wrapper-spark/src/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java b/streampipes-wrapper-spark/src/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java deleted file mode 100644 index ccd7a65482..0000000000 --- a/streampipes-wrapper-spark/src/org/streampipes/wrapper/spark/AbstractSparkDeclarer.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.streampipes.wrapper.spark; - -/** - * Created by lutz on 28.11.17. - */ -public class AbstractSparkDeclarer { -} From 073e94b439e2f6768966398ea5cbaaec3cf3f911 Mon Sep 17 00:00:00 2001 From: Dominik Riemer Date: Thu, 19 Sep 2019 10:41:55 +0200 Subject: [PATCH 22/24] Use next development version 0.64.0-SNAPSHOT --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container-master/pom.xml | 2 +- streampipes-connect-container-worker/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-base/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-cbor/pom.xml | 2 +- streampipes-dataformat-fst/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat-smile/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index 02ff508900..f90e2c21ae 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml index 2d03502a99..a389bcc629 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.63.0 + 0.64.0 diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 509e77fcb4..621231fc33 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml index 8e40557065..58d06d425e 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.63.0 + 0.64.0 diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 93115bb0b7..0fbdd22a65 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml index c926087052..3b50477a06 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.63.0 + 0.64.0 diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index ffab4faf46..e49b974391 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml index 8e40557065..58d06d425e 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.63.0 + 0.64.0 diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index 2a7d75351b..dc7e60b36a 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT ../../pom.xml streampipes-archetype-pe-sources diff --git a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml index 651e4d49e5..fbe5ede0a6 100644 --- a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml @@ -7,7 +7,7 @@ ${version} - 0.63.0 + 0.64.0 diff --git a/pom.xml b/pom.xml index 5aa2feb419..2eb22ed235 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index 31f1056508..e4b08eae58 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index ae54dd6857..840106c4c6 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-backend jar diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index 27d4380ef0..fa4cf0db7c 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index 5136ee1aaf..f5ca8ac67e 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 7e29cfe2d4..11466e181d 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index 0fe0b90208..6ca76b0299 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index 41be6c794e..c38322ff2e 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index f9d2465e02..ff6e8fb587 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 49450b28b6..0259f866a8 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml index b43140766a..2a24cede6f 100644 --- a/streampipes-container-base/pom.xml +++ b/streampipes-container-base/pom.xml @@ -22,7 +22,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 0b8fd55301..06b17af0f4 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index a40227abf5..4d4c20192a 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 7d27c59587..917db478f3 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-cbor/pom.xml b/streampipes-dataformat-cbor/pom.xml index b57c221890..ca6f544fb6 100644 --- a/streampipes-dataformat-cbor/pom.xml +++ b/streampipes-dataformat-cbor/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-fst/pom.xml b/streampipes-dataformat-fst/pom.xml index 0b04e83924..f30be70b5c 100644 --- a/streampipes-dataformat-fst/pom.xml +++ b/streampipes-dataformat-fst/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index e879367b77..08e0522c05 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat-smile/pom.xml b/streampipes-dataformat-smile/pom.xml index 5a29275f0c..ed64dfefe8 100644 --- a/streampipes-dataformat-smile/pom.xml +++ b/streampipes-dataformat-smile/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index f10dab5ff5..fb087d96c0 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index c53e432d33..bf7f28ad45 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 82bcd02182..1c272be6e3 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index bec6304b85..d9d6b49afe 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index 0dbf66d31f..f26cd634dc 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 73a8e5c73d..5469248134 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index 2afd524a12..f8d6b7edde 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index 7539ef49c2..eec8c038ea 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index 4dfd74e4d2..3dd7ce78bd 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index 97eb4196a4..ce0f8364e7 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 4d4ae55eb7..57b45fcda4 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 5204307eef..4249866631 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 04c4e95535..87bf432f57 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index 18978ca77c..a7fc5e4320 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index 173246abed..fe60b9d0a6 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index 3da61fff8a..8226a96580 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index 0da3c6f5eb..60b79b427e 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index 55c350cecf..24b465e70f 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index 8fda6ce49a..aed16d0323 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index 9e3a5e3929..f3c21f5f24 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index e92f8b5783..6b2c66ca6a 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index a8d3adc491..c54623a480 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index 58bc32f679..fbbde60093 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index 6de3050bd0..f61fa2325a 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 1e527e22da..0ef0f161ec 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index 3efbb20395..26ccae8794 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index 95ccda3160..75b4acc185 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index 31ea7823df..7060b4d40c 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index 8fd44dd2d0..c0f87d5c1a 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.63.1-SNAPSHOT + 0.64.0-SNAPSHOT streampipes-wrapper From 2e62cb2795dab1ab68c00f9ed39307dee758fcf9 Mon Sep 17 00:00:00 2001 From: zehnder Date: Thu, 19 Sep 2019 08:51:16 +0000 Subject: [PATCH 23/24] [RELEASE] [skip-ci]updating poms for 0.64.0 branch with snapshot versions --- streampipes-container-base/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml index 2a24cede6f..aa93702af6 100644 --- a/streampipes-container-base/pom.xml +++ b/streampipes-container-base/pom.xml @@ -16,9 +16,7 @@ ~ --> - + streampipes-parent org.streampipes From fe5d05185e73a9293a48c3c080b99f000b81cd42 Mon Sep 17 00:00:00 2001 From: zehnder Date: Thu, 19 Sep 2019 10:24:24 +0000 Subject: [PATCH 24/24] [RELEASE] [skip-ci]updating poms for branch'release-0.64.0' with non-snapshot versions --- archetypes/streampipes-archetype-pe-processors-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-processors-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-flink/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +- archetypes/streampipes-archetype-pe-sources/pom.xml | 2 +- pom.xml | 2 +- streampipes-app-file-export/pom.xml | 2 +- streampipes-backend/pom.xml | 2 +- streampipes-code-generation/pom.xml | 2 +- streampipes-commons/pom.xml | 2 +- streampipes-config/pom.xml | 2 +- streampipes-connect-container-master/pom.xml | 2 +- streampipes-connect-container-worker/pom.xml | 2 +- streampipes-connect-container/pom.xml | 2 +- streampipes-connect/pom.xml | 2 +- streampipes-container-base/pom.xml | 2 +- streampipes-container-embedded/pom.xml | 2 +- streampipes-container-standalone/pom.xml | 2 +- streampipes-container/pom.xml | 2 +- streampipes-dataformat-cbor/pom.xml | 2 +- streampipes-dataformat-fst/pom.xml | 2 +- streampipes-dataformat-json/pom.xml | 2 +- streampipes-dataformat-smile/pom.xml | 2 +- streampipes-dataformat/pom.xml | 2 +- streampipes-logging/pom.xml | 2 +- streampipes-measurement-units/pom.xml | 2 +- streampipes-messaging-jms/pom.xml | 2 +- streampipes-messaging-kafka/pom.xml | 2 +- streampipes-messaging/pom.xml | 2 +- streampipes-model-client/pom.xml | 2 +- streampipes-model/pom.xml | 2 +- streampipes-performance-tests/pom.xml | 2 +- streampipes-pipeline-management/pom.xml | 2 +- streampipes-rest-shared/pom.xml | 2 +- streampipes-rest/pom.xml | 2 +- streampipes-sdk/pom.xml | 2 +- streampipes-serializers/pom.xml | 2 +- streampipes-sources/pom.xml | 2 +- streampipes-storage-api/pom.xml | 2 +- streampipes-storage-couchdb/pom.xml | 2 +- streampipes-storage-management/pom.xml | 2 +- streampipes-storage-rdf4j/pom.xml | 2 +- streampipes-test-utils/pom.xml | 2 +- streampipes-user-management/pom.xml | 2 +- streampipes-vocabulary/pom.xml | 2 +- streampipes-wrapper-distributed/pom.xml | 2 +- streampipes-wrapper-flink/pom.xml | 2 +- streampipes-wrapper-kafka-streams/pom.xml | 2 +- streampipes-wrapper-siddhi/pom.xml | 2 +- streampipes-wrapper-spark/pom.xml | 2 +- streampipes-wrapper-standalone/pom.xml | 2 +- streampipes-wrapper/pom.xml | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml index f90e2c21ae..cbcf2075d7 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 ../../pom.xml streampipes-archetype-pe-processors-flink diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml index 621231fc33..22eb743804 100644 --- a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 ../../pom.xml streampipes-archetype-pe-processors-jvm diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml index 0fbdd22a65..8fab5ee02a 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 ../../pom.xml streampipes-archetype-pe-sinks-flink diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml index e49b974391..f297b5962d 100644 --- a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml +++ b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 ../../pom.xml streampipes-archetype-pe-sinks-jvm diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml index dc7e60b36a..53cccece56 100644 --- a/archetypes/streampipes-archetype-pe-sources/pom.xml +++ b/archetypes/streampipes-archetype-pe-sources/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 ../../pom.xml streampipes-archetype-pe-sources diff --git a/pom.xml b/pom.xml index 2eb22ed235..8aa0cb638a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 pom UTF-8 diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml index e4b08eae58..9995c23a75 100644 --- a/streampipes-app-file-export/pom.xml +++ b/streampipes-app-file-export/pom.xml @@ -21,7 +21,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 StreamPipes App File Export streampipes-app-file-export diff --git a/streampipes-backend/pom.xml b/streampipes-backend/pom.xml index 840106c4c6..e18d9a083b 100644 --- a/streampipes-backend/pom.xml +++ b/streampipes-backend/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-backend jar diff --git a/streampipes-code-generation/pom.xml b/streampipes-code-generation/pom.xml index fa4cf0db7c..82cf163d3f 100644 --- a/streampipes-code-generation/pom.xml +++ b/streampipes-code-generation/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-code-generation diff --git a/streampipes-commons/pom.xml b/streampipes-commons/pom.xml index f5ca8ac67e..21aa392a49 100644 --- a/streampipes-commons/pom.xml +++ b/streampipes-commons/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-commons StreamPipes Commons diff --git a/streampipes-config/pom.xml b/streampipes-config/pom.xml index 11466e181d..b017857069 100644 --- a/streampipes-config/pom.xml +++ b/streampipes-config/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-connect-container-master/pom.xml b/streampipes-connect-container-master/pom.xml index 6ca76b0299..e9380d6237 100644 --- a/streampipes-connect-container-master/pom.xml +++ b/streampipes-connect-container-master/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-connect-container-worker/pom.xml b/streampipes-connect-container-worker/pom.xml index c38322ff2e..9c2dfa0115 100644 --- a/streampipes-connect-container-worker/pom.xml +++ b/streampipes-connect-container-worker/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-connect-container/pom.xml b/streampipes-connect-container/pom.xml index ff6e8fb587..64445010e8 100644 --- a/streampipes-connect-container/pom.xml +++ b/streampipes-connect-container/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-connect/pom.xml b/streampipes-connect/pom.xml index 0259f866a8..7aa2f852b6 100755 --- a/streampipes-connect/pom.xml +++ b/streampipes-connect/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml index aa93702af6..6fb2c2d669 100644 --- a/streampipes-container-base/pom.xml +++ b/streampipes-container-base/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-container-embedded/pom.xml b/streampipes-container-embedded/pom.xml index 06b17af0f4..5846919cbd 100644 --- a/streampipes-container-embedded/pom.xml +++ b/streampipes-container-embedded/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-container-embedded jar diff --git a/streampipes-container-standalone/pom.xml b/streampipes-container-standalone/pom.xml index 4d4c20192a..9ef679ce35 100644 --- a/streampipes-container-standalone/pom.xml +++ b/streampipes-container-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-container/pom.xml b/streampipes-container/pom.xml index 917db478f3..24c8d4f49f 100644 --- a/streampipes-container/pom.xml +++ b/streampipes-container/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-container Large scale event processing agents with semantic checking for combinability. diff --git a/streampipes-dataformat-cbor/pom.xml b/streampipes-dataformat-cbor/pom.xml index ca6f544fb6..e8e3d1854e 100644 --- a/streampipes-dataformat-cbor/pom.xml +++ b/streampipes-dataformat-cbor/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-dataformat-fst/pom.xml b/streampipes-dataformat-fst/pom.xml index f30be70b5c..ad498b857e 100644 --- a/streampipes-dataformat-fst/pom.xml +++ b/streampipes-dataformat-fst/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-dataformat-json/pom.xml b/streampipes-dataformat-json/pom.xml index 08e0522c05..3986c6b1f1 100644 --- a/streampipes-dataformat-json/pom.xml +++ b/streampipes-dataformat-json/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-dataformat-smile/pom.xml b/streampipes-dataformat-smile/pom.xml index ed64dfefe8..3c6fad6a5a 100644 --- a/streampipes-dataformat-smile/pom.xml +++ b/streampipes-dataformat-smile/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-dataformat/pom.xml b/streampipes-dataformat/pom.xml index fb087d96c0..30b60e288a 100644 --- a/streampipes-dataformat/pom.xml +++ b/streampipes-dataformat/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-logging/pom.xml b/streampipes-logging/pom.xml index bf7f28ad45..a99439880c 100644 --- a/streampipes-logging/pom.xml +++ b/streampipes-logging/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-measurement-units/pom.xml b/streampipes-measurement-units/pom.xml index 1c272be6e3..1d4377f9f0 100644 --- a/streampipes-measurement-units/pom.xml +++ b/streampipes-measurement-units/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-measurement-units diff --git a/streampipes-messaging-jms/pom.xml b/streampipes-messaging-jms/pom.xml index d9d6b49afe..bf403049cc 100644 --- a/streampipes-messaging-jms/pom.xml +++ b/streampipes-messaging-jms/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-messaging-kafka/pom.xml b/streampipes-messaging-kafka/pom.xml index f26cd634dc..b0f0a97802 100644 --- a/streampipes-messaging-kafka/pom.xml +++ b/streampipes-messaging-kafka/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-messaging/pom.xml b/streampipes-messaging/pom.xml index 5469248134..086f550804 100644 --- a/streampipes-messaging/pom.xml +++ b/streampipes-messaging/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-model-client/pom.xml b/streampipes-model-client/pom.xml index f8d6b7edde..e218896e1c 100644 --- a/streampipes-model-client/pom.xml +++ b/streampipes-model-client/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-model-client jar diff --git a/streampipes-model/pom.xml b/streampipes-model/pom.xml index eec8c038ea..f79c2ea928 100644 --- a/streampipes-model/pom.xml +++ b/streampipes-model/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 diff --git a/streampipes-performance-tests/pom.xml b/streampipes-performance-tests/pom.xml index 3dd7ce78bd..7f7913fb1d 100644 --- a/streampipes-performance-tests/pom.xml +++ b/streampipes-performance-tests/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-pipeline-management/pom.xml b/streampipes-pipeline-management/pom.xml index ce0f8364e7..575e33d144 100644 --- a/streampipes-pipeline-management/pom.xml +++ b/streampipes-pipeline-management/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-pipeline-management diff --git a/streampipes-rest-shared/pom.xml b/streampipes-rest-shared/pom.xml index 57b45fcda4..74ea4717b9 100644 --- a/streampipes-rest-shared/pom.xml +++ b/streampipes-rest-shared/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml index 4249866631..616a2103ea 100644 --- a/streampipes-rest/pom.xml +++ b/streampipes-rest/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 StreamPipes REST API streampipes-rest diff --git a/streampipes-sdk/pom.xml b/streampipes-sdk/pom.xml index 87bf432f57..addc5fbda6 100644 --- a/streampipes-sdk/pom.xml +++ b/streampipes-sdk/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-serializers/pom.xml b/streampipes-serializers/pom.xml index a7fc5e4320..777861a5e5 100644 --- a/streampipes-serializers/pom.xml +++ b/streampipes-serializers/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-sources/pom.xml b/streampipes-sources/pom.xml index fe60b9d0a6..0b0b0ec867 100644 --- a/streampipes-sources/pom.xml +++ b/streampipes-sources/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-sources diff --git a/streampipes-storage-api/pom.xml b/streampipes-storage-api/pom.xml index 8226a96580..659773d1bc 100644 --- a/streampipes-storage-api/pom.xml +++ b/streampipes-storage-api/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-storage-api jar diff --git a/streampipes-storage-couchdb/pom.xml b/streampipes-storage-couchdb/pom.xml index 60b79b427e..bd2a9ff578 100644 --- a/streampipes-storage-couchdb/pom.xml +++ b/streampipes-storage-couchdb/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-storage-management/pom.xml b/streampipes-storage-management/pom.xml index 24b465e70f..f9a0b61727 100644 --- a/streampipes-storage-management/pom.xml +++ b/streampipes-storage-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-storage-rdf4j/pom.xml b/streampipes-storage-rdf4j/pom.xml index aed16d0323..2233c93069 100644 --- a/streampipes-storage-rdf4j/pom.xml +++ b/streampipes-storage-rdf4j/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-test-utils/pom.xml b/streampipes-test-utils/pom.xml index f3c21f5f24..6f213e2bac 100644 --- a/streampipes-test-utils/pom.xml +++ b/streampipes-test-utils/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-user-management/pom.xml b/streampipes-user-management/pom.xml index 6b2c66ca6a..ebe855a3f2 100644 --- a/streampipes-user-management/pom.xml +++ b/streampipes-user-management/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-vocabulary/pom.xml b/streampipes-vocabulary/pom.xml index c54623a480..06d26aa5e1 100644 --- a/streampipes-vocabulary/pom.xml +++ b/streampipes-vocabulary/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-wrapper-distributed/pom.xml b/streampipes-wrapper-distributed/pom.xml index fbbde60093..6f454cb1bf 100644 --- a/streampipes-wrapper-distributed/pom.xml +++ b/streampipes-wrapper-distributed/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml index f61fa2325a..3e0c9b33e8 100644 --- a/streampipes-wrapper-flink/pom.xml +++ b/streampipes-wrapper-flink/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-wrapper-flink StreamPipes Wrapper for Apache Flink diff --git a/streampipes-wrapper-kafka-streams/pom.xml b/streampipes-wrapper-kafka-streams/pom.xml index 0ef0f161ec..7975a8e275 100644 --- a/streampipes-wrapper-kafka-streams/pom.xml +++ b/streampipes-wrapper-kafka-streams/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml index 26ccae8794..43d3da4e30 100644 --- a/streampipes-wrapper-siddhi/pom.xml +++ b/streampipes-wrapper-siddhi/pom.xml @@ -20,7 +20,7 @@ streampipes-parent org.streampipes - 0.64.0-SNAPSHOT + 0.64.0 4.0.0 diff --git a/streampipes-wrapper-spark/pom.xml b/streampipes-wrapper-spark/pom.xml index 75b4acc185..5f9fbf6116 100644 --- a/streampipes-wrapper-spark/pom.xml +++ b/streampipes-wrapper-spark/pom.xml @@ -22,7 +22,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-wrapper-spark diff --git a/streampipes-wrapper-standalone/pom.xml b/streampipes-wrapper-standalone/pom.xml index 7060b4d40c..3873b76159 100644 --- a/streampipes-wrapper-standalone/pom.xml +++ b/streampipes-wrapper-standalone/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-wrapper-standalone StreamPipes Wrapper for Standalone Pipeline Element Implementations diff --git a/streampipes-wrapper/pom.xml b/streampipes-wrapper/pom.xml index c0f87d5c1a..470af7d798 100644 --- a/streampipes-wrapper/pom.xml +++ b/streampipes-wrapper/pom.xml @@ -20,7 +20,7 @@ org.streampipes streampipes-parent - 0.64.0-SNAPSHOT + 0.64.0 streampipes-wrapper