diff --git a/examples/quickstarts/helidon-quickstart-mp/build.gradle b/examples/quickstarts/helidon-quickstart-mp/build.gradle
index d1cc21322be..b90b66adb66 100644
--- a/examples/quickstarts/helidon-quickstart-mp/build.gradle
+++ b/examples/quickstarts/helidon-quickstart-mp/build.gradle
@@ -40,7 +40,7 @@ repositories {
dependencies {
compile "io.helidon:helidon-bom:${project.helidonversion}"
compile 'io.helidon.microprofile.bundles:helidon-microprofile-1.2'
- compile 'org.glassfish.jersey.media:jersey-media-json-binding:2.26'
+ compile 'org.glassfish.jersey.media:jersey-media-json-binding:2.29'
runtime 'org.jboss:jandex:2.0.4.Final'
runtime 'javax.activation:javax.activation-api:1.2.0'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0'
diff --git a/examples/quickstarts/helidon-quickstart-mp/pom.xml b/examples/quickstarts/helidon-quickstart-mp/pom.xml
index 129a55fd0af..1ce882a2151 100644
--- a/examples/quickstarts/helidon-quickstart-mp/pom.xml
+++ b/examples/quickstarts/helidon-quickstart-mp/pom.xml
@@ -171,7 +171,7 @@
org.glassfish.jersey.media
jersey-media-json-binding
- 2.26
+ 2.29
diff --git a/examples/todo-app/pom.xml b/examples/todo-app/pom.xml
index 920e75590df..5d4617096d7 100644
--- a/examples/todo-app/pom.xml
+++ b/examples/todo-app/pom.xml
@@ -48,7 +48,7 @@
${project.version}
3.4.0
- 2.26
+ 2.29
2.9.5
16.0.1
diff --git a/grpc/client/pom.xml b/grpc/client/pom.xml
index 4f5203e38d1..91861977cdc 100644
--- a/grpc/client/pom.xml
+++ b/grpc/client/pom.xml
@@ -85,8 +85,8 @@
test
- javax.json
- javax.json-api
+ org.glassfish
+ javax.json
test
diff --git a/grpc/core/pom.xml b/grpc/core/pom.xml
index 2c024bf76d0..ea48664ee3e 100644
--- a/grpc/core/pom.xml
+++ b/grpc/core/pom.xml
@@ -85,8 +85,8 @@
test
- javax.json
- javax.json-api
+ org.glassfish
+ javax.json
test
diff --git a/grpc/metrics/pom.xml b/grpc/metrics/pom.xml
index c000bff618e..ffd1aceea95 100644
--- a/grpc/metrics/pom.xml
+++ b/grpc/metrics/pom.xml
@@ -60,8 +60,8 @@
test
- javax.json
- javax.json-api
+ org.glassfish
+ javax.json
test
diff --git a/grpc/server/pom.xml b/grpc/server/pom.xml
index f8c878bd7aa..6bf358ced9c 100644
--- a/grpc/server/pom.xml
+++ b/grpc/server/pom.xml
@@ -80,11 +80,6 @@
hamcrest-all
test
-
- javax.json
- javax.json-api
- test
-
org.glassfish
javax.json
diff --git a/grpc/server/src/test/java/io/helidon/grpc/server/TracingIT.java b/grpc/server/src/test/java/io/helidon/grpc/server/TracingIT.java
index 39a555ae39d..24e3b401ebc 100644
--- a/grpc/server/src/test/java/io/helidon/grpc/server/TracingIT.java
+++ b/grpc/server/src/test/java/io/helidon/grpc/server/TracingIT.java
@@ -49,6 +49,7 @@
import zipkin2.Span;
import zipkin2.junit.ZipkinRule;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.not;
@@ -119,11 +120,11 @@ public void shouldTraceMethodNameAndHeaders() {
String sTraces = listTraces.toString();
- assertThat("The traces should include method name", sTraces.contains("grpc.method_name"));
- assertThat("The traces should include Echo method", sTraces.contains("EchoService/Echo"));
+ assertThat("The traces should include method name", sTraces, containsString("grpc.method_name"));
+ assertThat("The traces should include Echo method", sTraces, containsString("EchoService/Echo"));
- assertThat("Tha traces should include headers", sTraces.contains("grpc.headers"));
- assertThat("Tha traces should include attributes", sTraces.contains("grpc.call_attributes"));
+ assertThat("Tha traces should include headers", sTraces, containsString("grpc.headers"));
+ assertThat("Tha traces should include attributes", sTraces, containsString("grpc.call_attributes"));
}
@Test
diff --git a/health/health-checks/src/main/java9/module-info.java b/health/health-checks/src/main/java9/module-info.java
index 3a5bd9ba608..f23903fc1a7 100644
--- a/health/health-checks/src/main/java9/module-info.java
+++ b/health/health-checks/src/main/java9/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
requires java.management;
requires static cdi.api;
- requires javax.inject;
+ requires static javax.inject;
requires io.helidon.common;
requires io.helidon.health;
- requires microprofile.config.api;
+ requires static microprofile.config.api;
requires microprofile.health.api;
exports io.helidon.health.checks;
diff --git a/health/health/src/main/java9/module-info.java b/health/health/src/main/java9/module-info.java
index bb9121e9f0d..16aea8a5d0c 100644
--- a/health/health/src/main/java9/module-info.java
+++ b/health/health/src/main/java9/module-info.java
@@ -24,7 +24,8 @@
requires transitive microprofile.health.api;
requires io.helidon.webserver;
requires io.helidon.media.jsonp.server;
- requires org.glassfish.java.json;
+ requires java.json;
exports io.helidon.health;
+ provides org.eclipse.microprofile.health.spi.HealthCheckResponseProvider with io.helidon.health.HealthCheckResponseProviderImpl;
}
diff --git a/jersey/client/pom.xml b/jersey/client/pom.xml
new file mode 100644
index 00000000000..e3ff6702898
--- /dev/null
+++ b/jersey/client/pom.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+ io.helidon.jersey
+ helidon-jersey-project
+ 1.1.3-SNAPSHOT
+
+ 4.0.0
+
+ helidon-jersey-client
+
+
+
+ org.glassfish.jersey.core
+ jersey-client
+ ${version.lib.jersey}
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+ org.glassfish.hk2.external
+ jakarta.inject
+
+
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+
+
+ org.glassfish.hk2.external
+ javax.inject
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+
+
+
+
+ javax.activation
+ javax.activation-api
+
+
+
+ javax.annotation
+ javax.annotation-api
+
+
+ javax.inject
+ javax.inject
+
+
+
\ No newline at end of file
diff --git a/jersey/client/src/main/java9/module-info.java b/jersey/client/src/main/java9/module-info.java
new file mode 100644
index 00000000000..cf55555ab52
--- /dev/null
+++ b/jersey/client/src/main/java9/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Jersey client.
+ */
+module io.helidon.jersey.client {
+ requires transitive java.ws.rs;
+ requires transitive jersey.common;
+ requires transitive jersey.client;
+
+ requires transitive java.annotation;
+ requires transitive javax.inject;
+}
diff --git a/jersey/jsonp/pom.xml b/jersey/jsonp/pom.xml
new file mode 100644
index 00000000000..f5ca18595e2
--- /dev/null
+++ b/jersey/jsonp/pom.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+ helidon-jersey-project
+ io.helidon.jersey
+ 1.1.3-SNAPSHOT
+
+ 4.0.0
+
+ helidon-jersey-media-jsonp
+
+
+
+
+ org.glassfish.jersey.media
+ jersey-media-json-processing
+
+
+ org.glassfish
+ jakarta.json
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+
+
+
+ org.glassfish.jersey.core
+ jersey-common
+
+
+
+
+
\ No newline at end of file
diff --git a/jersey/jsonp/src/main/java9/module-info.java b/jersey/jsonp/src/main/java9/module-info.java
new file mode 100644
index 00000000000..4a766021286
--- /dev/null
+++ b/jersey/jsonp/src/main/java9/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Jersey Media Json Processing.
+ */
+module io.helidon.jersey.media.jsonp {
+ requires transitive jersey.media.json.processing;
+}
\ No newline at end of file
diff --git a/jersey/pom.xml b/jersey/pom.xml
new file mode 100644
index 00000000000..c5bfec9883b
--- /dev/null
+++ b/jersey/pom.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+ helidon-project
+ io.helidon
+ 1.1.3-SNAPSHOT
+
+ 4.0.0
+ pom
+
+ io.helidon.jersey
+ helidon-jersey-project
+ Helidon Jersey
+
+
+ Helidon wrapping of Jersey modules to correct classpath.
+ Currently used to fix dependencies from jakarta namespace to javax namespace
+
+
+
+ client
+ server
+ jsonp
+
+
+
+
+ true
+
+
\ No newline at end of file
diff --git a/jersey/server/pom.xml b/jersey/server/pom.xml
new file mode 100644
index 00000000000..2674861d45e
--- /dev/null
+++ b/jersey/server/pom.xml
@@ -0,0 +1,90 @@
+
+
+
+
+ 4.0.0
+
+ io.helidon.jersey
+ helidon-jersey-project
+ 1.1.3-SNAPSHOT
+
+
+ helidon-jersey-server
+
+
+
+ org.glassfish.jersey.core
+ jersey-server
+ ${version.lib.jersey}
+
+
+ org.glassfish.jersey.media
+ jersey-media-jaxb
+
+
+ org.glassfish.hk2.external
+ jakarta.inject
+
+
+ jakarta.activation
+ jakarta.activation-api
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+
+
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+
+
+ org.glassfish.hk2.external
+ javax.inject
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+
+
+
+
+ javax.activation
+ javax.activation-api
+
+
+
+ javax.annotation
+ javax.annotation-api
+
+
+ javax.inject
+ javax.inject
+
+
+
\ No newline at end of file
diff --git a/jersey/server/src/main/java9/module-info.java b/jersey/server/src/main/java9/module-info.java
new file mode 100644
index 00000000000..8caca5a9266
--- /dev/null
+++ b/jersey/server/src/main/java9/module-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Jersey server.
+ */
+module io.helidon.jersey.server {
+ requires transitive java.ws.rs;
+ requires transitive jersey.common;
+ requires transitive jersey.server;
+
+ requires transitive javax.inject;
+ requires transitive java.activation;
+ requires transitive java.annotation;
+}
\ No newline at end of file
diff --git a/media/jsonp/common/src/main/java9/module-info.java b/media/jsonp/common/src/main/java9/module-info.java
index 01f138ff31b..cee4f0a01a9 100644
--- a/media/jsonp/common/src/main/java9/module-info.java
+++ b/media/jsonp/common/src/main/java9/module-info.java
@@ -25,7 +25,7 @@
requires io.helidon.common.http;
requires io.helidon.common.reactive;
requires io.helidon.media.common;
- requires transitive org.glassfish.java.json;
+ requires transitive java.json;
exports io.helidon.media.jsonp.common;
}
diff --git a/metrics/metrics/src/main/java9/module-info.java b/metrics/metrics/src/main/java9/module-info.java
index e084b8bdb43..77ce5b7db42 100644
--- a/metrics/metrics/src/main/java9/module-info.java
+++ b/metrics/metrics/src/main/java9/module-info.java
@@ -25,7 +25,7 @@
requires java.management;
requires io.helidon.webserver;
requires io.helidon.media.jsonp.server;
- requires org.glassfish.java.json;
+ requires java.json;
exports io.helidon.metrics;
}
diff --git a/microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java b/microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java
index 8e820a2d5f1..5f2b04ec5e6 100644
--- a/microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java
+++ b/microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
requires cdi.api;
requires javax.inject;
requires microprofile.config.api;
+ requires java.ws.rs;
requires transitive io.helidon.microprofile.jwt.auth;
diff --git a/microprofile/server/pom.xml b/microprofile/server/pom.xml
index 663e1d15308..773f10e0818 100644
--- a/microprofile/server/pom.xml
+++ b/microprofile/server/pom.xml
@@ -42,17 +42,6 @@
cdi-api
provided
-
-
- javax.activation
- javax.activation-api
- provided
-
org.glassfish
javax.json
@@ -94,16 +83,17 @@
org.glassfish.jersey.ext.cdi
jersey-weld2-se
+
+
+ org.glassfish.jersey.core
+ jersey-server
+
+
-
- org.glassfish.jersey.inject
- jersey-hk2
-
-
-
- org.glassfish.jersey.media
- jersey-media-json-processing
+ io.helidon.jersey
+ helidon-jersey-media-jsonp
+ ${project.version}
io.helidon.microprofile.bundles
diff --git a/microprofile/server/src/main/java9/module-info.java b/microprofile/server/src/main/java9/module-info.java
index 32960821865..a39f0675d99 100644
--- a/microprofile/server/src/main/java9/module-info.java
+++ b/microprofile/server/src/main/java9/module-info.java
@@ -23,13 +23,11 @@
requires transitive io.helidon.webserver;
requires transitive io.helidon.webserver.jersey;
requires transitive io.helidon.common.context;
+ requires transitive io.helidon.jersey.server;
requires transitive cdi.api;
requires transitive java.ws.rs;
- requires transitive jersey.server;
requires transitive org.glassfish.java.json;
- // needed by jersey
- requires transitive java.activation;
requires java.logging;
requires io.helidon.common.serviceloader;
diff --git a/microprofile/tests/tck/tck-health/pom.xml b/microprofile/tests/tck/tck-health/pom.xml
index 059bb4fb2af..baf342df5b9 100644
--- a/microprofile/tests/tck/tck-health/pom.xml
+++ b/microprofile/tests/tck/tck-health/pom.xml
@@ -55,8 +55,8 @@
test
- javax.json
- javax.json-api
+ org.glassfish
+ javax.json
test
diff --git a/microprofile/tests/tck/tck-openapi/pom.xml b/microprofile/tests/tck/tck-openapi/pom.xml
index fc5e789edde..129595d60e2 100644
--- a/microprofile/tests/tck/tck-openapi/pom.xml
+++ b/microprofile/tests/tck/tck-openapi/pom.xml
@@ -70,8 +70,8 @@
${version.lib.microprofile-openapi-api}
- javax.json
- javax.json-api
+ org.glassfish
+ javax.json
test
diff --git a/microprofile/tracing/src/main/java9/module-info.java b/microprofile/tracing/src/main/java9/module-info.java
index c59b384541b..fd2946b7ef8 100644
--- a/microprofile/tracing/src/main/java9/module-info.java
+++ b/microprofile/tracing/src/main/java9/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index dbcd7f556c8..6ed2e3e49e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
2.1
7.6.0.Final
2.9.0
- 2.26
+ 2.29
4.9.0.201710071750-r
1.19
1.0.1
@@ -241,6 +241,7 @@
health
grpc
openapi
+ jersey
@@ -288,7 +289,7 @@
https://static.javadoc.io/io.zipkin.reporter2/zipkin-reporter/${version.lib.zipkin}
https://static.javadoc.io/jakarta.json.bind/jakarta.json.bind-api/${version.lib.jsonb-api}
https://static.javadoc.io/jakarta.persistence/jakarta.persistence-api/${version.lib.jakarta-persistence-api}
- https://static.javadoc.io/javax.json/javax.json-api/${version.lib.jsonp-api}
+ https://static.javadoc.io/javax.json/jakarta.json-api/${version.lib.jsonp-api}
https://static.javadoc.io/javax.json.bind/javax.json.bind-api/${version.lib.jsonb-api}
https://static.javadoc.io/javax.persistence/javax.persistence-api/${version.lib.persistence-api}
https://static.javadoc.io/javax.transaction/javax.transaction-api/${version.lib.transaction-api}
@@ -655,6 +656,28 @@
pom
import
+
+ org.glassfish.jersey.core
+ jersey-server
+ ${version.lib.jersey}
+
+
+ org.glassfish.hk2.external
+ jakarta.inject
+
+
+
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ ${version.lib.jersey}
+
+
+ org.glassfish.hk2.external
+ jakarta.inject
+
+
+
com.fasterxml.jackson.core
diff --git a/security/integration/jersey/pom.xml b/security/integration/jersey/pom.xml
index f70dc34f905..623a719605c 100644
--- a/security/integration/jersey/pom.xml
+++ b/security/integration/jersey/pom.xml
@@ -79,6 +79,11 @@
io.opentracing
opentracing-util
+
+ javax.inject
+ javax.inject
+ provided
+
io.helidon.bundles
helidon-bundles-config
diff --git a/security/integration/webserver/pom.xml b/security/integration/webserver/pom.xml
index 994dc5853d6..c699b33b6ac 100644
--- a/security/integration/webserver/pom.xml
+++ b/security/integration/webserver/pom.xml
@@ -109,5 +109,10 @@
javax.activation-api
test
+
+ javax.inject
+ javax.inject
+ test
+
diff --git a/security/jwt/src/main/java9/module-info.java b/security/jwt/src/main/java9/module-info.java
index 885290c24a4..9aec23ae8d8 100644
--- a/security/jwt/src/main/java9/module-info.java
+++ b/security/jwt/src/main/java9/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/security/providers/idcs-mapper/pom.xml b/security/providers/idcs-mapper/pom.xml
index a18c3d91047..b149a1b247d 100644
--- a/security/providers/idcs-mapper/pom.xml
+++ b/security/providers/idcs-mapper/pom.xml
@@ -55,24 +55,17 @@
${project.version}
- org.glassfish.jersey.core
- jersey-client
- provided
-
-
- org.glassfish.jersey.inject
- jersey-hk2
+ io.helidon.jersey
+ helidon-jersey-client
+ ${project.version}
provided
- org.glassfish.jersey.media
- jersey-media-json-processing
+ io.helidon.jersey
+ helidon-jersey-media-jsonp
+ ${project.version}
provided
-
- javax.activation
- javax.activation-api
-
org.junit.jupiter
junit-jupiter-api
diff --git a/security/providers/idcs-mapper/src/main/java9/module-info.java b/security/providers/idcs-mapper/src/main/java9/module-info.java
index 631fd788b1c..291a169c8ed 100644
--- a/security/providers/idcs-mapper/src/main/java9/module-info.java
+++ b/security/providers/idcs-mapper/src/main/java9/module-info.java
@@ -27,6 +27,9 @@
requires io.helidon.security.util;
requires java.logging;
+ requires jersey.client;
+ requires java.ws.rs;
+
exports io.helidon.security.providers.idcs.mapper;
provides io.helidon.security.spi.SecurityProviderService with io.helidon.security.providers.idcs.mapper.IdcsRoleMapperProviderService;
diff --git a/security/providers/oidc-common/pom.xml b/security/providers/oidc-common/pom.xml
index 09a7949b3ac..7e01d35e322 100644
--- a/security/providers/oidc-common/pom.xml
+++ b/security/providers/oidc-common/pom.xml
@@ -41,20 +41,14 @@
${project.version}
- org.glassfish.jersey.core
- jersey-client
-
-
- org.glassfish.jersey.inject
- jersey-hk2
-
-
- org.glassfish.jersey.media
- jersey-media-json-processing
+ io.helidon.jersey
+ helidon-jersey-client
+ ${project.version}
- javax.activation
- javax.activation-api
+ io.helidon.jersey
+ helidon-jersey-media-jsonp
+ ${project.version}
io.helidon.bundles
diff --git a/security/providers/oidc/pom.xml b/security/providers/oidc/pom.xml
index 40f1543498d..beb34faad72 100644
--- a/security/providers/oidc/pom.xml
+++ b/security/providers/oidc/pom.xml
@@ -81,24 +81,17 @@
test
- org.glassfish.jersey.core
- jersey-client
- provided
-
-
- org.glassfish.jersey.inject
- jersey-hk2
+ io.helidon.jersey
+ helidon-jersey-client
+ ${project.version}
provided
- org.glassfish.jersey.media
- jersey-media-json-processing
+ io.helidon.jersey
+ helidon-jersey-media-jsonp
+ ${project.version}
provided
-
- javax.activation
- javax.activation-api
-
org.junit.jupiter
junit-jupiter-api
diff --git a/tracing/jersey-client/pom.xml b/tracing/jersey-client/pom.xml
index ccbe05ce3a5..e65a2720872 100644
--- a/tracing/jersey-client/pom.xml
+++ b/tracing/jersey-client/pom.xml
@@ -53,8 +53,9 @@
${project.version}
- org.glassfish.jersey.core
- jersey-client
+ io.helidon.jersey
+ helidon-jersey-client
+ ${project.version}
provided
diff --git a/tracing/jersey/pom.xml b/tracing/jersey/pom.xml
index cbce8e93be7..b0fecea7aca 100644
--- a/tracing/jersey/pom.xml
+++ b/tracing/jersey/pom.xml
@@ -55,8 +55,9 @@
provided
- org.glassfish.jersey.core
- jersey-server
+ io.helidon.jersey
+ helidon-jersey-server
+ ${project.version}
provided
diff --git a/tracing/jersey/src/main/java9/module-info.java b/tracing/jersey/src/main/java9/module-info.java
index b9c06ff47c4..0fe01946424 100644
--- a/tracing/jersey/src/main/java9/module-info.java
+++ b/tracing/jersey/src/main/java9/module-info.java
@@ -23,7 +23,6 @@
requires java.ws.rs;
requires jersey.server;
- requires javax.inject;
requires opentracing.api;
requires io.helidon.common;
requires io.helidon.common.context;
diff --git a/webserver/jersey/pom.xml b/webserver/jersey/pom.xml
index 7287b5b3bc6..f23badbddbe 100644
--- a/webserver/jersey/pom.xml
+++ b/webserver/jersey/pom.xml
@@ -54,33 +54,9 @@
opentracing-api
- org.glassfish.jersey.core
- jersey-server
-
-
- org.glassfish.jersey.media
- jersey-media-jaxb
-
-
- org.glassfish.hk2.external
- javax.inject
-
-
-
-
-
- javax.annotation
- javax.annotation-api
-
-
- org.glassfish.jersey.inject
- jersey-hk2
-
-
- org.glassfish.hk2.external
- javax.inject
-
-
+ io.helidon.jersey
+ helidon-jersey-server
+ ${project.version}
io.projectreactor
@@ -92,10 +68,22 @@
${project.version}
test
+
+ io.helidon.jersey
+ helidon-jersey-client
+ ${project.version}
+ test
+
org.glassfish.jersey.containers
jersey-container-grizzly2-http
test
+
+
+ jakarta.activation
+ jakarta.activation-api
+
+
org.glassfish.jersey.connectors
diff --git a/webserver/jersey/src/main/java9/module-info.java b/webserver/jersey/src/main/java9/module-info.java
index 17c5e3eb45f..d8aafc89f20 100644
--- a/webserver/jersey/src/main/java9/module-info.java
+++ b/webserver/jersey/src/main/java9/module-info.java
@@ -22,9 +22,7 @@
requires transitive io.helidon.webserver;
requires transitive java.ws.rs;
requires transitive opentracing.api;
- requires transitive jersey.common;
- requires transitive jersey.server;
- requires transitive javax.inject;
+ requires transitive io.helidon.jersey.server;
requires io.helidon.common.context;
requires reactor.core;
diff --git a/webserver/webserver/pom.xml b/webserver/webserver/pom.xml
index ab5863380e1..a65e837d182 100644
--- a/webserver/webserver/pom.xml
+++ b/webserver/webserver/pom.xml
@@ -119,8 +119,8 @@
test
- javax.json
- javax.json-api
+ org.glassfish
+ javax.json
test
@@ -150,6 +150,11 @@
jersey-client
test
+
+ javax.inject
+ javax.inject
+ test
+
org.glassfish.jersey.inject
jersey-hk2