Skip to content

Commit 3b7da89

Browse files
committed
Fix Javadoc build.
Remove package-info for package without sources. Remove ci profile from initial build steps to avoid duplicate tasks. Remove unused asciidoctor plugin. See #1742
1 parent 93b22db commit 3b7da89

File tree

3 files changed

+3
-34
lines changed

3 files changed

+3
-34
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
steps {
4242
script {
4343
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
44-
sh "PROFILE=ci,all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
44+
sh "PROFILE=all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
4545
sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
4646
}
4747
}
@@ -71,7 +71,7 @@ pipeline {
7171
steps {
7272
script {
7373
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
74-
sh "PROFILE=ci,all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
74+
sh "PROFILE=all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
7575
sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
7676
}
7777
}

spring-data-r2dbc/pom.xml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
<link>
360360
https://docs.spring.io/spring-data/commons/docs/current/api/
361361
</link>
362-
<link>https://docs.oracle.com/javase/8/docs/api/</link>
362+
<link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
363363
<link>https://r2dbc.io/spec/0.9.1.RELEASE/api/</link>
364364
</links>
365365
</configuration>
@@ -388,31 +388,6 @@
388388
<artifactId>maven-assembly-plugin</artifactId>
389389
</plugin>
390390

391-
<plugin>
392-
<groupId>org.asciidoctor</groupId>
393-
<artifactId>asciidoctor-maven-plugin</artifactId>
394-
<configuration>
395-
<sourceDirectory>${project.root}/src/main/asciidoc</sourceDirectory>
396-
<sourceDocumentName>index.adoc</sourceDocumentName>
397-
<doctype>book</doctype>
398-
<attributes>
399-
<version>${project.version}</version>
400-
<projectName>${project.name}</projectName>
401-
<projectVersion>${project.version}</projectVersion>
402-
<aspectjVersion>${aspectj}</aspectjVersion>
403-
<querydslVersion>${querydsl}</querydslVersion>
404-
<springVersion>${spring}</springVersion>
405-
<r2dbcVersion>${r2dbc-releasetrain.version}</r2dbcVersion>
406-
<reactiveStreamsVersion>${reactive-streams.version}
407-
</reactiveStreamsVersion>
408-
<releasetrainVersion>${releasetrain}</releasetrainVersion>
409-
<allow-uri-read>true</allow-uri-read>
410-
<toclevels>3</toclevels>
411-
<numbered>true</numbered>
412-
</attributes>
413-
</configuration>
414-
</plugin>
415-
416391
<plugin>
417392
<groupId>org.codehaus.mojo</groupId>
418393
<artifactId>flatten-maven-plugin</artifactId>

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/package-info.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)