jlengrand/helidon
1
0
Fork 0
mirror of https://github.com/jlengrand/helidon.git synced 2026-03-10 08:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Jersey to 2.29 (#813)

Browse Source 
* Test with Jersey Release Candidate.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Fixes for update to Jersey RC

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Excluded hk2 jakarta.inject

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Copyright fixes

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Upgrade to Jersey 2.29 released version

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Upgrade to Jersey 2.29 released version

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Force updates to try fix issue with socket reset

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Modules for jersey to exclude jakarta and include javax

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* module-info fixes for json and health

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Copyright fixes

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Spotbugs fix

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Jersey dependency fix

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

* Better assertion to troubleshoot test failures.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
This commit is contained in:
Tomas Langer
2019-06-27 13:40:34 +02:00
committed by GitHub
parent c1a6917bfa
commit e2d2a03130
39 changed files with 469 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/quickstarts/helidon-quickstart-mp/build.gradle
View File

@@ -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'

2
examples/quickstarts/helidon-quickstart-mp/pom.xml
View File

@@ -171,7 +171,7 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
<version>2.26</version>
<version>2.29</version>
</dependency>
</dependencies>
</dependencyManagement>

2
examples/todo-app/pom.xml
View File

@@ -48,7 +48,7 @@
<version.lib.helidon>${project.version}</version.lib.helidon>
<version.lib.cassandra>3.4.0</version.lib.cassandra>
<version.lib.jersey>2.26</version.lib.jersey>
<version.lib.jersey>2.29</version.lib.jersey>
<version.lib.jackson>2.9.5</version.lib.jackson>
<version.lib.guava>16.0.1</version.lib.guava>

4
grpc/client/pom.xml
View File

@@ -85,8 +85,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
grpc/core/pom.xml
View File

@@ -85,8 +85,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
grpc/metrics/pom.xml
View File

@@ -60,8 +60,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>

5
grpc/server/pom.xml
View File

@@ -80,11 +80,6 @@
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>

9
grpc/server/src/test/java/io/helidon/grpc/server/TracingIT.java
View File

@@ -49,6 +49,7 @@ import services.EchoService;
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 class TracingIT {
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

6
health/health-checks/src/main/java9/module-info.java
View File

@@ -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 @@ module io.helidon.health.checks {
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;

3
health/health/src/main/java9/module-info.java
View File

@@ -24,7 +24,8 @@ module io.helidon.health {
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;
}

78
jersey/client/pom.xml Normal file
View File

@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-project</artifactId>
<version>1.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>helidon-jersey-client</artifactId>
<dependencies>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${version.lib.jersey}</version>
<exclusions>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<!-- needed for correct module name -->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
</dependencies>
</project>

27
jersey/client/src/main/java9/module-info.java Normal file
View File

@@ -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;
}

52
jersey/jsonp/pom.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>helidon-jersey-project</artifactId>
<groupId>io.helidon.jersey</groupId>
<version>1.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>helidon-jersey-media-jsonp</artifactId>
<dependencies>
<dependency>
<!-- Jersey support for JSON-P -->
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
<exclusion>
<!-- this is provided anyway -->
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

22
jersey/jsonp/src/main/java9/module-info.java Normal file
View File

@@ -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;
}

48
jersey/pom.xml Normal file
View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>helidon-project</artifactId>
<groupId>io.helidon</groupId>
<version>1.1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-project</artifactId>
<name>Helidon Jersey</name>
<description>
Helidon wrapping of Jersey modules to correct classpath.
Currently used to fix dependencies from jakarta namespace to javax namespace
</description>
<modules>
<module>client</module>
<module>server</module>
<module>jsonp</module>
</modules>
<properties>
<!-- these modules do not contain source code -->
<spotbugs.skip>true</spotbugs.skip>
</properties>
</project>

90
jersey/server/pom.xml Normal file
View File

@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-project</artifactId>
<version>1.1.3-SNAPSHOT</version>
</parent>
<artifactId>helidon-jersey-server</artifactId>
<dependencies>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${version.lib.jersey}</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<!-- needed for correct module name -->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
</dependencies>
</project>

28
jersey/server/src/main/java9/module-info.java Normal file
View File

@@ -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;
}

2
media/jsonp/common/src/main/java9/module-info.java
View File

@@ -25,7 +25,7 @@ module io.helidon.media.jsonp.common {
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;
}

2
metrics/metrics/src/main/java9/module-info.java
View File

@@ -25,7 +25,7 @@ module io.helidon.metrics {
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;
}

3
microprofile/jwt-auth/jwt-auth-cdi/src/main/java9/module-info.java
View File

@@ -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 @@ module io.helidon.microprofile.jwt.auth.cdi {
requires cdi.api;
requires javax.inject;
requires microprofile.config.api;
requires java.ws.rs;
requires transitive io.helidon.microprofile.jwt.auth;

28
microprofile/server/pom.xml
View File

@@ -42,17 +42,6 @@
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<!--
Needed by jersey in Java 9
Added as a dependency to correctly run tests (without the long exception
from hk2). If you run application on Java 9, you need to add this dependency
in compile scope to prevent the error messages.
-->
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
@@ -94,16 +83,17 @@
<!-- Jersey integration with Weld -->
<groupId>org.glassfish.jersey.ext.cdi</groupId>
<artifactId>jersey-weld2-se</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Jersey injection - needed for Jersey itself -->
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<!-- Jersey support for JSON-P -->
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-media-jsonp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>

4
microprofile/server/src/main/java9/module-info.java
View File

@@ -23,13 +23,11 @@ module io.helidon.microprofile.server {
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;

4
microprofile/tests/tck/tck-health/pom.xml
View File

@@ -55,8 +55,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>

4
microprofile/tests/tck/tck-openapi/pom.xml
View File

@@ -70,8 +70,8 @@
<version>${version.lib.microprofile-openapi-api}</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
microprofile/tracing/src/main/java9/module-info.java
View File

@@ -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.

27
pom.xml
View File

@@ -135,7 +135,7 @@
<version.lib.jaxrs-api>2.1</version.lib.jaxrs-api>
<version.lib.jboss-transaction-spi>7.6.0.Final</version.lib.jboss-transaction-spi>
<version.lib.jedis>2.9.0</version.lib.jedis>
<version.lib.jersey>2.26</version.lib.jersey>
<version.lib.jersey>2.29</version.lib.jersey>
<version.lib.jgit>4.9.0.201710071750-r</version.lib.jgit>
<version.lib.jmh>1.19</version.lib.jmh>
<version.lib.jsonb-api>1.0.1</version.lib.jsonb-api>
@@ -241,6 +241,7 @@
<module>health</module>
<module>grpc</module>
<module>openapi</module>
<module>jersey</module>
</modules>
<build>
@@ -288,7 +289,7 @@
<link>https://static.javadoc.io/io.zipkin.reporter2/zipkin-reporter/${version.lib.zipkin}</link>
<link>https://static.javadoc.io/jakarta.json.bind/jakarta.json.bind-api/${version.lib.jsonb-api}</link>
<link>https://static.javadoc.io/jakarta.persistence/jakarta.persistence-api/${version.lib.jakarta-persistence-api}</link>
<link>https://static.javadoc.io/javax.json/javax.json-api/${version.lib.jsonp-api}</link>
<link>https://static.javadoc.io/javax.json/jakarta.json-api/${version.lib.jsonp-api}</link>
<link>https://static.javadoc.io/javax.json.bind/javax.json.bind-api/${version.lib.jsonb-api}</link>
<link>https://static.javadoc.io/javax.persistence/javax.persistence-api/${version.lib.persistence-api}</link>
<link>https://static.javadoc.io/javax.transaction/javax.transaction-api/${version.lib.transaction-api}</link>
@@ -655,6 +656,28 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${version.lib.jersey}</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${version.lib.jersey}</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Explicitly force jackson-annotations to use proper version; bom doesn't -->
<groupId>com.fasterxml.jackson.core</groupId>

5
security/integration/jersey/pom.xml
View File

@@ -79,6 +79,11 @@
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.helidon.bundles</groupId>
<artifactId>helidon-bundles-config</artifactId>

5
security/integration/webserver/pom.xml
View File

@@ -109,5 +109,10 @@
<artifactId>javax.activation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

2
security/jwt/src/main/java9/module-info.java
View File

@@ -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.

19
security/providers/idcs-mapper/pom.xml
View File

@@ -55,24 +55,17 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-media-jsonp</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>

3
security/providers/idcs-mapper/src/main/java9/module-info.java
View File

@@ -27,6 +27,9 @@ module io.helidon.security.providers.idcs.mapper {
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;

18
security/providers/oidc-common/pom.xml
View File

@@ -41,20 +41,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-media-jsonp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.bundles</groupId>

19
security/providers/oidc/pom.xml
View File

@@ -81,24 +81,17 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-media-jsonp</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-processing</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>

5
tracing/jersey-client/pom.xml
View File

@@ -53,8 +53,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

5
tracing/jersey/pom.xml
View File

@@ -55,8 +55,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

1
tracing/jersey/src/main/java9/module-info.java
View File

@@ -23,7 +23,6 @@ module io.helidon.tracing.jersey {
requires java.ws.rs;
requires jersey.server;
requires javax.inject;
requires opentracing.api;
requires io.helidon.common;
requires io.helidon.common.context;

42
webserver/jersey/pom.xml
View File

@@ -54,33 +54,9 @@
<artifactId>opentracing-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- needed for correct module name -->
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
@@ -92,10 +68,22 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.helidon.jersey</groupId>
<artifactId>helidon-jersey-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>

4
webserver/jersey/src/main/java9/module-info.java
View File

@@ -22,9 +22,7 @@ module io.helidon.webserver.jersey {
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;

9
webserver/webserver/pom.xml
View File

@@ -119,8 +119,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -150,6 +150,11 @@
<artifactId>jersey-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>