diff --git a/.gitignore b/.gitignore index f5712a10..71dcc813 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,8 @@ asciidoctor.css .#* *# target/ -build/ +#release-train/ +build bin/ _site/ .classpath @@ -25,3 +26,4 @@ dump.rdb coverage-error.log .apt_generated aws.credentials.properties +.flattened-pom.xml diff --git a/applications/pom.xml b/applications/pom.xml index e449958d..b6cc0c3b 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -13,7 +13,6 @@ source sink processor - stream-applications-build diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml b/applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml index 058617d2..70a4c3cc 100644 --- a/applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-composite-function-support/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud.stream.app stream-applications-core - 3.0.0-SNAPSHOT + ${revision} ../.. 4.0.0 diff --git a/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml b/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml index ff15c2d2..8cd5df55 100644 --- a/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml @@ -5,7 +5,7 @@ stream-applications-core org.springframework.cloud.stream.app - 3.0.0-SNAPSHOT + ${revision} ../.. diff --git a/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml b/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml index 30a54389..25fdc63b 100644 --- a/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml @@ -4,7 +4,7 @@ stream-applications-core org.springframework.cloud.stream.app - 3.0.0-SNAPSHOT + ${revision} ../.. 4.0.0 diff --git a/applications/stream-applications-core/common/stream-applications-security-common/pom.xml b/applications/stream-applications-core/common/stream-applications-security-common/pom.xml index 566aee51..bd488120 100644 --- a/applications/stream-applications-core/common/stream-applications-security-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-security-common/pom.xml @@ -5,7 +5,7 @@ stream-applications-core org.springframework.cloud.stream.app - 3.0.0-SNAPSHOT + ${revision} ../.. 4.0.0 diff --git a/applications/stream-applications-core/common/stream-applications-test-support/pom.xml b/applications/stream-applications-core/common/stream-applications-test-support/pom.xml index 18634ec9..dfd8e29d 100644 --- a/applications/stream-applications-core/common/stream-applications-test-support/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-test-support/pom.xml @@ -4,7 +4,7 @@ stream-applications-core org.springframework.cloud.stream.app - 3.0.0-SNAPSHOT + ${revision} ../.. 4.0.0 diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml index dd32472e..7fd859e5 100644 --- a/applications/stream-applications-core/pom.xml +++ b/applications/stream-applications-core/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud.stream.app stream-applications-core - 3.0.0-SNAPSHOT + ${revision} stream-applications-core Stream Applications Core Parent pom @@ -17,6 +17,7 @@ + 3.0.0-SNAPSHOT springcloud/baseimage:1.0.0 1.8 2.3.4.RELEASE @@ -472,6 +473,31 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.2.5 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + maven-javadoc-plugin ${maven-javadoc-plugin.version} diff --git a/pom.xml b/pom.xml index b653fa5f..80e5b6e7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,5 +12,6 @@ functions applications + release-train diff --git a/release-train/pom.xml b/release-train/pom.xml new file mode 100644 index 00000000..7c964130 --- /dev/null +++ b/release-train/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + org.springframework.cloud.stream.app + release-train + 3.0.0-SNAPSHOT + release train + Release train for stream applications + pom + + + stream-applications-build + + + diff --git a/applications/stream-applications-build/CODE_OF_CONDUCT.adoc b/release-train/stream-applications-build/CODE_OF_CONDUCT.adoc similarity index 100% rename from applications/stream-applications-build/CODE_OF_CONDUCT.adoc rename to release-train/stream-applications-build/CODE_OF_CONDUCT.adoc diff --git a/applications/stream-applications-build/LICENSE b/release-train/stream-applications-build/LICENSE similarity index 100% rename from applications/stream-applications-build/LICENSE rename to release-train/stream-applications-build/LICENSE diff --git a/applications/stream-applications-build/pom.xml b/release-train/stream-applications-build/pom.xml similarity index 98% rename from applications/stream-applications-build/pom.xml rename to release-train/stream-applications-build/pom.xml index 2a80d61d..1bc748c6 100644 --- a/applications/stream-applications-build/pom.xml +++ b/release-train/stream-applications-build/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud.stream.app stream-applications-core 3.0.0-SNAPSHOT - ../stream-applications-core + ../../applications/stream-applications-core/pom.xml diff --git a/applications/stream-applications-build/release-tools/core-tag-next-version.sh b/release-train/stream-applications-build/release-tools/core-tag-next-version.sh similarity index 100% rename from applications/stream-applications-build/release-tools/core-tag-next-version.sh rename to release-train/stream-applications-build/release-tools/core-tag-next-version.sh diff --git a/applications/stream-applications-build/release-tools/core-version-check.sh b/release-train/stream-applications-build/release-tools/core-version-check.sh similarity index 100% rename from applications/stream-applications-build/release-tools/core-version-check.sh rename to release-train/stream-applications-build/release-tools/core-version-check.sh diff --git a/applications/stream-applications-build/release-tools/core-version-upgrade.sh b/release-train/stream-applications-build/release-tools/core-version-upgrade.sh similarity index 100% rename from applications/stream-applications-build/release-tools/core-version-upgrade.sh rename to release-train/stream-applications-build/release-tools/core-version-upgrade.sh diff --git a/applications/stream-applications-build/stream-applications-descriptor/pom.xml b/release-train/stream-applications-build/stream-applications-descriptor/pom.xml similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/pom.xml rename to release-train/stream-applications-build/stream-applications-descriptor/pom.xml diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties b/release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties rename to release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties b/release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties rename to release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties b/release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties rename to release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties b/release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties rename to release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties b/release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties rename to release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties b/release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties similarity index 100% rename from applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties rename to release-train/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties diff --git a/applications/stream-applications-build/stream-applications-docs/pom.xml b/release-train/stream-applications-build/stream-applications-docs/pom.xml similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/pom.xml rename to release-train/stream-applications-build/stream-applications-docs/pom.xml diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/.gitignore b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/.gitignore similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/.gitignore rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/.gitignore diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/Guardfile b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/Guardfile similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/Guardfile rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/Guardfile diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/appendix.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/appendix.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/appendix.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/appendix.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/contributing.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/contributing.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/contributing.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/contributing.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/logo.png b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/logo.png similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/logo.png rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/logo.png diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index-docinfo.xml b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/index-docinfo.xml similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index-docinfo.xml rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/index-docinfo.xml diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/index.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/index.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/overview.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/overview.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/overview.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/overview.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc b/release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc rename to release-train/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/javadoc/spring-javadoc.css b/release-train/stream-applications-build/stream-applications-docs/src/main/javadoc/spring-javadoc.css similarity index 100% rename from applications/stream-applications-build/stream-applications-docs/src/main/javadoc/spring-javadoc.css rename to release-train/stream-applications-build/stream-applications-docs/src/main/javadoc/spring-javadoc.css