Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Andy Wilkinson
2025-06-06 11:27:07 +01:00
parent 6128d7a2f9 458578033e
commit ee7f070a3f
4 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java
View File

@@ -178,26 +178,6 @@ public class AntoraAsciidocAttributes {
addSpringDataDependencyVersion(attributes, internal, "spring-data-redis");
addSpringDataDependencyVersion(attributes, internal, "spring-data-rest", "spring-data-rest-core");
addSpringDataDependencyVersion(attributes, internal, "spring-data-ldap");
addTestcontainersDependencyVersion(attributes, internal, "activemq");
addTestcontainersDependencyVersion(attributes, internal, "cassandra");
addTestcontainersDependencyVersion(attributes, internal, "clickhouse");
addTestcontainersDependencyVersion(attributes, internal, "couchbase");
addTestcontainersDependencyVersion(attributes, internal, "elasticsearch");
addTestcontainersDependencyVersion(attributes, internal, "grafana");
addTestcontainersDependencyVersion(attributes, internal, "jdbc");
addTestcontainersDependencyVersion(attributes, internal, "kafka");
addTestcontainersDependencyVersion(attributes, internal, "mariadb");
addTestcontainersDependencyVersion(attributes, internal, "mongodb");
addTestcontainersDependencyVersion(attributes, internal, "mssqlserver");
addTestcontainersDependencyVersion(attributes, internal, "mysql");
addTestcontainersDependencyVersion(attributes, internal, "neo4j");
addTestcontainersDependencyVersion(attributes, internal, "oracle-xe");
addTestcontainersDependencyVersion(attributes, internal, "oracle-free");
addTestcontainersDependencyVersion(attributes, internal, "postgresql");
addTestcontainersDependencyVersion(attributes, internal, "pulsar");
addTestcontainersDependencyVersion(attributes, internal, "rabbitmq");
addTestcontainersDependencyVersion(attributes, internal, "redpanda");
addTestcontainersDependencyVersion(attributes, internal, "r2dbc");
addDependencyVersion(attributes, "pulsar-client-reactive-api", "org.apache.pulsar:pulsar-client-reactive-api");
addDependencyVersion(attributes, "pulsar-client-api", "org.apache.pulsar:pulsar-client-api");
}
@@ -218,11 +198,6 @@ public class AntoraAsciidocAttributes {
internal.put("dotxversion-" + name, majorMinor + ".x");
}
private void addTestcontainersDependencyVersion(Map<String, String> attributes, Map<String, String> internal,
String artifactId) {
addDependencyVersion(attributes, "testcontainers-" + artifactId, "org.testcontainers:" + artifactId);
}
private void addDependencyVersion(Map<String, String> attributes, String name, String groupAndArtifactId) {
attributes.put("version-" + name, getVersion(groupAndArtifactId));
}

19
buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
View File

@@ -76,25 +76,6 @@ url-spring-data-rest-docs=https://docs.spring.io/spring-data/rest/reference/{ant
url-spring-data-rest-site=https://spring.io/projects/spring-data-rest
url-spring-data-rest-javadoc=https://docs.spring.io/spring-data/rest/docs/{dotxversion-spring-data-rest}/api
url-spring-data-site=https://spring.io/projects/spring-data
url-testcontainers-docs=https://java.testcontainers.org
url-testcontainers-activemq-javadoc=https://javadoc.io/doc/org.testcontainers/activemq/{version-testcontainers-activemq}
url-testcontainers-cassandra-javadoc=https://javadoc.io/doc/org.testcontainers/cassandra/{version-testcontainers-cassandra}
url-testcontainers-couchbase-javadoc=https://javadoc.io/doc/org.testcontainers/couchbase/{version-testcontainers-couchbase}
url-testcontainers-elasticsearch-javadoc=https://javadoc.io/doc/org.testcontainers/elasticsearch/{version-testcontainers-elasticsearch}
url-testcontainers-jdbc-javadoc=https://javadoc.io/doc/org.testcontainers/jdbc/{version-testcontainers-jdbc}
url-testcontainers-kafka-javadoc=https://javadoc.io/doc/org.testcontainers/kafka/{version-testcontainers-kafka}
url-testcontainers-mariadb-javadoc=https://javadoc.io/doc/org.testcontainers/mariadb/{version-testcontainers-mariadb}
url-testcontainers-mongodb-javadoc=https://javadoc.io/doc/org.testcontainers/mongodb/{version-testcontainers-mongodb}
url-testcontainers-mssqlserver-javadoc=https://javadoc.io/doc/org.testcontainers/mssqlserver/{version-testcontainers-mssqlserver}
url-testcontainers-mysql-javadoc=https://javadoc.io/doc/org.testcontainers/mysql/{version-testcontainers-mysql}
url-testcontainers-neo4j-javadoc=https://javadoc.io/doc/org.testcontainers/neo4j/{version-testcontainers-neo4j}
url-testcontainers-oracle-xe-javadoc=https://javadoc.io/doc/org.testcontainers/oracle-xe/{version-testcontainers-oracle-xe}
url-testcontainers-oracle-free-javadoc=https://javadoc.io/doc/org.testcontainers/oracle-free/{version-testcontainers-oracle-free}
url-testcontainers-postgresql-javadoc=https://javadoc.io/doc/org.testcontainers/postgresql/{version-testcontainers-postgresql}
url-testcontainers-pulsar-javadoc=https://javadoc.io/doc/org.testcontainers/pulsar/{version-testcontainers-pulsar}
url-testcontainers-rabbitmq-javadoc=https://javadoc.io/doc/org.testcontainers/rabbitmq/{version-testcontainers-rabbitmq}
url-testcontainers-redpanda-javadoc=https://javadoc.io/doc/org.testcontainers/redpanda/{version-testcontainers-redpanda}
url-testcontainers-r2dbc-javadoc=https://javadoc.io/doc/org.testcontainers/r2dbc/{version-testcontainers-r2dbc}
url-jackson-annotations-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version-jackson-annotations}
url-jackson-core-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/{version-jackson-core}
url-jackson-databind-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version-jackson-databind}