Skip to content

Commit a9c171a

Browse files
committed
Add org.json rule
1 parent fe55e64 commit a9c171a

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

samples/sample-all-deactivated/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929
implementation("com.sun.mail:jakarta.mail:2.0.1")
3030
implementation("com.sun.mail:javax.mail:1.6.2")
3131
implementation("com.sun.mail:mailapi:2.0.0")
32+
implementation("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")
3233
implementation("com.vividsolutions:jts-core:1.14.0")
3334
implementation("com.vividsolutions:jts:1.13")
3435
implementation("com.zaxxer:HikariCP-java6:2.3.9")
@@ -222,6 +223,7 @@ dependencies {
222223
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final")
223224
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final")
224225
implementation("org.jetbrains:annotations:24.0.0")
226+
implementation("org.json:json:20240303")
225227
implementation("org.jzy3d:jGL:2.5")
226228
implementation("org.jzy3d:jzy3d-emul-gl-awt:2.2.1")
227229
implementation("org.jzy3d:jzy3d-emul-gl:2.0.0")

samples/sample-all-deactivated/build.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ compileClasspath - Compile classpath for source set 'main'.
2828
+--- com.sun.mail:jakarta.mail:2.0.1 FAILED
2929
+--- com.sun.mail:javax.mail:1.6.2 FAILED
3030
+--- com.sun.mail:mailapi:2.0.0 FAILED
31+
+--- com.vaadin.external.google:android-json:0.0.20131108.vaadin1 FAILED
3132
+--- com.vividsolutions:jts-core:1.14.0 FAILED
3233
+--- com.vividsolutions:jts:1.13 FAILED
3334
+--- com.zaxxer:HikariCP-java6:2.3.9 FAILED
@@ -218,6 +219,7 @@ compileClasspath - Compile classpath for source set 'main'.
218219
+--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final FAILED
219220
+--- org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final FAILED
220221
+--- org.jetbrains:annotations:24.0.0 FAILED
222+
+--- org.json:json:20240303 FAILED
221223
+--- org.jzy3d:jGL:2.5 FAILED
222224
+--- org.jzy3d:jzy3d-emul-gl-awt:2.2.1 FAILED
223225
+--- org.jzy3d:jzy3d-emul-gl:2.0.0 FAILED

samples/sample-all/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies {
3030
implementation("com.sun.activation:javax.activation:1.2.0")
3131
implementation("com.sun.mail:javax.mail:1.6.2")
3232
implementation("com.sun.mail:mailapi:2.0.0")
33+
implementation("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")
3334
implementation("com.vividsolutions:jts-core:1.14.0")
3435
implementation("com.vividsolutions:jts:1.13")
3536
implementation("com.zaxxer:HikariCP-java6:2.3.9")
@@ -212,6 +213,7 @@ dependencies {
212213
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:2.0.2.Final")
213214
implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec:1.0.1.Final")
214215
implementation("org.jetbrains:annotations:24.0.0")
216+
implementation("org.json:json:20240303")
215217
implementation("org.jzy3d:jGL:2.5")
216218
implementation("org.jzy3d:jzy3d-emul-gl-awt:2.2.1")
217219
implementation("org.jzy3d:jzy3d-emul-gl:2.0.0")

samples/sample-all/build.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ compileClasspath - Compile classpath for source set 'main'.
4949
| \--- com.google.protobuf:protobuf-java:3.25.1
5050
+--- com.sun.mail:javax.mail:1.6.2
5151
| \--- javax.activation:activation:1.1
52+
+--- com.vaadin.external.google:android-json:0.0.20131108.vaadin1 -> org.json:json:20240303
5253
+--- com.vividsolutions:jts-core:1.14.0
5354
+--- com.vividsolutions:jts:1.13 -> com.vividsolutions:jts-core:1.14.0
5455
+--- com.zaxxer:HikariCP-java6:2.3.9 -> com.zaxxer:HikariCP:5.0.1
@@ -235,6 +236,7 @@ compileClasspath - Compile classpath for source set 'main'.
235236
+--- 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
236237
+--- 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
237238
+--- org.jetbrains:annotations:24.0.0
239+
+--- org.json:json:20240303
238240
+--- org.jzy3d:jGL:2.5
239241
+--- org.jzy3d:jzy3d-emul-gl-awt:2.2.1
240242
| +--- org.jzy3d:jzy3d-core:2.2.1

src/main/java/org/gradlex/jvm/dependency/conflict/detection/rules/CapabilityDefinition.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,13 @@ public enum CapabilityDefinition {
248248
"com.miglayout:miglayout-swing",
249249
"com.miglayout:miglayout"
250250
),
251+
/**
252+
* See <a href="https://github.com/spring-projects/spring-boot/issues/32881">spring-projects/spring-boot/issues/32881</a>
253+
*/
254+
ORG_JSON(HIGHEST_VERSION,
255+
"com.vaadin.external.google:android-json",
256+
"org.json:json"
257+
),
251258
MYSQL_CONNECTOR_JAVA(HIGHEST_VERSION,
252259
"mysql:mysql-connector-java",
253260
"com.mysql:mysql-connector-j"

0 commit comments

Comments
 (0)