Skip to content

Commit fa0bdda

Browse files
authored
Fix for Jersey native image. (helidon-io#2811)
* Fix for Jersey native image. * Jersey client is part of Jersey server, so should not be added in test scope
1 parent 483e9f2 commit fa0bdda

5 files changed

Lines changed: 8 additions & 30 deletions

File tree

jersey/client/src/main/resources/META-INF/native-image/io.helidon.jersey/helidon-jersey-client/native-image.properties

Lines changed: 0 additions & 17 deletions
This file was deleted.

microprofile/grpc/metrics/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@
8585
<artifactId>mockito-core</artifactId>
8686
<scope>test</scope>
8787
</dependency>
88-
<dependency>
89-
<groupId>org.glassfish.jersey.core</groupId>
90-
<artifactId>jersey-client</artifactId>
91-
<scope>test</scope>
92-
</dependency>
9388
<dependency>
9489
<groupId>io.helidon.microprofile.tests</groupId>
9590
<artifactId>helidon-microprofile-tests-junit5</artifactId>

webserver/jersey/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,13 @@
5858
<groupId>io.netty</groupId>
5959
<artifactId>netty-buffer</artifactId>
6060
</dependency>
61-
<dependency>
62-
<groupId>io.helidon.webserver</groupId>
63-
<artifactId>helidon-webserver-test-support</artifactId>
64-
<scope>test</scope>
65-
</dependency>
6661
<dependency>
6762
<groupId>io.helidon.jersey</groupId>
6863
<artifactId>helidon-jersey-client</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>io.helidon.webserver</groupId>
67+
<artifactId>helidon-webserver-test-support</artifactId>
6968
<scope>test</scope>
7069
</dependency>
7170
<dependency>
@@ -98,7 +97,6 @@
9897
<artifactId>hamcrest-all</artifactId>
9998
<scope>test</scope>
10099
</dependency>
101-
102100
</dependencies>
103101

104102
<build>

webserver/jersey/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
requires transitive java.ws.rs;
2424
requires transitive io.opentracing.api;
2525
requires transitive io.helidon.jersey.server;
26+
requires transitive io.helidon.jersey.client;
2627

2728
requires io.helidon.common.context;
2829
requires io.helidon.common.mapper;

webserver/jersey/src/main/resources/META-INF/native-image/io.helidon.webserver/helidon-webserver-jersey/native-image.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2019, 2021 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.
@@ -14,4 +14,5 @@
1414
# limitations under the License.
1515
#
1616

17-
Args=-H:EnableURLProtocols=http,https
17+
Args=-H:EnableURLProtocols=http,https \
18+
--initialize-at-run-time=org.glassfish.jersey.client.internal.HttpUrlConnector

0 commit comments

Comments
 (0)