Skip to content

Commit e2d2a03

Browse files
tomas-langertomas-langer
authored
Upgrade Jersey to 2.29 (helidon-io#813)
* 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>
1 parent c1a6917 commit e2d2a03

39 files changed

Lines changed: 469 additions & 130 deletions

File tree

‎examples/quickstarts/helidon-quickstart-mp/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ repositories {
4040
dependencies {
4141
compile "io.helidon:helidon-bom:${project.helidonversion}"
4242
compile 'io.helidon.microprofile.bundles:helidon-microprofile-1.2'
43-
compile 'org.glassfish.jersey.media:jersey-media-json-binding:2.26'
43+
compile 'org.glassfish.jersey.media:jersey-media-json-binding:2.29'
4444
runtime 'org.jboss:jandex:2.0.4.Final'
4545
runtime 'javax.activation:javax.activation-api:1.2.0'
4646
testCompile 'org.junit.jupiter:junit-jupiter-api:5.1.0'

‎examples/quickstarts/helidon-quickstart-mp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<dependency>
172172
<groupId>org.glassfish.jersey.media</groupId>
173173
<artifactId>jersey-media-json-binding</artifactId>
174-
<version>2.26</version>
174+
<version>2.29</version>
175175
</dependency>
176176
</dependencies>
177177
</dependencyManagement>

‎examples/todo-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<version.lib.helidon>${project.version}</version.lib.helidon>
4949

5050
<version.lib.cassandra>3.4.0</version.lib.cassandra>
51-
<version.lib.jersey>2.26</version.lib.jersey>
51+
<version.lib.jersey>2.29</version.lib.jersey>
5252
<version.lib.jackson>2.9.5</version.lib.jackson>
5353
<version.lib.guava>16.0.1</version.lib.guava>
5454

‎grpc/client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
<scope>test</scope>
8686
</dependency>
8787
<dependency>
88-
<groupId>javax.json</groupId>
89-
<artifactId>javax.json-api</artifactId>
88+
<groupId>org.glassfish</groupId>
89+
<artifactId>javax.json</artifactId>
9090
<scope>test</scope>
9191
</dependency>
9292
<dependency>

‎grpc/core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
<scope>test</scope>
8686
</dependency>
8787
<dependency>
88-
<groupId>javax.json</groupId>
89-
<artifactId>javax.json-api</artifactId>
88+
<groupId>org.glassfish</groupId>
89+
<artifactId>javax.json</artifactId>
9090
<scope>test</scope>
9191
</dependency>
9292
<dependency>

‎grpc/metrics/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>
63-
<groupId>javax.json</groupId>
64-
<artifactId>javax.json-api</artifactId>
63+
<groupId>org.glassfish</groupId>
64+
<artifactId>javax.json</artifactId>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>

‎grpc/server/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@
8080
<artifactId>hamcrest-all</artifactId>
8181
<scope>test</scope>
8282
</dependency>
83-
<dependency>
84-
<groupId>javax.json</groupId>
85-
<artifactId>javax.json-api</artifactId>
86-
<scope>test</scope>
87-
</dependency>
8883
<dependency>
8984
<groupId>org.glassfish</groupId>
9085
<artifactId>javax.json</artifactId>

‎grpc/server/src/test/java/io/helidon/grpc/server/TracingIT.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import zipkin2.Span;
5050
import zipkin2.junit.ZipkinRule;
5151

52+
import static org.hamcrest.CoreMatchers.containsString;
5253
import static org.hamcrest.CoreMatchers.is;
5354
import static org.hamcrest.CoreMatchers.notNullValue;
5455
import static org.hamcrest.CoreMatchers.not;
@@ -119,11 +120,11 @@ public void shouldTraceMethodNameAndHeaders() {
119120

120121
String sTraces = listTraces.toString();
121122

122-
assertThat("The traces should include method name", sTraces.contains("grpc.method_name"));
123-
assertThat("The traces should include Echo method", sTraces.contains("EchoService/Echo"));
123+
assertThat("The traces should include method name", sTraces, containsString("grpc.method_name"));
124+
assertThat("The traces should include Echo method", sTraces, containsString("EchoService/Echo"));
124125

125-
assertThat("Tha traces should include headers", sTraces.contains("grpc.headers"));
126-
assertThat("Tha traces should include attributes", sTraces.contains("grpc.call_attributes"));
126+
assertThat("Tha traces should include headers", sTraces, containsString("grpc.headers"));
127+
assertThat("Tha traces should include attributes", sTraces, containsString("grpc.call_attributes"));
127128
}
128129

129130
@Test

‎health/health-checks/src/main/java9/module-info.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
2222
requires java.management;
2323

2424
requires static cdi.api;
25-
requires javax.inject;
25+
requires static javax.inject;
2626

2727
requires io.helidon.common;
2828
requires io.helidon.health;
29-
requires microprofile.config.api;
29+
requires static microprofile.config.api;
3030
requires microprofile.health.api;
3131

3232
exports io.helidon.health.checks;

‎health/health/src/main/java9/module-info.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
requires transitive microprofile.health.api;
2525
requires io.helidon.webserver;
2626
requires io.helidon.media.jsonp.server;
27-
requires org.glassfish.java.json;
27+
requires java.json;
2828

2929
exports io.helidon.health;
30+
provides org.eclipse.microprofile.health.spi.HealthCheckResponseProvider with io.helidon.health.HealthCheckResponseProviderImpl;
3031
}

0 commit comments

Comments
 (0)