diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 76f3989a..02e711f4 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -556,7 +556,7 @@ jobs: pushd stream-applications > /dev/null echo "::notice ::building - stream-applications-release-train" set -e - $ROOT_DIR/build-folder.sh stream-applications-release-train "install verify deploy" + $ROOT_DIR/build-folder.sh stream-applications-release-train "install deploy" set +e echo "::notice ::stream-applications-release-train build completed" popd > /dev/null diff --git a/build-folder.sh b/build-folder.sh index fe04f2f5..6b3655e8 100755 --- a/build-folder.sh +++ b/build-folder.sh @@ -21,7 +21,7 @@ function check_env() { } if [ "$VERBOSE" = "true" ]; then - MAVEN_OPTS="-D" + MAVEN_OPTS="-X" elif [ "$VERBOSE" = "false" ]; then MAVEN_OPTS="-q" fi diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index dcd3b8fe..943f1eed 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -12,7 +12,7 @@ 17 - 3.3.1 + 3.4.1 3.2.1 3.0.0-M7 UTF-8 diff --git a/stream-applications-release-train/stream-applications-docs/libs/spring-doc-resources-0.2.5.zip b/stream-applications-release-train/stream-applications-docs/libs/spring-doc-resources-0.2.5.zip new file mode 100644 index 00000000..b1ff6026 Binary files /dev/null and b/stream-applications-release-train/stream-applications-docs/libs/spring-doc-resources-0.2.5.zip differ diff --git a/stream-applications-release-train/stream-applications-docs/pom.xml b/stream-applications-release-train/stream-applications-docs/pom.xml index 1b129645..8f82c127 100644 --- a/stream-applications-release-train/stream-applications-docs/pom.xml +++ b/stream-applications-release-train/stream-applications-docs/pom.xml @@ -22,13 +22,6 @@ - - io.spring.docresources - spring-doc-resources - ${docs.resources.version} - zip - true - @@ -359,6 +352,7 @@ org.apache.maven.plugins maven-javadoc-plugin + ${maven-javadoc-plugin.version} attach-javadocs @@ -369,11 +363,12 @@ true - org.springframework.cloud.fn:* - + org.springframework.cloud.stream.app:* + org.springframework.cloud.fn:* false true + none ${basedir}/src/main/javadoc/spring-javadoc.css @@ -389,6 +384,7 @@ org.apache.maven.plugins maven-dependency-plugin + 3.3.0 unpack-doc-resources @@ -405,6 +401,16 @@ + + + io.spring.docresources + spring-doc-resources + ${docs.resources.version} + zip + system + ${project.basedir}/libs/spring-doc-resources-0.2.5.zip + + org.apache.maven.plugins @@ -432,12 +438,12 @@ org.asciidoctor asciidoctor-maven-plugin - 2.1.0 + 2.2.2 org.asciidoctor asciidoctorj-pdf - 1.5.3 + 2.3.4