diff --git a/messaging/messaging-cloudevents/build.gradle b/messaging/messaging-cloudevents/build.gradle index 355ea49..81f261d 100644 --- a/messaging/messaging-cloudevents/build.gradle +++ b/messaging/messaging-cloudevents/build.gradle @@ -10,6 +10,6 @@ dependencies { // dependency was hidden from consumers: an adopter calling the documented method could not // name its return type without adding CloudEvents to their own build, and Gradle gave them no // hint why. A type in a public signature is part of the artifact's contract. - api 'io.cloudevents:cloudevents-api:4.0.1' - implementation 'io.cloudevents:cloudevents-core:4.0.1' + api libs.cloudevents.api + implementation libs.cloudevents.core } diff --git a/messaging/messaging-kafka/build.gradle b/messaging/messaging-kafka/build.gradle index 0d1618e..b79de5a 100644 --- a/messaging/messaging-kafka/build.gradle +++ b/messaging/messaging-kafka/build.gradle @@ -28,7 +28,7 @@ dependencies { testImplementation 'org.testcontainers:testcontainers-junit-jupiter' testImplementation 'org.testcontainers:testcontainers-kafka' testImplementation 'org.testcontainers:testcontainers-toxiproxy' - testImplementation 'eu.rekawek.toxiproxy:toxiproxy-java:2.1.7' + testImplementation libs.toxiproxy.java } // The certification lane, and the gate that makes its output the only source of a Stable claim. diff --git a/messaging/messaging-nats-experimental/build.gradle b/messaging/messaging-nats-experimental/build.gradle index 18cf8a2..485b3c5 100644 --- a/messaging/messaging-nats-experimental/build.gradle +++ b/messaging/messaging-nats-experimental/build.gradle @@ -9,5 +9,5 @@ dependencies { api project(':messaging:messaging-security') api project(':messaging:messaging-admin-api') - implementation 'io.nats:jnats:2.26.2' + implementation libs.jnats } diff --git a/messaging/messaging-pulsar-experimental/build.gradle b/messaging/messaging-pulsar-experimental/build.gradle index 168449d..d274afd 100644 --- a/messaging/messaging-pulsar-experimental/build.gradle +++ b/messaging/messaging-pulsar-experimental/build.gradle @@ -9,5 +9,5 @@ dependencies { api project(':messaging:messaging-security') api project(':messaging:messaging-admin-api') - implementation 'org.apache.pulsar:pulsar-client:4.0.3' + implementation libs.pulsar.client } diff --git a/messaging/messaging-schema-avro/build.gradle b/messaging/messaging-schema-avro/build.gradle index 458cf43..3346b11 100644 --- a/messaging/messaging-schema-avro/build.gradle +++ b/messaging/messaging-schema-avro/build.gradle @@ -7,5 +7,5 @@ dependencies { // api: AvroMessageCodec's constructors take a registry of org.apache.avro.Schema and // AvroCompatibilityGate.check takes and compares them. A consumer cannot build that // registry without naming the type, so hiding the dependency only stops them compiling. - api 'org.apache.avro:avro:1.12.0' + api libs.avro } diff --git a/messaging/messaging-schema-protobuf/build.gradle b/messaging/messaging-schema-protobuf/build.gradle index 560d1df..1dfc001 100644 --- a/messaging/messaging-schema-protobuf/build.gradle +++ b/messaging/messaging-schema-protobuf/build.gradle @@ -6,5 +6,5 @@ dependencies { // api: ProtobufMessageContract is a public record over com.google.protobuf.Message and // Parser, and registering a contract is the first thing a consumer of this codec does. - api 'com.google.protobuf:protobuf-java:4.29.3' + api libs.protobuf.java.legacy } diff --git a/messaging/messaging-testkit/src/test/java/dev/caskeleton/messaging/testkit/contract/MessagingPublicSurfaceContractTest.java b/messaging/messaging-testkit/src/test/java/dev/caskeleton/messaging/testkit/contract/MessagingPublicSurfaceContractTest.java index c29034c..8cd6a3c 100644 --- a/messaging/messaging-testkit/src/test/java/dev/caskeleton/messaging/testkit/contract/MessagingPublicSurfaceContractTest.java +++ b/messaging/messaging-testkit/src/test/java/dev/caskeleton/messaging/testkit/contract/MessagingPublicSurfaceContractTest.java @@ -270,6 +270,18 @@ class MessagingPublicSurfaceContractTest { boolean versioned = lastColon > 0 && coordinate.indexOf(':') != lastColon; exported.add(versioned ? coordinate.substring(0, lastColon) : coordinate); } + // Version-catalog accessors are the same declaration in a different notation. Matching only the + // literal string form would have let `api libs.cloudevents.api` read as "not declared api" — a + // contract reported as broken because the build file was tidied, which is the most expensive + // kind of false positive a gate can produce. + Matcher catalogued = + Pattern.compile("(?m)^\\s*api\\s+(libs\\.[A-Za-z0-9.]+)").matcher(buildScript); + while (catalogued.find()) { + String module = catalogModules().get(catalogued.group(1)); + if (module != null) { + exported.add(module); + } + } Matcher projects = Pattern.compile("(?m)^\\s*api\\s+project\\('([^']+)'\\)").matcher(buildScript); while (projects.find()) { @@ -294,9 +306,35 @@ class MessagingPublicSurfaceContractTest { } private static boolean declaresAsApi(String buildScript, String coordinate) { - return Pattern.compile("(?m)^\\s*api\\s+'" + Pattern.quote(coordinate) + "(:[^']*)?'") + if (Pattern.compile("(?m)^\\s*api\\s+'" + Pattern.quote(coordinate) + "(:[^']*)?'") .matcher(buildScript) - .find(); + .find()) { + return true; + } + return apiDependenciesOf(buildScript).contains(coordinate); + } + + /** + * Version-catalog accessor to {@code group:artifact}, read from the catalog itself. + * + *
{@code gradle/libs.versions.toml} declares {@code archunit-junit5 = { module = "..." }} and
+ * Gradle exposes it as {@code libs.archunit.junit5}; the alias separators become dots. Parsing
+ * the file rather than hard-coding the mapping keeps this test honest when an alias is renamed —
+ * a stale table here would silently stop resolving and report the library as unexported.
+ */
+ private static Map