Skip to content

Commit 93dd39e

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-45843
2 parents 954ae30 + de54d4d commit 93dd39e

File tree

4 files changed

+32
-51
lines changed

4 files changed

+32
-51
lines changed

‎buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -178,26 +178,6 @@ private void addVersionAttributes(Map<String, String> attributes, Map<String, St
178178
addSpringDataDependencyVersion(attributes, internal, "spring-data-redis");
179179
addSpringDataDependencyVersion(attributes, internal, "spring-data-rest", "spring-data-rest-core");
180180
addSpringDataDependencyVersion(attributes, internal, "spring-data-ldap");
181-
addTestcontainersDependencyVersion(attributes, internal, "activemq");
182-
addTestcontainersDependencyVersion(attributes, internal, "cassandra");
183-
addTestcontainersDependencyVersion(attributes, internal, "clickhouse");
184-
addTestcontainersDependencyVersion(attributes, internal, "couchbase");
185-
addTestcontainersDependencyVersion(attributes, internal, "elasticsearch");
186-
addTestcontainersDependencyVersion(attributes, internal, "grafana");
187-
addTestcontainersDependencyVersion(attributes, internal, "jdbc");
188-
addTestcontainersDependencyVersion(attributes, internal, "kafka");
189-
addTestcontainersDependencyVersion(attributes, internal, "mariadb");
190-
addTestcontainersDependencyVersion(attributes, internal, "mongodb");
191-
addTestcontainersDependencyVersion(attributes, internal, "mssqlserver");
192-
addTestcontainersDependencyVersion(attributes, internal, "mysql");
193-
addTestcontainersDependencyVersion(attributes, internal, "neo4j");
194-
addTestcontainersDependencyVersion(attributes, internal, "oracle-xe");
195-
addTestcontainersDependencyVersion(attributes, internal, "oracle-free");
196-
addTestcontainersDependencyVersion(attributes, internal, "postgresql");
197-
addTestcontainersDependencyVersion(attributes, internal, "pulsar");
198-
addTestcontainersDependencyVersion(attributes, internal, "rabbitmq");
199-
addTestcontainersDependencyVersion(attributes, internal, "redpanda");
200-
addTestcontainersDependencyVersion(attributes, internal, "r2dbc");
201181
addDependencyVersion(attributes, "pulsar-client-reactive-api", "org.apache.pulsar:pulsar-client-reactive-api");
202182
addDependencyVersion(attributes, "pulsar-client-api", "org.apache.pulsar:pulsar-client-api");
203183
}
@@ -218,11 +198,6 @@ private void addSpringDataDependencyVersion(Map<String, String> attributes, Map<
218198
internal.put("dotxversion-" + name, majorMinor + ".x");
219199
}
220200

221-
private void addTestcontainersDependencyVersion(Map<String, String> attributes, Map<String, String> internal,
222-
String artifactId) {
223-
addDependencyVersion(attributes, "testcontainers-" + artifactId, "org.testcontainers:" + artifactId);
224-
}
225-
226201
private void addDependencyVersion(Map<String, String> attributes, String name, String groupAndArtifactId) {
227202
attributes.put("version-" + name, getVersion(groupAndArtifactId));
228203
}

‎buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,6 @@ url-spring-data-rest-docs=https://docs.spring.io/spring-data/rest/reference/{ant
7676
url-spring-data-rest-site=https://spring.io/projects/spring-data-rest
7777
url-spring-data-rest-javadoc=https://docs.spring.io/spring-data/rest/docs/{dotxversion-spring-data-rest}/api
7878
url-spring-data-site=https://spring.io/projects/spring-data
79-
url-testcontainers-docs=https://java.testcontainers.org
80-
url-testcontainers-activemq-javadoc=https://javadoc.io/doc/org.testcontainers/activemq/{version-testcontainers-activemq}
81-
url-testcontainers-cassandra-javadoc=https://javadoc.io/doc/org.testcontainers/cassandra/{version-testcontainers-cassandra}
82-
url-testcontainers-couchbase-javadoc=https://javadoc.io/doc/org.testcontainers/couchbase/{version-testcontainers-couchbase}
83-
url-testcontainers-elasticsearch-javadoc=https://javadoc.io/doc/org.testcontainers/elasticsearch/{version-testcontainers-elasticsearch}
84-
url-testcontainers-jdbc-javadoc=https://javadoc.io/doc/org.testcontainers/jdbc/{version-testcontainers-jdbc}
85-
url-testcontainers-kafka-javadoc=https://javadoc.io/doc/org.testcontainers/kafka/{version-testcontainers-kafka}
86-
url-testcontainers-mariadb-javadoc=https://javadoc.io/doc/org.testcontainers/mariadb/{version-testcontainers-mariadb}
87-
url-testcontainers-mongodb-javadoc=https://javadoc.io/doc/org.testcontainers/mongodb/{version-testcontainers-mongodb}
88-
url-testcontainers-mssqlserver-javadoc=https://javadoc.io/doc/org.testcontainers/mssqlserver/{version-testcontainers-mssqlserver}
89-
url-testcontainers-mysql-javadoc=https://javadoc.io/doc/org.testcontainers/mysql/{version-testcontainers-mysql}
90-
url-testcontainers-neo4j-javadoc=https://javadoc.io/doc/org.testcontainers/neo4j/{version-testcontainers-neo4j}
91-
url-testcontainers-oracle-xe-javadoc=https://javadoc.io/doc/org.testcontainers/oracle-xe/{version-testcontainers-oracle-xe}
92-
url-testcontainers-oracle-free-javadoc=https://javadoc.io/doc/org.testcontainers/oracle-free/{version-testcontainers-oracle-free}
93-
url-testcontainers-postgresql-javadoc=https://javadoc.io/doc/org.testcontainers/postgresql/{version-testcontainers-postgresql}
94-
url-testcontainers-pulsar-javadoc=https://javadoc.io/doc/org.testcontainers/pulsar/{version-testcontainers-pulsar}
95-
url-testcontainers-rabbitmq-javadoc=https://javadoc.io/doc/org.testcontainers/rabbitmq/{version-testcontainers-rabbitmq}
96-
url-testcontainers-redpanda-javadoc=https://javadoc.io/doc/org.testcontainers/redpanda/{version-testcontainers-redpanda}
97-
url-testcontainers-r2dbc-javadoc=https://javadoc.io/doc/org.testcontainers/r2dbc/{version-testcontainers-r2dbc}
9879
url-jackson-annotations-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version-jackson-annotations}
9980
url-jackson-core-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/{version-jackson-core}
10081
url-jackson-databind-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version-jackson-databind}

‎spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,9 +2338,31 @@ bom {
23382338
bom("testcontainers-bom")
23392339
}
23402340
links {
2341-
site("https://java.testcontainers.org")
2342-
javadoc("https://javadoc.io/doc/org.testcontainers/testcontainers/{version}", "org.testcontainers")
2341+
docs("https://java.testcontainers.org")
2342+
javadoc("testcontainers", version -> "https://javadoc.io/doc/org.testcontainers/testcontainers/%s".formatted(version), "org.testcontainers")
2343+
javadoc("testcontainers-activemq", version -> "https://javadoc.io/doc/org.testcontainers/activemq/%s".formatted(version), "org.testcontainers.activemq")
2344+
javadoc("testcontainers-cassandra", version -> "https://javadoc.io/doc/org.testcontainers/cassandra/%s".formatted(version))
2345+
javadoc("testcontainers-clickhouse", version -> "https://javadoc.io/doc/org.testcontainers/clickhouse/%s".formatted(version), "org.testcontainers.clickhouse")
2346+
javadoc("testcontainers-couchbase", version -> "https://javadoc.io/doc/org.testcontainers/couchbase/%s".formatted(version), "org.testcontainers.couchbase")
2347+
javadoc("testcontainers-elasticsearch", version -> "https://javadoc.io/doc/org.testcontainers/elasticsearch/%s".formatted(version), "org.testcontainers.elasticsearch")
2348+
javadoc("testcontainers-grafana", version -> "https://javadoc.io/doc/org.testcontainers/grafana/%s".formatted(version), "org.testcontainers.grafana")
2349+
javadoc("testcontainers-jdbc", version -> "https://javadoc.io/doc/org.testcontainers/jdbc/%s".formatted(version))
2350+
javadoc("testcontainers-junit-jupiter", version -> "https://javadoc.io/doc/org.testcontainers/junit-jupiter/%s".formatted(version), "org.testcontainers.junit.jupiter")
2351+
javadoc("testcontainers-kafka", version -> "https://javadoc.io/doc/org.testcontainers/kafka/%s".formatted(version), "org.testcontainers.kafka")
2352+
javadoc("testcontainers-mariadb", version -> "https://javadoc.io/doc/org.testcontainers/mariadb/%s".formatted(version))
2353+
javadoc("testcontainers-mongodb", version -> "https://javadoc.io/doc/org.testcontainers/mongodb/%s".formatted(version))
2354+
javadoc("testcontainers-mssqlserver", version -> "https://javadoc.io/doc/org.testcontainers/mssqlserver/%s".formatted(version))
2355+
javadoc("testcontainers-mysql", version -> "https://javadoc.io/doc/org.testcontainers/mysql/%s".formatted(version))
2356+
javadoc("testcontainers-neo4j", version -> "https://javadoc.io/doc/org.testcontainers/neo4j/%s".formatted(version))
2357+
javadoc("testcontainers-oracle-xe", version -> "https://javadoc.io/doc/org.testcontainers/oracle-xe/%s".formatted(version))
2358+
javadoc("testcontainers-oracle-free", version -> "https://javadoc.io/doc/org.testcontainers/oracle-free/%s".formatted(version), "org.testcontainers.oracle")
2359+
javadoc("testcontainers-postgresql", version -> "https://javadoc.io/doc/org.testcontainers/postgresql/%s".formatted(version))
2360+
javadoc("testcontainers-pulsar", version -> "https://javadoc.io/doc/org.testcontainers/pulsar/%s".formatted(version))
2361+
javadoc("testcontainers-rabbitmq", version -> "https://javadoc.io/doc/org.testcontainers/rabbitmq/%s".formatted(version))
2362+
javadoc("testcontainers-redpanda", version -> "https://javadoc.io/doc/org.testcontainers/redpanda/%s".formatted(version), "org.testcontainers.redpanda")
2363+
javadoc("testcontainers-r2dbc", version -> "https://javadoc.io/doc/org.testcontainers/r2dbc/%s".formatted(version), "org.testcontainers.r2dbc")
23432364
releaseNotes("https://github.com/testcontainers/testcontainers-java/releases/tag/{version}")
2365+
site("https://java.testcontainers.org")
23442366
}
23452367
}
23462368
library("Testcontainers Redis Module", "2.2.4") {

‎spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ NOTE: In most cases, you will additionally need to configure the application to
4949

5050
A common pattern with Testcontainers is to declare the container instances as static fields in an interface.
5151

52-
For example, the following interface declares two containers, one named `mongo` of type javadoc:org.testcontainers.containers.MongoDBContainer[] and another named `neo4j` of type javadoc:org.testcontainers.containers.Neo4jContainer.Neo4jContainer[]:
52+
For example, the following interface declares two containers, one named `mongo` of type javadoc:{url-testcontainers-mongodb-javadoc}/org.testcontainers.containers.MongoDBContainer[] and another named `neo4j` of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.containers.Neo4jContainer[]:
5353

5454
include-code::MyContainers[]
5555

@@ -153,19 +153,22 @@ The following service connection factories are provided in the `spring-boot-test
153153
| Containers of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.containers.Neo4jContainer[]
154154

155155
| javadoc:org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingConnectionDetails[]
156-
| Containers named "otel/opentelemetry-collector-contrib" or of type `LgtmStackContainer`
156+
| Containers named "otel/opentelemetry-collector-contrib" or of type javadoc:org.testcontainers.grafana.LgtmStackContainer[]
157157

158158
| javadoc:org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsConnectionDetails[]
159-
| Containers named "otel/opentelemetry-collector-contrib" or of type `LgtmStackContainer`
159+
| Containers named "otel/opentelemetry-collector-contrib" or of type javadoc:org.testcontainers.grafana.LgtmStackContainer[]
160160

161161
| javadoc:org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingConnectionDetails[]
162-
| Containers named "otel/opentelemetry-collector-contrib" or of type `LgtmStackContainer`
162+
| Containers named "otel/opentelemetry-collector-contrib" or of type javadoc:org.testcontainers.grafana.LgtmStackContainer[]
163163

164164
| javadoc:org.springframework.boot.autoconfigure.pulsar.PulsarConnectionDetails[]
165165
| Containers of type javadoc:{url-testcontainers-pulsar-javadoc}/org.testcontainers.containers.PulsarContainer[]
166166

167167
| javadoc:org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails[]
168-
| Containers of type `ClickHouseContainer`, javadoc:{url-testcontainers-mariadb-javadoc}/org.testcontainers.containers.MariaDBContainer[], javadoc:{url-testcontainers-mssqlserver-javadoc}/org.testcontainers.containers.MSSQLServerContainer[], javadoc:{url-testcontainers-mysql-javadoc}/org.testcontainers.containers.MySQLContainer[], javadoc:{url-testcontainers-oracle-free-javadoc}/org.testcontainers.OracleContainer[OracleContainer (free)], javadoc:{url-testcontainers-oracle-xe-javadoc}/org.testcontainers.oracle.OracleContainer[OracleContainer (XE)] or javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.containers.PostgreSQLContainer[]
168+
| Containers of type
169+
javadoc:org.testcontainers.clickhouse.ClickHouseContainer[],
170+
javadoc:{url-testcontainers-mariadb-javadoc}/org.testcontainers.containers.MariaDBContainer[], javadoc:{url-testcontainers-mssqlserver-javadoc}/org.testcontainers.containers.MSSQLServerContainer[], javadoc:{url-testcontainers-mysql-javadoc}/org.testcontainers.containers.MySQLContainer[],
171+
javadoc:org.testcontainers.oracle.OracleContainer[OracleContainer (free)], javadoc:{url-testcontainers-oracle-xe-javadoc}/org.testcontainers.containers.OracleContainer[OracleContainer (XE)] or javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.containers.PostgreSQLContainer[]
169172

170173
| javadoc:org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails[]
171174
| Containers of type javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.containers.RabbitMQContainer[]

0 commit comments

Comments
 (0)