From 3b7da898a7090d9e7de042e6f35161f4972cca61 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 20 Feb 2024 09:32:23 +0100
Subject: [PATCH] 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
---
 Jenkinsfile                                   |  4 +--
 spring-data-r2dbc/pom.xml                     | 27 +------------------
 .../data/r2dbc/package-info.java              |  6 -----
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/package-info.java

diff --git a/Jenkinsfile b/Jenkinsfile
index 3de9bef46..88625140b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
 			steps {
 				script {
 					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-						sh "PROFILE=ci,all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+						sh "PROFILE=all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
 						sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
 					}
 				}
@@ -71,7 +71,7 @@ pipeline {
 					steps {
 						script {
 							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=ci,all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
+								sh "PROFILE=all-dbs JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
 								sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
 							}
 						}
diff --git a/spring-data-r2dbc/pom.xml b/spring-data-r2dbc/pom.xml
index 861873bad..f0e70d26e 100644
--- a/spring-data-r2dbc/pom.xml
+++ b/spring-data-r2dbc/pom.xml
@@ -359,7 +359,7 @@
 						<link>
 							https://docs.spring.io/spring-data/commons/docs/current/api/
 						</link>
-						<link>https://docs.oracle.com/javase/8/docs/api/</link>
+						<link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
 						<link>https://r2dbc.io/spec/0.9.1.RELEASE/api/</link>
 					</links>
 				</configuration>
@@ -388,31 +388,6 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
 
-			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<configuration>
-					<sourceDirectory>${project.root}/src/main/asciidoc</sourceDirectory>
-					<sourceDocumentName>index.adoc</sourceDocumentName>
-					<doctype>book</doctype>
-					<attributes>
-						<version>${project.version}</version>
-						<projectName>${project.name}</projectName>
-						<projectVersion>${project.version}</projectVersion>
-						<aspectjVersion>${aspectj}</aspectjVersion>
-						<querydslVersion>${querydsl}</querydslVersion>
-						<springVersion>${spring}</springVersion>
-						<r2dbcVersion>${r2dbc-releasetrain.version}</r2dbcVersion>
-						<reactiveStreamsVersion>${reactive-streams.version}
-						</reactiveStreamsVersion>
-						<releasetrainVersion>${releasetrain}</releasetrainVersion>
-						<allow-uri-read>true</allow-uri-read>
-						<toclevels>3</toclevels>
-						<numbered>true</numbered>
-					</attributes>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/package-info.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/package-info.java
deleted file mode 100644
index d47e9d34f..000000000
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Support infrastructure for the configuration of R2DBC-specific repositories.
- */
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
-package org.springframework.data.r2dbc;