Fix for framework version constraints in Gradle (#392)

finos · Aug 24, 2023 · c3f937e · c3f937e
1 parent 102ac56
commit c3f937e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/gradle/base-java.gradle b/gradle/base-java.gradle
@@ -21,13 +21,13 @@ repositories {
 dependencies {
 
     // Enforce a single consistent set of versions for core frameworks across the entire project
-    implementation enforcedPlatform(group: "io.netty", name: "netty-bom", version: "${netty_version}")
-    implementation enforcedPlatform(group: "io.grpc", name: "grpc-bom", version: "${grpc_version}")
-    implementation enforcedPlatform(group: "com.google.protobuf", name: "protobuf-bom", version: "${proto_version}")
-    implementation enforcedPlatform(group: "com.google.guava", name: "guava-bom", version: "${guava_version}")
-    implementation enforcedPlatform(group: "com.fasterxml.jackson", name: "jackson-bom", version: "${jackson_version}")
-    implementation enforcedPlatform(group: "org.slf4j", name: "slf4j-parent", version: "${slf4j_version}")
-    implementation enforcedPlatform(group: "org.apache.logging.log4j", name: "log4j-bom", version: "${log4j_version}")
+    implementation platform(group: "io.netty", name: "netty-bom", version: "${netty_version}")
+    implementation platform(group: "io.grpc", name: "grpc-bom", version: "${grpc_version}")
+    implementation platform(group: "com.google.protobuf", name: "protobuf-bom", version: "${proto_version}")
+    implementation platform(group: "com.google.guava", name: "guava-bom", version: "${guava_version}")
+    implementation platform(group: "com.fasterxml.jackson", name: "jackson-bom", version: "${jackson_version}")
+    implementation platform(group: "org.slf4j", name: "slf4j-parent", version: "${slf4j_version}")
+    implementation platform(group: "org.apache.logging.log4j", name: "log4j-bom", version: "${log4j_version}")
 
     // Logging with SLF 4J, available in all Java modules
     implementation group: 'org.slf4j', name: 'slf4j-api', version: "$slf4j_version"

diff --git a/tracdap-libs/tracdap-lib-common/build.gradle b/tracdap-libs/tracdap-lib-common/build.gradle
@@ -25,9 +25,7 @@ description = "TRAC D.A.P. common library, interfaces and utilities used across
 
 dependencies {
 
-    // Export framework version constraints for 3rd party plugins, but do not enforce them
-    // Enforcing hard constraints on 3rd-party code with API dependencies is flagged as an error by Gradle (rightly so)!
-    // Constraints for modules that are part of the TRAC codebase are hard enforced in base-java.gradle
+    // Export framework version constraints for 3rd party plugins
     api platform(group: "io.netty", name: "netty-bom", version: "${netty_version}")
     api platform(group: "io.grpc", name: "grpc-bom", version: "${grpc_version}")
     api platform(group: "com.google.protobuf", name: "protobuf-bom", version: "${proto_version}")