Merge pull request #131 from pkubowicz/org-json-capability

Add org.json rule
gradlex-org · May 24, 2024 · d7e9b92 · d7e9b92
2 parents 2461452 + a9c171a
commit d7e9b92
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/samples/sample-all-deactivated/build.gradle.kts b/samples/sample-all-deactivated/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     implementation("com.sun.mail:jakarta.mail:2.0.1")
     implementation("com.sun.mail:javax.mail:1.6.2")
     implementation("com.sun.mail:mailapi:2.0.0")
+    implementation("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")
     implementation("com.vividsolutions:jts-core:1.14.0")
     implementation("com.vividsolutions:jts:1.13")
     implementation("com.zaxxer:HikariCP-java6:2.3.9")
@@ -225,6 +226,7 @@ dependencies {
     implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final")
     implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final")
     implementation("org.jetbrains:annotations:24.0.0")
+    implementation("org.json:json:20240303")
     implementation("org.jzy3d:jGL:2.5")
     implementation("org.jzy3d:jzy3d-emul-gl-awt:2.2.1")
     implementation("org.jzy3d:jzy3d-emul-gl:2.0.0")

diff --git a/samples/sample-all-deactivated/build.out b/samples/sample-all-deactivated/build.out
@@ -28,6 +28,7 @@ compileClasspath - Compile classpath for source set 'main'.
 +--- com.sun.mail:jakarta.mail:2.0.1 FAILED
 +--- com.sun.mail:javax.mail:1.6.2 FAILED
 +--- com.sun.mail:mailapi:2.0.0 FAILED
++--- com.vaadin.external.google:android-json:0.0.20131108.vaadin1 FAILED
 +--- com.vividsolutions:jts-core:1.14.0 FAILED
 +--- com.vividsolutions:jts:1.13 FAILED
 +--- com.zaxxer:HikariCP-java6:2.3.9 FAILED
@@ -221,6 +222,7 @@ compileClasspath - Compile classpath for source set 'main'.
 +--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final FAILED
 +--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final FAILED
 +--- org.jetbrains:annotations:24.0.0 FAILED
++--- org.json:json:20240303 FAILED
 +--- org.jzy3d:jGL:2.5 FAILED
 +--- org.jzy3d:jzy3d-emul-gl-awt:2.2.1 FAILED
 +--- org.jzy3d:jzy3d-emul-gl:2.0.0 FAILED

diff --git a/samples/sample-all/build.gradle.kts b/samples/sample-all/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     implementation("com.sun.activation:javax.activation:1.2.0")
     implementation("com.sun.mail:javax.mail:1.6.2")
     implementation("com.sun.mail:mailapi:2.0.0")
+    implementation("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")
     implementation("com.vividsolutions:jts-core:1.14.0")
     implementation("com.vividsolutions:jts:1.13")
     implementation("com.zaxxer:HikariCP-java6:2.3.9")
@@ -213,6 +214,7 @@ dependencies {
     implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final")
     implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final")
     implementation("org.jetbrains:annotations:24.0.0")
+    implementation("org.json:json:20240303")
     implementation("org.jzy3d:jGL:2.5")
     implementation("org.jzy3d:jzy3d-emul-gl-awt:2.2.1")
     implementation("org.jzy3d:jzy3d-emul-gl:2.0.0")

diff --git a/samples/sample-all/build.out b/samples/sample-all/build.out
@@ -49,6 +49,7 @@ compileClasspath - Compile classpath for source set 'main'.
 |    \--- com.google.protobuf:protobuf-java:3.25.1
 +--- com.sun.mail:javax.mail:1.6.2
 |    \--- javax.activation:activation:1.1
++--- com.vaadin.external.google:android-json:0.0.20131108.vaadin1 -> org.json:json:20240303
 +--- com.vividsolutions:jts-core:1.14.0
 +--- com.vividsolutions:jts:1.13 -> com.vividsolutions:jts-core:1.14.0
 +--- com.zaxxer:HikariCP-java6:2.3.9 -> com.zaxxer:HikariCP:5.0.1
@@ -236,6 +237,7 @@ compileClasspath - Compile classpath for source set 'main'.
 +--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final -> javax.ws.rs:javax.ws.rs-api:2.1.1
 +--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final -> jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
 +--- org.jetbrains:annotations:24.0.0
++--- org.json:json:20240303
 +--- org.jzy3d:jGL:2.5
 +--- org.jzy3d:jzy3d-emul-gl-awt:2.2.1
 |    +--- org.jzy3d:jzy3d-core:2.2.1

diff --git a/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java b/src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java
@@ -248,6 +248,13 @@ public enum CapabilityDefinition {
             "com.miglayout:miglayout-swing",
             "com.miglayout:miglayout"
     ),
+    /**
+     * See <a href="https://github.com/spring-projects/spring-boot/issues/32881">spring-projects/spring-boot/issues/32881</a>
+     */
+    ORG_JSON(HIGHEST_VERSION,
+            "com.vaadin.external.google:android-json",
+            "org.json:json"
+    ),
     MYSQL_CONNECTOR_JAVA(HIGHEST_VERSION,
             "mysql:mysql-connector-java",
             "com.mysql:mysql-connector-j"