From 724c4ace5f87f9594e7feec7d690e99a462f4d72 Mon Sep 17 00:00:00 2001 From: Daniel Frey Date: Fri, 9 Oct 2020 16:49:58 -0400 Subject: [PATCH] Refactor hardcoded versions in functions submodule branches This is so they can be updated in a minimal amount of places and leverage the maven hierarchy to propagate them where appropriate. While working with SNAPSHOT releases of Spring Boot, Spring Integration, and Spring Cloud, it required touching every pom.xml file in order to reflect the use of the SNAPSHOT. After this change, it will only be required to change the property in the top functions pom.xml and the versions will reflect to all submodules. Maven introduced the ability use a key property, revision to propagate this information to the declarations in each pom. This was enabled in Maven 3.5+ https://maven.apache.org/maven-ci-friendly.html --- common/aws-s3-common/pom.xml | 13 +- common/cdc-debezium-boot-starter/pom.xml | 128 +++--- common/cdc-debezium-common/pom.xml | 15 +- common/config-common/pom.xml | 14 +- common/file-common/pom.xml | 13 +- common/ftp-common/pom.xml | 33 +- common/function-test-support/pom.xml | 66 ++-- common/geode-common/pom.xml | 25 +- common/metadata-store-common/pom.xml | 40 +- common/mqtt-common/pom.xml | 28 +- common/pom.xml | 34 ++ common/tcp-common/pom.xml | 29 +- common/tensorflow-common/README.adoc | 2 +- common/tensorflow-common/pom.xml | 15 +- common/twitter-common/pom.xml | 34 +- consumer/analytics-consumer/pom.xml | 15 +- consumer/cassandra-consumer/pom.xml | 13 +- consumer/elasticsearch-consumer/pom.xml | 19 +- consumer/file-consumer/pom.xml | 13 +- consumer/ftp-consumer/pom.xml | 39 +- consumer/geode-consumer/pom.xml | 48 +-- consumer/jdbc-consumer/pom.xml | 13 +- consumer/log-consumer/pom.xml | 15 +- consumer/mongodb-consumer/pom.xml | 13 +- consumer/mqtt-consumer/pom.xml | 43 +- consumer/pom.xml | 40 ++ consumer/rabbit-consumer/pom.xml | 26 +- consumer/redis-consumer/pom.xml | 60 +-- consumer/rsocket-consumer/pom.xml | 27 +- consumer/s3-consumer/pom.xml | 38 +- consumer/sftp-consumer/pom.xml | 36 +- consumer/tcp-consumer/pom.xml | 45 +-- consumer/twitter-consumer/pom.xml | 43 +- consumer/wavefront-consumer/pom.xml | 46 +-- consumer/websocket-consumer/pom.xml | 36 +- function-dependencies/pom.xml | 114 +++--- function/aggregator-function/pom.xml | 13 +- function/filter-function/pom.xml | 13 +- function/header-enricher-function/pom.xml | 13 +- function/http-request-function/pom.xml | 46 +-- .../image-recognition-function/README.adoc | 2 +- function/image-recognition-function/pom.xml | 20 +- .../object-detection-function/README.adoc | 2 +- function/object-detection-function/pom.xml | 21 +- function/payload-converter-function/pom.xml | 25 +- function/pom.xml | 34 ++ .../README.adoc | 4 +- .../semantic-segmentation-function/pom.xml | 20 +- function/spel-function/pom.xml | 34 +- function/splitter-function/pom.xml | 37 +- function/task-launch-request-function/pom.xml | 9 +- function/tasklauncher-function/pom.xml | 31 +- function/twitter-function/pom.xml | 36 +- pom.xml | 369 +++--------------- spring-functions-parent/pom.xml | 37 +- supplier/cdc-debezium-supplier/pom.xml | 13 +- supplier/file-supplier/pom.xml | 13 +- supplier/ftp-supplier/pom.xml | 13 +- supplier/geode-supplier/pom.xml | 20 +- supplier/http-supplier/pom.xml | 13 +- supplier/jdbc-supplier/pom.xml | 13 +- supplier/jms-supplier/pom.xml | 13 +- supplier/mail-supplier/pom.xml | 13 +- supplier/mongodb-supplier/pom.xml | 44 +-- supplier/mqtt-supplier/pom.xml | 43 +- supplier/pom.xml | 39 ++ supplier/rabbit-supplier/pom.xml | 39 +- supplier/s3-supplier/pom.xml | 45 +-- supplier/sftp-supplier/pom.xml | 73 ++-- supplier/syslog-supplier/pom.xml | 39 +- supplier/tcp-supplier/pom.xml | 45 +-- supplier/time-supplier/pom.xml | 32 +- supplier/twitter-supplier/pom.xml | 46 +-- supplier/websocket-supplier/pom.xml | 40 +- 74 files changed, 871 insertions(+), 1722 deletions(-) create mode 100644 common/pom.xml create mode 100644 consumer/pom.xml create mode 100644 function/pom.xml create mode 100644 supplier/pom.xml diff --git a/common/aws-s3-common/pom.xml b/common/aws-s3-common/pom.xml index 5488cefa..b3bffe81 100644 --- a/common/aws-s3-common/pom.xml +++ b/common/aws-s3-common/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - aws-s3-common - 1.0.0-SNAPSHOT - aws-s3-common - aws-s3 consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + aws-s3-common + aws-s3-common + aws-s3 consumer + 2.3.3.RELEASE 2.2.2.RELEASE diff --git a/common/cdc-debezium-boot-starter/pom.xml b/common/cdc-debezium-boot-starter/pom.xml index caa6310e..fd18678d 100644 --- a/common/cdc-debezium-boot-starter/pom.xml +++ b/common/cdc-debezium-boot-starter/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - cdc-debezium-boot-starter - 1.0.0-SNAPSHOT - cdc-debezium-boot-starter - Change Data Capture (CDC) Debezium Boot Starter org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + cdc-debezium-boot-starter + cdc-debezium-boot-starter + Change Data Capture (CDC) Debezium Boot Starter + 1.2.1.Final @@ -32,17 +31,6 @@ - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - io.debezium @@ -118,58 +106,58 @@ - - io.fabric8 - docker-maven-plugin - 0.33.0 - - - - mysql - debezium/example-mysql:1.0 - - - debezium - mysqluser - mysqlpw - - - 3306:3306 - - - port: 3306 - - - - - - - - - start - - generate-test-resources - - build - start - - - - stop - post-integration-test - - stop - - - - stop-pre - clean - - stop - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cdc-debezium-common/pom.xml b/common/cdc-debezium-common/pom.xml index e6d37898..c3e1d814 100644 --- a/common/cdc-debezium-common/pom.xml +++ b/common/cdc-debezium-common/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - cdc-debezium-common - 1.0.0-SNAPSHOT - cdc-debezium-common - Change Data Capture (CDC) Debezium Common org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + cdc-debezium-common + cdc-debezium-common + Change Data Capture (CDC) Debezium Common + 1.2.1.Final @@ -98,7 +97,7 @@ org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} + ${revision} diff --git a/common/config-common/pom.xml b/common/config-common/pom.xml index 33c4844e..50adf6a4 100644 --- a/common/config-common/pom.xml +++ b/common/config-common/pom.xml @@ -1,17 +1,17 @@ 4.0.0 - config-common - 1.0.0-SNAPSHOT - config-common - Function Common Configuration Components org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + + config-common + config-common + Function Common Configuration Components + org.springframework.boot diff --git a/common/file-common/pom.xml b/common/file-common/pom.xml index 1c8c382c..59d2b420 100644 --- a/common/file-common/pom.xml +++ b/common/file-common/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - file-common - 1.0.0-SNAPSHOT - file-common - file common org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + file-common + file-common + file common + org.springframework.boot diff --git a/common/ftp-common/pom.xml b/common/ftp-common/pom.xml index 3ae5b914..54b684df 100644 --- a/common/ftp-common/pom.xml +++ b/common/ftp-common/pom.xml @@ -1,41 +1,24 @@ 4.0.0 - ftp-common - 1.0.0-SNAPSHOT - ftp-common - ftp common org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + ftp-common + ftp-common + ftp common + + org.springframework.integration spring-integration-ftp - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + diff --git a/common/function-test-support/pom.xml b/common/function-test-support/pom.xml index 7c3e7db2..b37b895e 100644 --- a/common/function-test-support/pom.xml +++ b/common/function-test-support/pom.xml @@ -1,72 +1,74 @@ 4.0.0 - function-test-support - 1.0.0-SNAPSHOT - function-test-support - file consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + function-test-support + function-test-support + file consumer + 1.6.0 - 1.14.2 1.1.1 1.2.7.RELEASE 4.0.3 + + + org.springframework.boot + spring-boot-starter-test + compile + + + + org.springframework.data + spring-data-geode + true + + + + org.springframework.integration + spring-integration-ftp + true + + + + org.springframework + spring-websocket + + org.apache.ftpserver ftpserver-core ${apache-ftpserver.version} compile - - org.springframework.integration - spring-integration-ftp - true - - - org.springframework.integration - spring-integration-test - compile - - - org.springframework.boot - spring-boot-starter-test - compile - + org.apache.sshd sshd-core ${sshd-core.version} + org.testcontainers testcontainers ${test-containers.version} - - org.springframework.data - spring-data-geode - true - - - org.springframework - spring-websocket - + org.awaitility awaitility ${awaitility.version} + diff --git a/common/geode-common/pom.xml b/common/geode-common/pom.xml index b6268ddb..fd637cf8 100644 --- a/common/geode-common/pom.xml +++ b/common/geode-common/pom.xml @@ -1,27 +1,24 @@ 4.0.0 - geode-common - 1.0.0-SNAPSHOT - geode-common - Geode Common Components org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + + geode-common + geode-common + Geode Common Components + 20200518 - - org.springframework.boot - spring-boot-starter-validation - + org.json json @@ -31,11 +28,7 @@ org.springframework.data spring-data-geode - - org.springframework.boot - spring-boot-configuration-processor - provided - + diff --git a/common/metadata-store-common/pom.xml b/common/metadata-store-common/pom.xml index e92516e4..705b67db 100644 --- a/common/metadata-store-common/pom.xml +++ b/common/metadata-store-common/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - metadata-store-common - 1.0.0-SNAPSHOT - metadata-store-common - metadata-store common org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + metadata-store-common + metadata-store-common + metadata-store common + 1.11.439 2.3.3.RELEASE @@ -22,27 +21,6 @@ - - org.springframework.integration - spring-integration-core - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.integration @@ -158,11 +136,7 @@ ${aws-java-sdk.version} true - - org.springframework.integration - spring-integration-test - test - + diff --git a/common/mqtt-common/pom.xml b/common/mqtt-common/pom.xml index 5d36d7e9..1df2c1c7 100644 --- a/common/mqtt-common/pom.xml +++ b/common/mqtt-common/pom.xml @@ -1,36 +1,24 @@ 4.0.0 - mqtt-common - 1.0.0-SNAPSHOT - mqtt-common - file consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + mqtt-common + mqtt-common + file consumer + + org.springframework.integration spring-integration-mqtt - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - + diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 00000000..4b9a3113 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + + org.springframework.cloud.fn + java-functions-parent + ${revision} + + + java-functions-common-parent + java-functions-common-parent + Pivotal Java Functions Common Parent + pom + + + + aws-s3-common + config-common + file-common + ftp-common + function-test-support + geode-common + metadata-store-common + mqtt-common + tcp-common + twitter-common + tensorflow-common + cdc-debezium-common + cdc-debezium-boot-starter + + + + diff --git a/common/tcp-common/pom.xml b/common/tcp-common/pom.xml index 338f6502..df98ef79 100644 --- a/common/tcp-common/pom.xml +++ b/common/tcp-common/pom.xml @@ -1,37 +1,24 @@ 4.0.0 - tcp-common - 1.0.0-SNAPSHOT - tcp-common - tcp common org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + tcp-common + tcp-common + tcp common + + org.springframework.integration spring-integration-ip - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + diff --git a/common/tensorflow-common/README.adoc b/common/tensorflow-common/README.adoc index 6d235c57..15864667 100644 --- a/common/tensorflow-common/README.adoc +++ b/common/tensorflow-common/README.adoc @@ -11,7 +11,7 @@ Quick Start: just add the following dependency: org.springframework.cloud.fn tensorflow-common - ${spring-cloud-fn.version} + ${revision} ---- diff --git a/common/tensorflow-common/pom.xml b/common/tensorflow-common/pom.xml index 8724da07..6fb5a424 100644 --- a/common/tensorflow-common/pom.xml +++ b/common/tensorflow-common/pom.xml @@ -2,20 +2,17 @@ - - tensorflow-common - 1.0.0-SNAPSHOT - tensorflow-common - tensorflow common + 4.0.0 org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} - 4.0.0 + tensorflow-common + tensorflow-common + tensorflow common true diff --git a/common/twitter-common/pom.xml b/common/twitter-common/pom.xml index 8be67066..79f19a6e 100644 --- a/common/twitter-common/pom.xml +++ b/common/twitter-common/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - twitter-common - 1.0.0-SNAPSHOT - twitter-common - Twitter common org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-common-parent + ${revision} + twitter-common + twitter-common + Twitter common + 4.0.7 @@ -24,15 +23,6 @@ ${twitter4j.version} - - org.springframework.boot - spring-boot-starter-json - - - org.springframework.boot - spring-boot-starter-validation - - org.springframework.integration spring-integration-ip @@ -40,19 +30,9 @@ org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} + ${project.version} - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/consumer/analytics-consumer/pom.xml b/consumer/analytics-consumer/pom.xml index 034d3aa0..97ca16f6 100644 --- a/consumer/analytics-consumer/pom.xml +++ b/consumer/analytics-consumer/pom.xml @@ -3,18 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - analytics-consumer - 1.0.0-SNAPSHOT - analytics-consumer - Spring Native Consumer for computing meters org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + analytics-consumer + analytics-consumer + Spring Native Consumer for computing meters + org.springframework.cloud.fn @@ -24,7 +23,7 @@ org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} + ${project.version} com.fasterxml.jackson.core diff --git a/consumer/cassandra-consumer/pom.xml b/consumer/cassandra-consumer/pom.xml index 60a847dd..4115ac52 100644 --- a/consumer/cassandra-consumer/pom.xml +++ b/consumer/cassandra-consumer/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - cassandra-consumer - 1.0.0-SNAPSHOT - cassandra-consumer - Cassandra Consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + cassandra-consumer + cassandra-consumer + Cassandra Consumer + 0.8.0.RELEASE 4.3.1.0 diff --git a/consumer/elasticsearch-consumer/pom.xml b/consumer/elasticsearch-consumer/pom.xml index 6c64cee8..ebe203d4 100644 --- a/consumer/elasticsearch-consumer/pom.xml +++ b/consumer/elasticsearch-consumer/pom.xml @@ -1,21 +1,16 @@ 4.0.0 - elasticsearch-consumer - 1.0.0-SNAPSHOT - elasticsearch-consumer - elasticsearch consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} - - 1.14.3 - + elasticsearch-consumer + elasticsearch-consumer + elasticsearch consumer @@ -43,12 +38,12 @@ org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} + ${revision} org.springframework.cloud.fn payload-converter-function - ${project.version} + ${revision} org.springframework.boot diff --git a/consumer/file-consumer/pom.xml b/consumer/file-consumer/pom.xml index 3d8a8141..5bac29e9 100644 --- a/consumer/file-consumer/pom.xml +++ b/consumer/file-consumer/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - file-consumer - 1.0.0-SNAPSHOT - file-consumer - file consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + file-consumer + file-consumer + file consumer + org.springframework.integration diff --git a/consumer/ftp-consumer/pom.xml b/consumer/ftp-consumer/pom.xml index 5dc9a868..0e48f342 100644 --- a/consumer/ftp-consumer/pom.xml +++ b/consumer/ftp-consumer/pom.xml @@ -1,45 +1,28 @@ 4.0.0 - ftp-consumer - 1.0.0-SNAPSHOT - ftp-consumer - file consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + ftp-consumer + ftp-consumer + file consumer + - - org.springframework.cloud.fn - ftp-common - ${project.version} - + org.springframework.integration spring-integration-ftp + - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test + org.springframework.cloud.fn + ftp-common + ${project.version} org.springframework.cloud.fn diff --git a/consumer/geode-consumer/pom.xml b/consumer/geode-consumer/pom.xml index 44095248..8053afee 100644 --- a/consumer/geode-consumer/pom.xml +++ b/consumer/geode-consumer/pom.xml @@ -2,62 +2,39 @@ 4.0.0 - geode-consumer - 1.0.0-SNAPSHOT - geode-consumer - Geode consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + geode-consumer + geode-consumer + Geode consumer + + org.springframework.integration spring-integration-gemfire - - org.springframework.boot - spring-boot-starter-validation - + org.springframework.cloud.fn geode-common - ${spring-cloud-fn.version} + ${project.version} org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - io.projectreactor - reactor-test - test + ${project.version} + org.springframework.cloud.fn function-test-support - ${spring-cloud-fn.version} + ${revision} test @@ -65,6 +42,7 @@ lombok test + diff --git a/consumer/jdbc-consumer/pom.xml b/consumer/jdbc-consumer/pom.xml index 2540da08..f1c726ce 100644 --- a/consumer/jdbc-consumer/pom.xml +++ b/consumer/jdbc-consumer/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - jdbc-consumer - 1.0.0-SNAPSHOT - jdbc-consumer - jdbc consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + jdbc-consumer + jdbc-consumer + jdbc consumer + org.springframework.integration diff --git a/consumer/log-consumer/pom.xml b/consumer/log-consumer/pom.xml index 64adaeb6..f8a9f83f 100644 --- a/consumer/log-consumer/pom.xml +++ b/consumer/log-consumer/pom.xml @@ -2,23 +2,22 @@ 4.0.0 - log-consumer - 1.0.0-SNAPSHOT - log-consumer - Log Consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + log-consumer + log-consumer + Log Consumer + org.springframework.cloud.fn payload-converter-function - ${project.version} + ${revision} diff --git a/consumer/mongodb-consumer/pom.xml b/consumer/mongodb-consumer/pom.xml index 0ab63380..5d690065 100644 --- a/consumer/mongodb-consumer/pom.xml +++ b/consumer/mongodb-consumer/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - mongodb-consumer - 1.0.0-SNAPSHOT - mongodb-consumer - Mongo DB consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + mongodb-consumer + mongodb-consumer + Mongo DB consumer + org.springframework.integration diff --git a/consumer/mqtt-consumer/pom.xml b/consumer/mqtt-consumer/pom.xml index e1a540ab..837a80c4 100644 --- a/consumer/mqtt-consumer/pom.xml +++ b/consumer/mqtt-consumer/pom.xml @@ -1,52 +1,31 @@ 4.0.0 - mqtt-consumer - 1.0.0-SNAPSHOT - mqtt-consumer - mqtt consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + mqtt-consumer + mqtt-consumer + mqtt consumer + + org.springframework.cloud.fn mqtt-common - ${project.version} - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test + ${revision} + org.testcontainers testcontainers - 1.9.1 + ${test-containers.version} test + diff --git a/consumer/pom.xml b/consumer/pom.xml new file mode 100644 index 00000000..0bb07b92 --- /dev/null +++ b/consumer/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + + org.springframework.cloud.fn + java-functions-parent + ${revision} + + + java-functions-consumer-parent + java-functions-consumer-parent + Pivotal Java Functions Consumer Parent + pom + + + + cassandra-consumer + elasticsearch-consumer + analytics-consumer + file-consumer + ftp-consumer + geode-consumer + jdbc-consumer + log-consumer + mongodb-consumer + mqtt-consumer + rabbit-consumer + redis-consumer + sftp-consumer + tcp-consumer + websocket-consumer + s3-consumer + twitter-consumer + wavefront-consumer + rsocket-consumer + + + + diff --git a/consumer/rabbit-consumer/pom.xml b/consumer/rabbit-consumer/pom.xml index 87156932..c9dba83a 100644 --- a/consumer/rabbit-consumer/pom.xml +++ b/consumer/rabbit-consumer/pom.xml @@ -1,40 +1,34 @@ 4.0.0 - rabbit-consumer - 1.0.0-SNAPSHOT - rabbit-consumer - Rabbit consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + rabbit-consumer + rabbit-consumer + Rabbit consumer + + org.springframework.integration spring-integration-amqp + org.springframework.boot spring-boot-starter-amqp + org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-configuration-processor - provided - - - javax.validation - validation-api - + diff --git a/consumer/redis-consumer/pom.xml b/consumer/redis-consumer/pom.xml index 0b7e8c91..63b9bb4c 100644 --- a/consumer/redis-consumer/pom.xml +++ b/consumer/redis-consumer/pom.xml @@ -2,84 +2,48 @@ 4.0.0 - redis-consumer - 1.0.0-SNAPSHOT - redis-consumer - Redis Consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + redis-consumer + redis-consumer + Redis Consumer + 2.2.0.RELEASE - 1.48 + 1.83 + org.springframework.boot spring-boot-starter-data-redis + org.springframework.integration spring-integration-redis - - org.springframework.boot - spring-boot-starter-validation - - - javax.validation - validation-api - - - org.springframework.boot - spring-boot-configuration-processor - provided - + com.playtika.testcontainers embedded-redis ${embedded-redis.version} test - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - + org.springframework.cloud spring-cloud-starter ${spring-cloud-starters.version} test - - org.springframework.integration - spring-integration-test-support - test - - - org.awaitility - awaitility - test - - - junit - junit - - - + diff --git a/consumer/rsocket-consumer/pom.xml b/consumer/rsocket-consumer/pom.xml index 098fd30e..4e21d402 100644 --- a/consumer/rsocket-consumer/pom.xml +++ b/consumer/rsocket-consumer/pom.xml @@ -3,37 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - rsocket-consumer - 1.0.0-SNAPSHOT - rsocket-consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + rsocket-consumer + rsocket-consumer + + org.springframework.boot spring-boot-starter-rsocket - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - diff --git a/consumer/s3-consumer/pom.xml b/consumer/s3-consumer/pom.xml index 69c3ce88..b6214c57 100644 --- a/consumer/s3-consumer/pom.xml +++ b/consumer/s3-consumer/pom.xml @@ -1,57 +1,43 @@ 4.0.0 - s3-consumer - 1.0.0-SNAPSHOT - s3-consumer - s3 consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + s3-consumer + s3-consumer + s3 consumer + + org.springframework.cloud.fn aws-s3-common ${project.version} + org.springframework.cloud.fn file-common ${project.version} + org.springframework.cloud.fn config-common ${project.version} - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + org.springframework spring-web test - - org.springframework.integration - spring-integration-test - test - + + diff --git a/consumer/sftp-consumer/pom.xml b/consumer/sftp-consumer/pom.xml index 160804cf..e2e798bd 100644 --- a/consumer/sftp-consumer/pom.xml +++ b/consumer/sftp-consumer/pom.xml @@ -1,46 +1,30 @@ 4.0.0 - sftp-consumer - 1.0.0-SNAPSHOT - sftp-consumer - file consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + sftp-consumer + sftp-consumer + file consumer + + org.springframework.integration spring-integration-sftp - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + org.springframework.cloud.fn function-test-support - ${project.version} + ${revision} + diff --git a/consumer/tcp-consumer/pom.xml b/consumer/tcp-consumer/pom.xml index a3bd42a1..f96c2535 100644 --- a/consumer/tcp-consumer/pom.xml +++ b/consumer/tcp-consumer/pom.xml @@ -1,52 +1,25 @@ 4.0.0 - tcp-consumer - 1.0.0-SNAPSHOT - tcp-consumer - tcp consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + tcp-consumer + tcp-consumer + tcp consumer + + org.springframework.cloud.fn tcp-common - ${project.version} - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.integration - spring-integration-test - test + ${revision} + diff --git a/consumer/twitter-consumer/pom.xml b/consumer/twitter-consumer/pom.xml index 678c5420..020e8f6a 100644 --- a/consumer/twitter-consumer/pom.xml +++ b/consumer/twitter-consumer/pom.xml @@ -1,19 +1,19 @@ 4.0.0 - twitter-consumer - 1.0.0-SNAPSHOT - twitter-consumer - twitter consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + twitter-consumer + twitter-consumer + twitter consumer + + org.springframework.cloud.fn twitter-common @@ -24,34 +24,7 @@ payload-converter-function ${project.version} - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.integration - spring-integration-test - test - + diff --git a/consumer/wavefront-consumer/pom.xml b/consumer/wavefront-consumer/pom.xml index 11d6b56e..59bd2b89 100644 --- a/consumer/wavefront-consumer/pom.xml +++ b/consumer/wavefront-consumer/pom.xml @@ -2,64 +2,34 @@ 4.0.0 - wavefront-consumer - 1.0.0-SNAPSHOT - wavefront-consumer - Wavefront Consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + wavefront-consumer + wavefront-consumer + Wavefront Consumer + 2.4.0 - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - org.springframework.boot spring-boot-starter-web + org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} + ${project.version} - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - junit - junit - 4.8.2 - test - diff --git a/consumer/websocket-consumer/pom.xml b/consumer/websocket-consumer/pom.xml index 5f28f012..80b09437 100644 --- a/consumer/websocket-consumer/pom.xml +++ b/consumer/websocket-consumer/pom.xml @@ -1,60 +1,52 @@ 4.0.0 - websocket-consumer - 1.0.0-SNAPSHOT - websocket-consumer - websocket consumer org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-consumer-parent + ${revision} + websocket-consumer + websocket-consumer + websocket consumer + - - org.springframework.boot - spring-boot-starter - + org.springframework.boot spring-boot-starter-actuator + org.springframework spring-messaging + org.springframework spring-websocket + io.netty netty-all - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + org.springframework.boot spring-boot-starter-web test + org.springframework.cloud.fn function-test-support - ${spring-cloud-fn.version} + ${project.version} test + diff --git a/function-dependencies/pom.xml b/function-dependencies/pom.xml index 5890aee8..407630c9 100644 --- a/function-dependencies/pom.xml +++ b/function-dependencies/pom.xml @@ -2,14 +2,14 @@ - - java-functions-parent - org.springframework.cloud.fn - 1.0.0-SNAPSHOT - .. - 4.0.0 + + org.springframework.cloud.fn + java-functions-parent + ${revision} + + function-dependencies pom @@ -18,257 +18,257 @@ org.springframework.cloud.fn mail-supplier - ${project.version} + ${revision} org.springframework.cloud.fn syslog-supplier - ${project.version} + ${revision} org.springframework.cloud.fn cdc-debezium-supplier - ${project.version} + ${revision} org.springframework.cloud.fn file-supplier - ${project.version} + ${revision} org.springframework.cloud.fn ftp-supplier - ${project.version} + ${revision} org.springframework.cloud.fn geode-supplier - ${project.version} + ${revision} org.springframework.cloud.fn http-supplier - ${project.version} + ${revision} org.springframework.cloud.fn jdbc-supplier - ${project.version} + ${revision} org.springframework.cloud.fn jms-supplier - ${project.version} + ${revision} org.springframework.cloud.fn mongodb-supplier - ${project.version} + ${revision} org.springframework.cloud.fn mqtt-supplier - ${project.version} + ${revision} org.springframework.cloud.fn rabbit-supplier - ${project.version} + ${revision} org.springframework.cloud.fn s3-supplier - ${project.version} + ${revision} org.springframework.cloud.fn sftp-supplier - ${project.version} + ${revision} org.springframework.cloud.fn tcp-supplier - ${project.version} + ${revision} org.springframework.cloud.fn time-supplier - ${project.version} + ${revision} org.springframework.cloud.fn twitter-supplier - ${project.version} + ${revision} org.springframework.cloud.fn websocket-supplier - ${project.version} + ${revision} org.springframework.cloud.fn analytics-consumer - ${project.version} + ${revision} org.springframework.cloud.fn elasticsearch-consumer - ${project.version} + ${revision} org.springframework.cloud.fn rsocket-consumer - ${project.version} + ${revision} org.springframework.cloud.fn cassandra-consumer - ${project.version} + ${revision} org.springframework.cloud.fn file-consumer - ${project.version} + ${revision} org.springframework.cloud.fn ftp-consumer - ${project.version} + ${revision} org.springframework.cloud.fn geode-consumer - ${project.version} + ${revision} org.springframework.cloud.fn jdbc-consumer - ${project.version} + ${revision} org.springframework.cloud.fn log-consumer - ${project.version} + ${revision} org.springframework.cloud.fn mongodb-consumer - ${project.version} + ${revision} org.springframework.cloud.fn mqtt-consumer - ${project.version} + ${revision} org.springframework.cloud.fn rabbit-consumer - ${project.version} + ${revision} org.springframework.cloud.fn redis-consumer - ${project.version} + ${revision} org.springframework.cloud.fn s3-consumer - ${project.version} + ${revision} org.springframework.cloud.fn sftp-consumer - ${project.version} + ${revision} org.springframework.cloud.fn tcp-consumer - ${project.version} + ${revision} org.springframework.cloud.fn twitter-consumer - ${project.version} + ${revision} org.springframework.cloud.fn wavefront-consumer - ${project.version} + ${revision} org.springframework.cloud.fn websocket-consumer - ${project.version} + ${revision} org.springframework.cloud.fn aggregator-function - ${project.version} + ${revision} org.springframework.cloud.fn filter-function - ${project.version} + ${revision} org.springframework.cloud.fn header-enricher-function - ${project.version} + ${revision} org.springframework.cloud.fn http-request-function - ${project.version} + ${revision} org.springframework.cloud.fn image-recognition-function - ${project.version} + ${revision} org.springframework.cloud.fn object-detection-function - ${project.version} + ${revision} org.springframework.cloud.fn payload-converter-function - ${project.version} + ${revision} org.springframework.cloud.fn semantic-segmentation-function - ${project.version} + ${revision} org.springframework.cloud.fn spel-function - ${project.version} + ${revision} org.springframework.cloud.fn splitter-function - ${project.version} + ${revision} org.springframework.cloud.fn task-launch-request-function - ${project.version} + ${revision} org.springframework.cloud.fn tasklauncher-function - ${project.version} + ${revision} org.springframework.cloud.fn twitter-function - ${project.version} + ${revision} org.springframework.cloud.fn function-test-support - ${project.version} + ${revision} test diff --git a/function/aggregator-function/pom.xml b/function/aggregator-function/pom.xml index 2577d59f..ca3b519a 100644 --- a/function/aggregator-function/pom.xml +++ b/function/aggregator-function/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - aggregator-function - 1.0.0-SNAPSHOT - aggregator-function - Spring Native Function for Aggregator org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + aggregator-function + aggregator-function + Spring Native Function for Aggregator + org.springframework.cloud.fn diff --git a/function/filter-function/pom.xml b/function/filter-function/pom.xml index 84f586a0..13a1cd02 100644 --- a/function/filter-function/pom.xml +++ b/function/filter-function/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - filter-function - 1.0.0-SNAPSHOT - filter-function - Spring Native Function for applying filter SpEL expressions org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + filter-function + filter-function + Spring Native Function for applying filter SpEL expressions + org.springframework.cloud.fn diff --git a/function/header-enricher-function/pom.xml b/function/header-enricher-function/pom.xml index b7db24e5..ed24c588 100644 --- a/function/header-enricher-function/pom.xml +++ b/function/header-enricher-function/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - header-enricher-function - 1.0.0-SNAPSHOT - header-enricher-function - Spring Native Function for applying message header enrichment org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + header-enricher-function + header-enricher-function + Spring Native Function for applying message header enrichment + org.springframework.cloud.fn diff --git a/function/http-request-function/pom.xml b/function/http-request-function/pom.xml index 6da28f67..34be1e1e 100644 --- a/function/http-request-function/pom.xml +++ b/function/http-request-function/pom.xml @@ -2,65 +2,45 @@ 4.0.0 - http-request-function - 1.0.0-SNAPSHOT - http-request-function - Spring Native Function for Submitting an HTTP request org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + http-request-function + http-request-function + Spring Native Function for Submitting an HTTP request + 4.6.0 + org.springframework.cloud.fn config-common ${project.version} - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework - spring-messaging - + org.springframework.boot spring-boot-starter-webflux + - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - + org.springframework + spring-messaging + com.squareup.okhttp3 mockwebserver test - - io.projectreactor - reactor-test - - - org.springframework.boot - spring-boot-configuration-processor - provided - + diff --git a/function/image-recognition-function/README.adoc b/function/image-recognition-function/README.adoc index bba8e93d..141b8b52 100644 --- a/function/image-recognition-function/README.adoc +++ b/function/image-recognition-function/README.adoc @@ -25,7 +25,7 @@ Add the `image-recognition` dependency to the pom (use the latest version availa org.springframework.cloud.fn image-recognition-function - ${spring-cloud-fn.version} + ${revision} ---- diff --git a/function/image-recognition-function/pom.xml b/function/image-recognition-function/pom.xml index 040ca28c..960011ac 100644 --- a/function/image-recognition-function/pom.xml +++ b/function/image-recognition-function/pom.xml @@ -2,31 +2,33 @@ 4.0.0 - image-recognition-function - 1.0.0-SNAPSHOT - image-recognition-function - Spring Native Function for Tensorflow Integration org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + image-recognition-function + image-recognition-function + Spring Native Function for Tensorflow Integration + 1.3.2 + org.springframework.cloud.fn tensorflow-common - ${spring-cloud-fn.version} + ${project.version} + + tensorflow-snapshots https://oss.sonatype.org/content/repositories/snapshots/ @@ -34,5 +36,7 @@ true + + diff --git a/function/object-detection-function/README.adoc b/function/object-detection-function/README.adoc index 3128ab1d..5df992ad 100644 --- a/function/object-detection-function/README.adoc +++ b/function/object-detection-function/README.adoc @@ -28,7 +28,7 @@ Add the `object-detection` dependency to the pom (use the latest version availab org.springframework.cloud.fn object-detection-function - ${spring-cloud-fn.version} + ${revision} ---- diff --git a/function/object-detection-function/pom.xml b/function/object-detection-function/pom.xml index b0a27c26..e69fcea6 100644 --- a/function/object-detection-function/pom.xml +++ b/function/object-detection-function/pom.xml @@ -2,30 +2,25 @@ 4.0.0 - object-detection-function - 1.0.0-SNAPSHOT - object-detection-function - Spring Native Function for Tensorflow Integration org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + object-detection-function + object-detection-function + Spring Native Function for Tensorflow Integration + + org.springframework.cloud.fn tensorflow-common - ${spring-cloud-fn.version} + ${project.version} - - - - - diff --git a/function/payload-converter-function/pom.xml b/function/payload-converter-function/pom.xml index fcb94743..ed22c817 100644 --- a/function/payload-converter-function/pom.xml +++ b/function/payload-converter-function/pom.xml @@ -3,35 +3,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - payload-converter-function - 1.0.0-SNAPSHOT - payload-converter-function - Utility message conversion functions org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + payload-converter-function + payload-converter-function + Utility message conversion functions + + org.springframework spring-messaging - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - diff --git a/function/pom.xml b/function/pom.xml new file mode 100644 index 00000000..f4ee2e75 --- /dev/null +++ b/function/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + + org.springframework.cloud.fn + java-functions-parent + ${revision} + + + java-functions-function-parent + java-functions-function-parent + Pivotal Java Functions Function Parent + pom + + + + aggregator-function + filter-function + header-enricher-function + http-request-function + spel-function + payload-converter-function + splitter-function + tasklauncher-function + task-launch-request-function + twitter-function + image-recognition-function + object-detection-function + semantic-segmentation-function + + + + diff --git a/function/semantic-segmentation-function/README.adoc b/function/semantic-segmentation-function/README.adoc index 415ca928..6876b5a6 100644 --- a/function/semantic-segmentation-function/README.adoc +++ b/function/semantic-segmentation-function/README.adoc @@ -26,13 +26,13 @@ Add the `semantic-segmentation` dependency to your pom (_use the latest version org.springframework.cloud.fn semantic-segmentation-function - ${spring-cloud-fn.version} + ${revision} org.springframework.cloud.fn object-detection-function - ${spring-cloud-fn.version} + ${revision} ---- diff --git a/function/semantic-segmentation-function/pom.xml b/function/semantic-segmentation-function/pom.xml index 95c02c99..a810e811 100644 --- a/function/semantic-segmentation-function/pom.xml +++ b/function/semantic-segmentation-function/pom.xml @@ -2,31 +2,33 @@ 4.0.0 - semantic-segmentation-function - 1.0.0-SNAPSHOT - semantic-segmentation-function - Spring Native Function for Tensorflow semantic-segmentation integration org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + semantic-segmentation-function + semantic-segmentation-function + Spring Native Function for Tensorflow semantic-segmentation integration + 1.3.2 + org.springframework.cloud.fn tensorflow-common - ${spring-cloud-fn.version} + ${project.version} + + tensorflow-snapshots https://oss.sonatype.org/content/repositories/snapshots/ @@ -34,5 +36,7 @@ true + + diff --git a/function/spel-function/pom.xml b/function/spel-function/pom.xml index 7e726ee3..36880c11 100644 --- a/function/spel-function/pom.xml +++ b/function/spel-function/pom.xml @@ -2,45 +2,25 @@ 4.0.0 - spel-function - 1.0.0-SNAPSHOT - spel-function - Spring Native Function for applying SpEL expressions org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + spel-function + spel-function + Spring Native Function for applying SpEL expressions + + org.springframework.cloud.fn payload-converter-function ${project.version} - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - org.springframework.boot - spring-boot-configuration-processor - provided - diff --git a/function/splitter-function/pom.xml b/function/splitter-function/pom.xml index 4962cf5d..3a1d5234 100644 --- a/function/splitter-function/pom.xml +++ b/function/splitter-function/pom.xml @@ -2,49 +2,24 @@ 4.0.0 - splitter-function - 1.0.0-SNAPSHOT - splitter-function - Spring Native Function for Splitter org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + splitter-function + splitter-function + Spring Native Function for Splitter + - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - org.springframework.integration spring-integration-file - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - org.springframework.boot - spring-boot-configuration-processor - provided - diff --git a/function/task-launch-request-function/pom.xml b/function/task-launch-request-function/pom.xml index 5a85b45c..b1901583 100644 --- a/function/task-launch-request-function/pom.xml +++ b/function/task-launch-request-function/pom.xml @@ -2,15 +2,14 @@ + 4.0.0 + org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} - 4.0.0 - task-launch-request-function task-launch-request-function diff --git a/function/tasklauncher-function/pom.xml b/function/tasklauncher-function/pom.xml index f78f3253..39849c06 100644 --- a/function/tasklauncher-function/pom.xml +++ b/function/tasklauncher-function/pom.xml @@ -2,28 +2,23 @@ 4.0.0 - tasklauncher-function - 1.0.0-SNAPSHOT - tasklauncher-function - Spring Native Function for applying filter SpEL expressions org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + tasklauncher-function + tasklauncher-function + Spring Native Function for applying filter SpEL expressions + 2.5.1.RELEASE - - org.springframework.boot - spring-boot-configuration-processor - provided - + org.springframework.cloud spring-cloud-dataflow-rest-client @@ -39,17 +34,7 @@ - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - + diff --git a/function/twitter-function/pom.xml b/function/twitter-function/pom.xml index efd4ef21..bb645956 100644 --- a/function/twitter-function/pom.xml +++ b/function/twitter-function/pom.xml @@ -2,46 +2,25 @@ 4.0.0 - twitter-function - 1.0.0-SNAPSHOT - twitter-function - twitter functions org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-function-parent + ${revision} + twitter-function + twitter-function + twitter functions + + org.springframework.cloud.fn twitter-common ${project.version} - - org.springframework.boot - spring-boot-starter-integration - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - org.springframework.boot - spring-boot-configuration-processor - provided - org.mock-server mockserver-netty @@ -54,6 +33,7 @@ 5.10 test + diff --git a/pom.xml b/pom.xml index 3daebcda..869e8aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,340 +1,63 @@ 4.0.0 + + + org.springframework.cloud.stream.app + stream-applications + 3.0.0-SNAPSHOT + + org.springframework.cloud.fn java-functions-parent - 1.0.0-SNAPSHOT + ${revision} java-functions-parent Pivotal Java Functions Parent pom - 1.8 - 3.1.1 - 3.2.1 - 2.22.2 - UTF-8 - UTF-8 - ${java.version} - ${java.version} - 3.0.1 - 3.1.0 - false - true - true - true - 8.29 - https://raw.githubusercontent.com/spring-cloud/stream-applications/master/etc/checkstyle - - ${checkstyle.location}/checkstyle-suppressions.xml - - - ${checkstyle.location}/nohttp-checkstyle.xml - - - ${checkstyle.location}/checkstyle-suppressions.xml - - 0.0.2.RELEASE - true - 0.0.7 + 1.0.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-json + + + org.springframework.boot + spring-boot-starter-integration + + + + + org.springframework.integration + spring-integration-test + test + + + + org.awaitility + awaitility + test + + + junit + junit + + + + + + - common/aws-s3-common - common/config-common - common/file-common - common/ftp-common - common/function-test-support - common/geode-common - common/metadata-store-common - common/mqtt-common - common/tcp-common - common/twitter-common - common/tensorflow-common - common/cdc-debezium-common - common/cdc-debezium-boot-starter - - consumer/cassandra-consumer - consumer/elasticsearch-consumer - consumer/analytics-consumer - consumer/file-consumer - consumer/ftp-consumer - consumer/geode-consumer - consumer/jdbc-consumer - consumer/log-consumer - consumer/mongodb-consumer - consumer/mqtt-consumer - consumer/rabbit-consumer - consumer/redis-consumer - consumer/sftp-consumer - consumer/tcp-consumer - consumer/websocket-consumer - consumer/s3-consumer - consumer/twitter-consumer - consumer/wavefront-consumer - consumer/rsocket-consumer - - function/aggregator-function - function/filter-function - function/header-enricher-function - function/http-request-function - function/spel-function - function/payload-converter-function - function/splitter-function - function/tasklauncher-function - function/task-launch-request-function - function/twitter-function - function/image-recognition-function - function/object-detection-function - function/semantic-segmentation-function - - supplier/file-supplier - supplier/ftp-supplier - supplier/geode-supplier - supplier/http-supplier - supplier/jdbc-supplier - supplier/jms-supplier - supplier/mail-supplier - supplier/mongodb-supplier - supplier/mqtt-supplier - supplier/sftp-supplier - supplier/tcp-supplier - supplier/time-supplier - supplier/rabbit-supplier - supplier/websocket-supplier - supplier/s3-supplier - supplier/twitter-supplier - supplier/cdc-debezium-supplier - supplier/syslog-supplier - - spring-functions-parent + common + consumer + function + supplier function-dependencies - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2020 the original author or authors. - - 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. - - - - scm:git:git://github.com/pivotal/java-functions.git - scm:git:ssh://git@github.com/pivotal/java-functions.git - https://github.com/pivotal/java-functions - - - - - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - javadoc - package - - jar - - - - - true - - - - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - package - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - **/*Tests.java - **/*Test.java - - - **/Abstract*.java - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - - com.puppycrawl.tools - checkstyle - ${puppycrawl-tools-checkstyle.version} - - - io.spring.javaformat - spring-javaformat-checkstyle - ${spring-javaformat-checkstyle.version} - - - io.spring.nohttp - nohttp-checkstyle - ${nohttp-checkstyle.version} - - - - - checkstyle-validation - validate - true - - ${disable.checks} - ${checkstyle.location}/checkstyle.xml - ${checkstyle.location}/checkstyle-header.txt - - checkstyle.build.directory=${project.build.directory} - checkstyle.suppressions.file=${checkstyle.suppressions.file} - checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file} - - true - - ${maven-checkstyle-plugin.includeTestSourceDirectory} - - ${maven-checkstyle-plugin.failsOnError} - - - ${maven-checkstyle-plugin.failOnViolation} - - - - check - - - - no-http-checkstyle-validation - validate - true - - ${disable.nohttp.checks} - ${checkstyle.nohttp.file} - **/* - **/.idea/**/*,**/.git/**/*,**/target/**/*,**/*.log - ./ - - - check - - - - - - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - - - - - milestone - - - repo.spring.io - Spring Milestone Repository - https://repo.spring.io/libs-milestone-local - - - - - central - - - - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - - diff --git a/spring-functions-parent/pom.xml b/spring-functions-parent/pom.xml index 3c196edc..0b17bc32 100644 --- a/spring-functions-parent/pom.xml +++ b/spring-functions-parent/pom.xml @@ -2,14 +2,14 @@ - - java-functions-parent - org.springframework.cloud.fn - 1.0.0-SNAPSHOT - .. - 4.0.0 + + org.springframework.cloud.fn + java-functions-parent + ${revision} + + spring-functions-parent 1.0.0-SNAPSHOT pom @@ -20,30 +20,5 @@ ${project.version} 5.3.3.BUILD-SNAPSHOT - - - - org.springframework.integration - spring-integration-bom - ${spring-integration-dependencies.version} - import - pom - - - org.springframework.boot - spring-boot-starter-parent - ${spring-boot.version} - import - pom - - - org.springframework.cloud - spring-cloud-function-dependencies - ${spring-cloud-function.version} - import - pom - - - diff --git a/supplier/cdc-debezium-supplier/pom.xml b/supplier/cdc-debezium-supplier/pom.xml index 192fabcf..ef152fde 100644 --- a/supplier/cdc-debezium-supplier/pom.xml +++ b/supplier/cdc-debezium-supplier/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - cdc-debezium-supplier - 1.0.0-SNAPSHOT - cdc-debezium-supplier - CDC Debezium Suppliers org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + cdc-debezium-supplier + cdc-debezium-supplier + CDC Debezium Suppliers + 1.2.1.Final 8.0.13 diff --git a/supplier/file-supplier/pom.xml b/supplier/file-supplier/pom.xml index 0bd10578..e8ad8c1b 100644 --- a/supplier/file-supplier/pom.xml +++ b/supplier/file-supplier/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - file-supplier - 1.0.0-SNAPSHOT - file-supplier - file supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + file-supplier + file-supplier + file supplier + org.springframework.integration diff --git a/supplier/ftp-supplier/pom.xml b/supplier/ftp-supplier/pom.xml index e509e702..d604caf8 100644 --- a/supplier/ftp-supplier/pom.xml +++ b/supplier/ftp-supplier/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - ftp-supplier - 1.0.0-SNAPSHOT - ftp-supplier - ftp supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + ftp-supplier + ftp-supplier + ftp supplier + org.springframework.integration diff --git a/supplier/geode-supplier/pom.xml b/supplier/geode-supplier/pom.xml index ea76900c..6ffba400 100644 --- a/supplier/geode-supplier/pom.xml +++ b/supplier/geode-supplier/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - geode-supplier - 1.0.0-SNAPSHOT - geode-supplier - geode supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + + geode-supplier + geode-supplier + geode supplier + org.springframework.boot @@ -27,13 +27,13 @@ org.springframework.cloud.fn geode-common - ${spring-cloud-fn.version} + ${project.version} org.springframework.cloud.fn config-common - ${spring-cloud-fn.version} + ${project.version} @@ -56,7 +56,7 @@ org.springframework.cloud.fn function-test-support - ${spring-cloud-fn.version} + ${project.version} test diff --git a/supplier/http-supplier/pom.xml b/supplier/http-supplier/pom.xml index 90e139a0..1f5f26c6 100644 --- a/supplier/http-supplier/pom.xml +++ b/supplier/http-supplier/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - http-supplier - 1.0.0-SNAPSHOT - http-supplier - HTTP Supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + http-supplier + http-supplier + HTTP Supplier + org.springframework.boot diff --git a/supplier/jdbc-supplier/pom.xml b/supplier/jdbc-supplier/pom.xml index 1b45698d..02588c47 100644 --- a/supplier/jdbc-supplier/pom.xml +++ b/supplier/jdbc-supplier/pom.xml @@ -2,18 +2,17 @@ 4.0.0 - jdbc-supplier - 1.0.0-SNAPSHOT - jdbc-supplier - JDBC supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + jdbc-supplier + jdbc-supplier + JDBC supplier + org.springframework.integration diff --git a/supplier/jms-supplier/pom.xml b/supplier/jms-supplier/pom.xml index b3eeda14..26ff1f88 100644 --- a/supplier/jms-supplier/pom.xml +++ b/supplier/jms-supplier/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - jms-supplier - 1.0.0-SNAPSHOT - jms-supplier - jms supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + jms-supplier + jms-supplier + jms supplier + org.springframework.boot diff --git a/supplier/mail-supplier/pom.xml b/supplier/mail-supplier/pom.xml index 0d814b5b..23ee16d6 100644 --- a/supplier/mail-supplier/pom.xml +++ b/supplier/mail-supplier/pom.xml @@ -1,18 +1,17 @@ 4.0.0 - mail-supplier - 1.0.0-SNAPSHOT - mail-supplier - Mail Supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + mail-supplier + mail-supplier + Mail Supplier + org.springframework.integration diff --git a/supplier/mongodb-supplier/pom.xml b/supplier/mongodb-supplier/pom.xml index cefdd89b..1df143fc 100644 --- a/supplier/mongodb-supplier/pom.xml +++ b/supplier/mongodb-supplier/pom.xml @@ -2,67 +2,47 @@ 4.0.0 - mongodb-supplier - 1.0.0-SNAPSHOT - mongodb-supplier - Mongo DB supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + mongodb-supplier + mongodb-supplier + Mongo DB supplier + + org.springframework.integration spring-integration-mongodb + org.mongodb mongodb-driver-sync - - org.springframework.boot - spring-boot-starter-validation - + org.springframework.cloud spring-cloud-function-context ${spring-cloud-function.version} + org.springframework.cloud.fn splitter-function ${project.version} - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - io.projectreactor - reactor-test - test - + de.flapdoodle.embed de.flapdoodle.embed.mongo test - - org.springframework.boot - spring-boot-configuration-processor - provided - + diff --git a/supplier/mqtt-supplier/pom.xml b/supplier/mqtt-supplier/pom.xml index 1749f5d6..f5209f6d 100644 --- a/supplier/mqtt-supplier/pom.xml +++ b/supplier/mqtt-supplier/pom.xml @@ -1,53 +1,32 @@ 4.0.0 - mqtt-supplier - 1.0.0-SNAPSHOT - mqtt-supplier - mqtt supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + mqtt-supplier + mqtt-supplier + mqtt supplier + + org.springframework.cloud.fn mqtt-common - ${project.version} - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test + ${revision} + org.testcontainers testcontainers - 1.9.1 + ${test-containers.version} test + diff --git a/supplier/pom.xml b/supplier/pom.xml new file mode 100644 index 00000000..f1cb4054 --- /dev/null +++ b/supplier/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + + org.springframework.cloud.fn + java-functions-parent + ${revision} + + + java-functions-supplier-parent + java-functions-supplier-parent + Pivotal Java Functions Supplier Parent + pom + + + + file-supplier + ftp-supplier + geode-supplier + http-supplier + jdbc-supplier + jms-supplier + mail-supplier + mongodb-supplier + mqtt-supplier + sftp-supplier + tcp-supplier + time-supplier + rabbit-supplier + websocket-supplier + s3-supplier + twitter-supplier + cdc-debezium-supplier + syslog-supplier + + + + diff --git a/supplier/rabbit-supplier/pom.xml b/supplier/rabbit-supplier/pom.xml index c375a3b1..6f4a4260 100644 --- a/supplier/rabbit-supplier/pom.xml +++ b/supplier/rabbit-supplier/pom.xml @@ -1,23 +1,24 @@ 4.0.0 - rabbit-supplier - 1.0.0-SNAPSHOT - rabbit-supplier - Rabbit supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + rabbit-supplier + rabbit-supplier + Rabbit supplier + + org.springframework.integration spring-integration-amqp + org.springframework.boot spring-boot-starter-amqp @@ -26,30 +27,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-validation - - - javax.validation - validation-api - - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - diff --git a/supplier/s3-supplier/pom.xml b/supplier/s3-supplier/pom.xml index 54203f31..4a45a5d6 100644 --- a/supplier/s3-supplier/pom.xml +++ b/supplier/s3-supplier/pom.xml @@ -1,58 +1,35 @@ 4.0.0 - s3-supplier - 1.0.0-SNAPSHOT - s3-supplier - s3 supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + s3-supplier + s3-supplier + s3 supplier + + org.springframework.cloud.fn aws-s3-common - ${project.version} + ${revision} org.springframework.cloud.fn file-common - ${project.version} - - - org.springframework.boot - spring-boot-starter-validation + ${revision} org.springframework.cloud.fn metadata-store-common - ${project.version} - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.integration - spring-integration-test - test + ${revision} + diff --git a/supplier/sftp-supplier/pom.xml b/supplier/sftp-supplier/pom.xml index 16a2ebef..6aef11e9 100644 --- a/supplier/sftp-supplier/pom.xml +++ b/supplier/sftp-supplier/pom.xml @@ -1,76 +1,57 @@ 4.0.0 - sftp-supplier - 1.0.0-SNAPSHOT - sftp-supplier - sftp supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + sftp-supplier + sftp-supplier + sftp supplier + - - org.springframework.integration - spring-integration-sftp - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.cloud.fn - file-common - ${project.version} - - - org.springframework.cloud.fn - ftp-common - ${project.version} - - - org.springframework.cloud.fn - metadata-store-common - ${project.version} - + org.springframework.boot spring-boot-starter-json true - - org.springframework.boot - spring-boot-starter-validation - org.springframework.boot spring-boot-starter-logging + - org.springframework.boot - spring-boot-configuration-processor - provided + org.springframework.integration + spring-integration-sftp + - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test + org.springframework.cloud.fn + file-common + ${revision} + + org.springframework.cloud.fn + ftp-common + ${revision} + + + org.springframework.cloud.fn + metadata-store-common + ${revision} + + org.springframework.cloud.fn function-test-support - ${project.version} + ${revision} test + diff --git a/supplier/syslog-supplier/pom.xml b/supplier/syslog-supplier/pom.xml index f3653f73..2a712b25 100644 --- a/supplier/syslog-supplier/pom.xml +++ b/supplier/syslog-supplier/pom.xml @@ -1,50 +1,29 @@ 4.0.0 - syslog-supplier - 1.0.0-SNAPSHOT - syslog-supplier - syslog supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + syslog-supplier + syslog-supplier + syslog supplier + + org.springframework.integration spring-integration-syslog - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + org.springframework.integration spring-integration-test-support - - io.projectreactor - reactor-test - test - + diff --git a/supplier/tcp-supplier/pom.xml b/supplier/tcp-supplier/pom.xml index 0a9ebab9..8ff18847 100644 --- a/supplier/tcp-supplier/pom.xml +++ b/supplier/tcp-supplier/pom.xml @@ -1,52 +1,25 @@ 4.0.0 - tcp-supplier - 1.0.0-SNAPSHOT - tcp-supplier - tcp supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + tcp-supplier + tcp-supplier + tcp supplier + + org.springframework.cloud.fn tcp-common - ${project.version} - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.integration - spring-integration-test - test + ${revision} + diff --git a/supplier/time-supplier/pom.xml b/supplier/time-supplier/pom.xml index 4bcdf8d3..5b8947ef 100644 --- a/supplier/time-supplier/pom.xml +++ b/supplier/time-supplier/pom.xml @@ -2,45 +2,29 @@ 4.0.0 - time-supplier - 1.0.0-SNAPSHOT - time-supplier - time supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + time-supplier + time-supplier + time supplier + + org.springframework.boot spring-boot-starter + org.apache.commons commons-lang3 - - org.hibernate.validator - hibernate-validator - true - - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/supplier/twitter-supplier/pom.xml b/supplier/twitter-supplier/pom.xml index b9fd36c1..902f171d 100644 --- a/supplier/twitter-supplier/pom.xml +++ b/supplier/twitter-supplier/pom.xml @@ -1,29 +1,25 @@ 4.0.0 - twitter-supplier - 1.0.0-SNAPSHOT - twitter-supplier - twitter suppliers org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + twitter-supplier + twitter-supplier + twitter suppliers + + org.springframework.cloud.fn twitter-common - ${project.version} + ${revision} - - org.springframework.boot - spring-boot-starter-integration - org.springframework.integration spring-integration-jms @@ -33,35 +29,12 @@ javax.jms-api provided - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - + org.apache.activemq activemq-broker test - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - org.springframework.integration - spring-integration-test - test - org.mock-server @@ -77,4 +50,5 @@ + diff --git a/supplier/websocket-supplier/pom.xml b/supplier/websocket-supplier/pom.xml index 5337adcf..b340ed78 100644 --- a/supplier/websocket-supplier/pom.xml +++ b/supplier/websocket-supplier/pom.xml @@ -1,56 +1,36 @@ 4.0.0 - websocket-supplier - 1.0.0-SNAPSHOT - websocket-supplier - websocket supplier org.springframework.cloud.fn - spring-functions-parent - 1.0.0-SNAPSHOT - ../../spring-functions-parent + java-functions-supplier-parent + ${revision} + websocket-supplier + websocket-supplier + websocket supplier + + org.springframework.integration spring-integration-websocket - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-test - test - + org.springframework.boot spring-boot-starter-web test + org.springframework.boot spring-boot-starter-security test - - io.projectreactor - reactor-test - test - +