Updated javadoc options in release-train.

This commit is contained in:
Corneil du Plessis
2023-02-06 13:29:34 +02:00
parent 2e8e7bf4f6
commit f796bbdcbb
5 changed files with 20 additions and 14 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -12,7 +12,7 @@
<properties>
<java.version>17</java.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@@ -22,13 +22,6 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>io.spring.docresources</groupId>
<artifactId>spring-doc-resources</artifactId>
<version>${docs.resources.version}</version>
<type>zip</type>
<optional>true</optional>
</dependency>
<!-- Any modules whose javadocs need to be published must be listed here.
Modules with @ConfigurationProperties.
-->
@@ -359,6 +352,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -369,11 +363,12 @@
<configuration>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>org.springframework.cloud.fn:*
</dependencySourceInclude>
<dependencySourceInclude>org.springframework.cloud.stream.app:*</dependencySourceInclude>
<dependencySourceInclude>org.springframework.cloud.fn:*</dependencySourceInclude>
</dependencySourceIncludes>
<attach>false</attach>
<quiet>true</quiet>
<doclint>none</doclint>
<stylesheetfile>${basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
<links>
<link>
@@ -389,6 +384,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>unpack-doc-resources</id>
@@ -405,6 +401,16 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>io.spring.docresources</groupId>
<artifactId>spring-doc-resources</artifactId>
<version>${docs.resources.version}</version>
<type>zip</type>
<scope>system</scope>
<systemPath>${project.basedir}/libs/spring-doc-resources-0.2.5.zip</systemPath>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -432,12 +438,12 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>2.1.0</version>
<version>2.2.2</version>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>1.5.3</version>
<version>2.3.4</version>
</dependency>
</dependencies>
<executions>