Skip to content

Commit

Permalink
Merge branch '3.3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@philwebb
philwebb committed Nov 20, 2024
2 parents 8d2b5c5 + a3b027a commit d9458ac
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 8 deletions.
33 changes: 32 additions & 1 deletion buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,26 @@ private void addVersionAttributes(Map<String, String> attributes, Map<String, St
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, "couchbase");
addTestcontainersDependencyVersion(attributes, internal, "elasticsearch");
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");
}

private void addSpringDataDependencyVersion(Map<String, String> attributes, Map<String, String> internal,
Expand All @@ -159,6 +179,11 @@ private void addSpringDataDependencyVersion(Map<String, String> attributes, Map<
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));
}
Expand All @@ -178,9 +203,15 @@ private void addArtifactAttributes(Map<String, String> attributes) {

private void addUrlJava(Map<String, String> attributes) {
attributes.put("url-javase-javadoc", "https://docs.oracle.com/en/java/javase/17/docs/api/");
attributes.put("javadoc-location-java-util", "{url-javase-javadoc}");
attributes.put("javadoc-location-java-beans", "{url-javase-javadoc}");
attributes.put("javadoc-location-java-lang", "{url-javase-javadoc}");
attributes.put("javadoc-location-java-net", "{url-javase-javadoc}");
attributes.put("javadoc-location-java-io", "{url-javase-javadoc}");
attributes.put("javadoc-location-java-time", "{url-javase-javadoc}");
attributes.put("javadoc-location-java-util", "{url-javase-javadoc}");
attributes.put("javadoc-location-javax-management", "{url-javase-javadoc}");
attributes.put("javadoc-location-javax-net", "{url-javase-javadoc}");
attributes.put("javadoc-location-javax-sql", "{url-javase-javadoc}");
attributes.put("javadoc-location-javax-xml", "{url-javase-javadoc}");
}

Expand Down
22 changes: 22 additions & 0 deletions ...ain/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ url-native-build-tools-docs-gradle-plugin={url-native-build-tools-docs}/gradle-p
url-native-build-tools-docs-maven-plugin={url-native-build-tools-docs}/maven-plugin.html
url-paketo-docs=https://paketo.io/docs
url-paketo-docs-java-buildpack={url-paketo-docs}/buildpacks/language-family-buildpacks/java
url-pulsar-client-api-javadoc=https://javadoc.io/doc/org.apache.pulsar/pulsar-client-api/{version-pulsar-client-api}
url-pulsar-client-reactive-api-javadoc=https://javadoc.io/doc/org.apache.pulsar/pulsar-client-reactive-api/{version-pulsar-client-reactive-api}
url-spring-boot-for-apache-geode-docs=https://docs.spring.io/spring-boot-data-geode-build/2.0.x/reference/html5
url-spring-boot-for-apache-geode-site=https://github.com/spring-projects/spring-boot-data-geode
url-spring-data-cassandra-docs=https://docs.spring.io/spring-data/cassandra/reference/{antoraversion-spring-data-cassandra}
Expand Down Expand Up @@ -72,13 +74,33 @@ 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-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}
url-jackson-dataformat-xml-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/{version-jackson-dataformat-xml}

# === Javadoc Locations ===

javadoc-location-org-apache-pulsar-client-api={url-pulsar-client-api-javadoc}
javadoc-location-org-apache-pulsar-reactive-client-api={url-pulsar-client-reactive-api-javadoc}
javadoc-location-org-springframework-data-cassandra={url-spring-data-cassandra-javadoc}
javadoc-location-org-springframework-data-querydsl={url-spring-data-commons-javadoc}
javadoc-location-org-springframework-data-repository={url-spring-data-commons-javadoc}
Expand Down
24 changes: 24 additions & 0 deletions ...rc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,29 @@ private Map<String, String> mockDependencyVersions(String version) {
addMockSpringDataVersion(versions, "spring-data-redis", version);
addMockSpringDataVersion(versions, "spring-data-rest-core", version);
addMockSpringDataVersion(versions, "spring-data-ldap", version);
addMockTestcontainersVersion(versions, "activemq", version);
addMockTestcontainersVersion(versions, "cassandra", version);
addMockTestcontainersVersion(versions, "couchbase", version);
addMockTestcontainersVersion(versions, "elasticsearch", version);
addMockTestcontainersVersion(versions, "jdbc", version);
addMockTestcontainersVersion(versions, "kafka", version);
addMockTestcontainersVersion(versions, "mariadb", version);
addMockTestcontainersVersion(versions, "mongodb", version);
addMockTestcontainersVersion(versions, "mssqlserver", version);
addMockTestcontainersVersion(versions, "mysql", version);
addMockTestcontainersVersion(versions, "neo4j", version);
addMockTestcontainersVersion(versions, "oracle-xe", version);
addMockTestcontainersVersion(versions, "oracle-free", version);
addMockTestcontainersVersion(versions, "postgresql", version);
addMockTestcontainersVersion(versions, "pulsar", version);
addMockTestcontainersVersion(versions, "rabbitmq", version);
addMockTestcontainersVersion(versions, "redpanda", version);
addMockTestcontainersVersion(versions, "r2dbc", version);
addMockJacksonCoreVersion(versions, "jackson-annotations", version);
addMockJacksonCoreVersion(versions, "jackson-core", version);
addMockJacksonCoreVersion(versions, "jackson-databind", version);
versions.put("org.apache.pulsar:pulsar-client-api", version);
versions.put("org.apache.pulsar:pulsar-client-reactive-api", version);
versions.put("com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version);
return versions;
}
Expand All @@ -271,6 +291,10 @@ private void addMockSpringDataVersion(Map<String, String> versions, String artif
versions.put("org.springframework.data:" + artifactId, version);
}

private void addMockTestcontainersVersion(Map<String, String> versions, String artifactId, String version) {
versions.put("org.testcontainers:" + artifactId, version);
}

private void addMockJacksonCoreVersion(Map<String, String> versions, String artifactId, String version) {
versions.put("com.fasterxml.jackson.core:" + artifactId, version);
}
Expand Down
Loading

0 comments on commit d9458ac

Please sign in to comment.