Skip to content

Commit 649a5e2

Browse files
author
Mohamed Safeuq
committed
Add jna rule
1 parent e2e0a85 commit 649a5e2

File tree

5 files changed

+12
-0
lines changed

5 files changed

+12
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ dependencies {
100100
implementation("junit:junit:4.12")
101101
implementation("log4j:log4j:1.2.17")
102102
implementation("mysql:mysql-connector-java:8.0.33")
103+
implementation("net.java.dev.jna:jna:5.10.0")
103104
implementation("net.java.dev.jna:jna-platform:5.10.0")
104105
implementation("net.java.dev.jna:platform:3.4.0")
105106
implementation("net.jcip:jcip-annotations:1.0")
@@ -206,6 +207,7 @@ dependencies {
206207
implementation("org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2")
207208
implementation("org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0")
208209
implementation("org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2")
210+
implementation("org.elasticsearch:jna:5.7.0-1")
209211
implementation("org.glassfish.hk2.external:jakarta.inject:2.6.1")
210212
implementation("org.glassfish.hk2.external:javax.inject:2.4.0")
211213
implementation("org.glassfish:jakarta.json:1.1.5")

samples/sample-all-deactivated/build.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ compileClasspath - Compile classpath for source set 'main'.
9898
+--- junit:junit:4.12 FAILED
9999
+--- log4j:log4j:1.2.17 FAILED
100100
+--- mysql:mysql-connector-java:8.0.33 FAILED
101+
+--- net.java.dev.jna:jna:5.10.0 FAILED
101102
+--- net.java.dev.jna:jna-platform:5.10.0 FAILED
102103
+--- net.java.dev.jna:platform:3.4.0 FAILED
103104
+--- net.jcip:jcip-annotations:1.0 FAILED
@@ -204,6 +205,7 @@ compileClasspath - Compile classpath for source set 'main'.
204205
+--- org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 FAILED
205206
+--- org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0 FAILED
206207
+--- org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2 FAILED
208+
+--- org.elasticsearch:jna:5.7.0-1 FAILED
207209
+--- org.glassfish.hk2.external:jakarta.inject:2.6.1 FAILED
208210
+--- org.glassfish.hk2.external:javax.inject:2.4.0 FAILED
209211
+--- org.glassfish:jakarta.json:1.1.5 FAILED

samples/sample-all/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ dependencies {
103103
implementation("junit:junit:4.12")
104104
implementation("log4j:log4j:1.2.17")
105105
implementation("mysql:mysql-connector-java:8.0.33")
106+
implementation("net.java.dev.jna:jna:5.10.0")
106107
implementation("net.java.dev.jna:jna-platform:5.10.0")
107108
implementation("net.java.dev.jna:platform:3.4.0")
108109
implementation("net.jcip:jcip-annotations:1.0")
@@ -209,6 +210,7 @@ dependencies {
209210
implementation("org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2")
210211
implementation("org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0")
211212
implementation("org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2")
213+
implementation("org.elasticsearch:jna:5.7.0-1")
212214
implementation("org.glassfish.hk2.external:jakarta.inject:2.6.1")
213215
implementation("org.glassfish.hk2.external:javax.inject:2.4.0")
214216
implementation("org.glassfish:jakarta.json:1.1.5")

samples/sample-all/build.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ compileClasspath - Compile classpath for source set 'main'.
145145
| +--- org.slf4j:slf4j-api:2.0.12 (*)
146146
| \--- org.slf4j:slf4j-bom:2.0.12 (*)
147147
+--- mysql:mysql-connector-java:8.0.33 -> com.mysql:mysql-connector-j:8.3.0 (*)
148+
+--- net.java.dev.jna:jna:5.10.0
148149
+--- net.java.dev.jna:jna-platform:5.10.0
149150
| \--- net.java.dev.jna:jna:5.10.0
150151
+--- net.java.dev.jna:platform:3.4.0 -> net.java.dev.jna:jna-platform:5.10.0 (*)
@@ -284,6 +285,7 @@ compileClasspath - Compile classpath for source set 'main'.
284285
+--- org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 -> jakarta.servlet:jakarta.servlet-api:5.0.0
285286
+--- org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0 -> jakarta.websocket:jakarta.websocket-api:2.1.1
286287
+--- org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2
288+
+--- org.elasticsearch:jna:5.7.0-1 -> net.java.dev.jna:jna:5.10.0
287289
+--- org.glassfish.hk2.external:jakarta.inject:2.6.1 -> com.jwebmp:javax.inject:1.1
288290
+--- org.glassfish.hk2.external:javax.inject:2.4.0 -> com.jwebmp:javax.inject:1.1
289291
+--- org.glassfish:jakarta.json:1.1.5 -> jakarta.json:jakarta.json-api:1.1.6

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ public enum CapabilityDefinition {
236236
"net.java.dev.jna:platform",
237237
"net.java.dev.jna:jna-platform"
238238
),
239+
JNA(HIGHEST_VERSION,
240+
"net.java.dev.jna:jna",
241+
"org.elasticsearch:jna"
242+
),
239243
JTS_CORE(HIGHEST_VERSION,
240244
"com.vividsolutions:jts",
241245
"com.vividsolutions:jts-core"

0 commit comments

Comments
 (0)