You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by te...@apache.org on 2020/05/14 07:41:05 UTC
[incubator-streampipes] 01/01: Merge branch 'dev' into
STREAMPIPES-79
This is an automated email from the ASF dual-hosted git repository.
tex pushed a commit to branch STREAMPIPES-79
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit dd5fa85d8db06674ec0ddae54585d8901f32f450
Merge: 4cc5680 6705786
Author: tex <te...@fzi.de>
AuthorDate: Thu May 14 09:32:38 2020 +0200
Merge branch 'dev' into STREAMPIPES-79
# Conflicts:
# ui/package.json
.gitignore | 7 +-
.../Apache_StreamPipes___Connect_Master.xml | 26 +
.../Apache_StreamPipes___Core.xml | 17 +
CHANGELOG.md | 65 --
DISCLAIMER-WIP | 2 +-
LICENSE | 28 +-
LICENSE-binary | 808 ---------------------
NOTICE-binary | 323 --------
RELEASE_NOTES.md | 267 +++++++
...ndency-reduced-pom.xml => RELEASE_VALIDATION.md | 19 +-
.../README.md | 2 +-
.../pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../README.md | 2 +-
.../pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../streampipes-archetype-pe-sinks-flink/README.md | 2 +-
.../streampipes-archetype-pe-sinks-flink/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../streampipes-archetype-pe-sinks-jvm/README.md | 2 +-
.../streampipes-archetype-pe-sinks-jvm/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 25 -
.../src/test/resources/projects/basic/goal.txt | 0
.../streampipes-archetype-pe-sources/README.md | 2 +-
.../streampipes-archetype-pe-sources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
docker-compose.yml | 144 ++++
pom.xml | 138 ++--
...rchetype.properties => run-validation-system.sh | 11 +-
streampipes-app-file-export/pom.xml | 4 +-
streampipes-backend/pom.xml | 14 +-
streampipes-code-generation/pom.xml | 8 +-
.../codegeneration/flink/ConfigGenerator.java | 2 +-
.../codegeneration/flink/FlinkCodeGenerator.java | 2 +-
.../codegeneration/flink/XmlGeneratorTest.java | 40 -
.../src/test/resources/DeploymentConfig.json | 1 -
.../src/test/resources/Entity.json | 1 -
.../src/test/resources/expected_Config_java | 11 -
.../resources/expected_FlinkSecController_java | 42 --
.../test/resources/expected_FlinkSecProgram_java | 25 -
.../resources/expected_FlinkSepaController_java | 44 --
.../test/resources/expected_FlinkSepaProgram_java | 22 -
.../src/test/resources/expected_Init_java | 13 -
.../resources/expected_TestProjectParameters_java | 24 -
.../src/test/resources/expected_TestProject_java | 19 -
.../src/test/resources/expected_pom_xml | 69 --
.../src/test/resources/expected_web_xml | 20 -
streampipes-commons/pom.xml | 2 +-
streampipes-config/pom.xml | 4 +-
streampipes-connect-container-master/pom.xml | 8 +-
streampipes-connect-container-worker/pom.xml | 4 +-
streampipes-connect-container/pom.xml | 12 +-
streampipes-connect/pom.xml | 26 +-
.../connect/adapter/sdk/ParameterExtractor.java | 1 +
streampipes-container-base/pom.xml | 2 +-
streampipes-container-embedded/pom.xml | 4 +-
streampipes-container-standalone/pom.xml | 6 +-
streampipes-container/pom.xml | 10 +-
.../container/locales/LabelGenerator.java | 14 +-
streampipes-dataformat-cbor/pom.xml | 6 +-
streampipes-dataformat-fst/pom.xml | 6 +-
streampipes-dataformat-json/pom.xml | 6 +-
streampipes-dataformat-smile/pom.xml | 6 +-
streampipes-dataformat/pom.xml | 4 +-
streampipes-logging/pom.xml | 2 +-
streampipes-measurement-units/pom.xml | 4 +-
streampipes-messaging-jms/pom.xml | 4 +-
.../messaging/jms/ActiveMQPublisher.java | 3 +-
streampipes-messaging-kafka/pom.xml | 4 +-
streampipes-messaging-mqtt/pom.xml | 8 +-
streampipes-messaging/pom.xml | 4 +-
streampipes-model-client/pom.xml | 4 +-
streampipes-model/pom.xml | 8 +-
streampipes-performance-tests/pom.xml | 10 +-
streampipes-pipeline-management/pom.xml | 32 +-
.../manager/setup/CouchDbInstallationStep.java | 31 +-
streampipes-rest-shared/pom.xml | 6 +-
streampipes-rest/dependency-reduced-pom.xml | 96 ---
streampipes-rest/pom.xml | 18 +-
streampipes-sdk/pom.xml | 8 +-
.../apache/streampipes/sdk/StaticProperties.java | 21 +-
.../sdk/extractor/AbstractParameterExtractor.java | 2 +-
streampipes-serializers/pom.xml | 6 +-
streampipes-sources/pom.xml | 4 +-
streampipes-storage-api/pom.xml | 6 +-
streampipes-storage-couchdb/pom.xml | 12 +-
streampipes-storage-management/pom.xml | 8 +-
streampipes-storage-rdf4j/pom.xml | 12 +-
streampipes-test-utils/pom.xml | 4 +-
streampipes-user-management/pom.xml | 6 +-
streampipes-vocabulary/pom.xml | 2 +-
streampipes-wrapper-distributed/pom.xml | 8 +-
streampipes-wrapper-flink/pom.xml | 4 +-
streampipes-wrapper-kafka-streams/pom.xml | 4 +-
streampipes-wrapper-siddhi/pom.xml | 12 +-
.../wrapper/siddhi/engine/SiddhiDebugCallback.java | 2 +-
.../wrapper/siddhi/engine/SiddhiEventEngine.java | 15 +-
.../wrapper/siddhi/manager/SpSiddhiManager.java | 2 +-
streampipes-wrapper-spark/pom.xml | 8 +-
streampipes-wrapper-standalone/pom.xml | 4 +-
streampipes-wrapper/pom.xml | 10 +-
tools/maven/assembly.xml | 82 +++
.../maven/owasp-dependency-check-suppression.xml | 23 +-
.../basic/archetype.properties => ui/.dockerignore | 13 +-
ui/Dockerfile | 2 +-
ui/angular.json | 3 +-
ui/deployment/prebuild.js | 20 +-
.../deployment/rel/config.yml | 23 +-
ui/deployment/rel/img/logo.png | Bin 0 -> 14358 bytes
ui/deployment/rel/img/sp-logo-right-white.png | Bin 0 -> 21453 bytes
ui/package.json | 79 +-
.../app/app-overview/app-overview.component.html | 2 -
ui/src/app/app-overview/app-overview.component.ts | 10 -
ui/src/assets/fonts/Roboto-Regular.css | 2 +-
ui/src/scss/sp/pipeline-assembly.scss | 18 +
116 files changed, 1012 insertions(+), 2051 deletions(-)
diff --cc ui/package.json
index 0199f3d,7b7820c..03c39bc
--- a/ui/package.json
+++ b/ui/package.json
@@@ -64,45 -63,47 +63,47 @@@
"angular-ui-bootstrap": "0.14.3",
"angular-ui-sortable": "0.13.4",
"angular-ui-tree": "2.9.0",
- "angular2-uuid": "^1.1.1",
+ "angular2-uuid": "1.1.1",
"angularjs-datetime-picker": "0.1.16",
"bootstrap": "3.3.4",
- "calendar-heatmap-graph": "^0.0.14",
- "core-js": "^2.5.3",
- "dagre": "^0.8.4",
- "datatables.net": "^1.10.20",
- "fast-json-patch": "^2.1.0",
- "file-saver": "^1.3.8",
+ "calendar-heatmap-graph": "0.0.14",
+ "core-js": "2.5.3",
+ "dagre": "0.8.4",
+ "fast-json-patch": "2.1.0",
+ "file-saver": "1.3.8",
"jquery": "2.1.3",
- "jquery-ui-dist": "^1.12.1",
+ "jquery-ui-dist": "1.12.1",
"jquery.panzoom": "2.0.5",
+ "datatables.net": "1.10.20",
"jsonld": "0.4.12",
"jsplumb": "2.1.3",
- "jszip": "^3.2.1",
- "konva": "^3.2.4",
- "leaflet": "^1.6.0",
+ "jszip": "3.2.1",
+ "konva": "3.2.4",
+ "leaflet": "1.6.0",
"lodash": "3.10.1",
- "material-design-icons": "^3.0.1",
+ "material-design-icons": "3.0.1",
"ng-dynamic-component": "4.0.3",
"ng-file-upload": "9.0.13",
+ "@danielmoncada/angular-datetime-picker": "9.2.0",
+ "moment": "2.24.0",
"ng-prettyjson": "0.1.8",
- "ng-showdown": "^1.1.0",
- "ng-simple-slideshow": "^1.2.9",
- "ng2-charts": "^2.0.3",
- "ng2-dragula": "^1.5.0",
+ "ng-showdown": "1.1.0",
+ "ng-simple-slideshow": "1.2.9",
+ "ng2-charts": "2.0.3",
+ "ng2-dragula": "1.5.0",
"ngmap": "1.18.0",
- "ngx-color-picker": "^9.0.0",
- "plotly.js": "^1.52.2",
- "prismjs": "^1.19.0",
- "rxjs": "^6.5.4",
- "rxjs-compat": "^6.5.4",
+ "ngx-color-picker": "9.0.0",
+ "plotly.js": "1.52.2",
+ "prismjs": "1.16.0",
+ "rxjs": "6.3.3",
+ "rxjs-compat": "6.3.3",
"shepherd.js": "2.4.0",
"slick-carousel": "1.6.0",
- "systemjs": "^0.21.6",
- "tslib": "^1.11.1",
- "ng-pick-datetime": "^7.0.0",
+ "systemjs": "0.21.6",
- "tslib": "1.10.0",
++ "tslib": "1.11.1",
+ "ng-pick-datetime": "7.0.0",
"trix": "0.10.1",
- "zone.js": "~0.10.2"
+ "zone.js": "0.10.2"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^8.4.1",