Skip to content

Commit 4af14dd

Browse files
senivamsenivam
committed
Adjust build profiles to the current JDK
Signed-off-by: Maxim Nesen <[email protected]>
1 parent 5e08d17 commit 4af14dd

File tree

12 files changed

+42
-207
lines changed

12 files changed

+42
-207
lines changed

‎connectors/netty-connector/pom.xml‎

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
<properties>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37+
<surefire.coverage.argline>--add-opens java.base/java.lang=ALL-UNNAMED
38+
--add-opens java.base/java.lang.reflect=ALL-UNNAMED</surefire.coverage.argline>
3739
</properties>
3840

3941
<dependencies>
@@ -81,44 +83,4 @@
8183
</plugins>
8284
</build>
8385

84-
<profiles>
85-
<profile>
86-
<id>JettyExclude</id>
87-
<activation>
88-
<jdk>(1.8,17)</jdk>
89-
</activation>
90-
<build>
91-
<plugins>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-compiler-plugin</artifactId>
95-
<configuration>
96-
<testExcludes>
97-
<testExclude>org/glassfish/jersey/netty/connector/HugeHeaderTest.java</testExclude>
98-
</testExcludes>
99-
</configuration>
100-
</plugin>
101-
</plugins>
102-
</build>
103-
</profile>
104-
<profile>
105-
<id>InaccessibleObjectException</id>
106-
<activation><jdk>[12,)</jdk></activation>
107-
<build>
108-
<plugins>
109-
<plugin>
110-
<groupId>org.apache.maven.plugins</groupId>
111-
<artifactId>maven-surefire-plugin</artifactId>
112-
<configuration>
113-
<argLine>
114-
--add-opens java.base/java.lang=ALL-UNNAMED
115-
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
116-
</argLine>
117-
</configuration>
118-
</plugin>
119-
</plugins>
120-
</build>
121-
</profile>
122-
</profiles>
123-
12486
</project>

‎connectors/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,4 @@
7979
</dependency>
8080
</dependencies>
8181

82-
<profiles>
83-
<profile>
84-
<id>HelidonConnector</id>
85-
<!-- TODO: activate after Helidon is jakartified -->
86-
<!--<activation>
87-
<jdk>11</jdk>
88-
</activation>-->
89-
<modules>
90-
<module>helidon-connector</module>
91-
</modules>
92-
</profile>
93-
</profiles>
9482
</project>

‎examples/osgi-helloworld-webapp/pom.xml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,15 @@
2525
<name>jersey-examples-osgi-helloworld-webapp</name>
2626
<packaging>pom</packaging>
2727

28+
<modules>
29+
<module>war-bundle</module>
30+
<module>functional-test</module>
31+
<module>lib-bundle</module>
32+
<module>additional-bundle</module>
33+
<module>alternate-version-bundle</module>
34+
</modules>
35+
2836
<profiles>
29-
<profile>
30-
<id>securityOn</id>
31-
<activation>
32-
<jdk>[11,24)</jdk>
33-
</activation>
34-
<modules>
35-
<module>war-bundle</module>
36-
<module>functional-test</module>
37-
<module>lib-bundle</module>
38-
<module>additional-bundle</module>
39-
<module>alternate-version-bundle</module>
40-
</modules>
41-
</profile>
4237
<profile>
4338
<id>pre-release</id>
4439
<build>

‎ext/microprofile/mp-config/pom.xml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@
6363
<scope>test</scope>
6464
</dependency>
6565

66+
<dependency>
67+
<groupId>io.smallrye.config</groupId>
68+
<artifactId>smallrye-config</artifactId>
69+
<version>${smallrye.config.version}</version>
70+
<scope>test</scope>
71+
</dependency>
72+
6673
<dependency>
6774
<groupId>org.junit.jupiter</groupId>
6875
<artifactId>junit-jupiter</artifactId>
@@ -100,20 +107,6 @@
100107
</build>
101108

102109
<profiles>
103-
<profile>
104-
<id>smallrye-dependency</id>
105-
<activation>
106-
<jdk>[11,)</jdk>
107-
</activation>
108-
<dependencies>
109-
<dependency>
110-
<groupId>io.smallrye.config</groupId>
111-
<artifactId>smallrye-config</artifactId>
112-
<version>${smallrye.config.version}</version>
113-
<scope>test</scope>
114-
</dependency>
115-
</dependencies>
116-
</profile>
117110
<profile>
118111
<id>helidon-config-dependency</id>
119112
<activation>

‎incubator/declarative-linking/pom.xml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@
3535
Jersey support for declarative hyperlinking.
3636
</description>
3737

38+
<properties>
39+
<surefire.coverage.argline>
40+
--add-opens java.base/java.util.zip=ALL-UNNAMED
41+
--add-opens java.base/java.util=ALL-UNNAMED
42+
</surefire.coverage.argline>
43+
</properties>
44+
3845
<dependencies>
3946
<dependency>
4047
<groupId>org.glassfish.jersey.core</groupId>
@@ -123,24 +130,6 @@
123130
</dependency>
124131
</dependencies>
125132
</profile>
126-
<profile>
127-
<id>InaccessibleObjectException</id>
128-
<activation><jdk>[16,)</jdk></activation>
129-
<build>
130-
<plugins>
131-
<plugin>
132-
<groupId>org.apache.maven.plugins</groupId>
133-
<artifactId>maven-surefire-plugin</artifactId>
134-
<configuration>
135-
<argLine>
136-
--add-opens java.base/java.util.zip=ALL-UNNAMED
137-
--add-opens java.base/java.util=ALL-UNNAMED
138-
</argLine>
139-
</configuration>
140-
</plugin>
141-
</plugins>
142-
</build>
143-
</profile>
144133
</profiles>
145134

146135
<build>

‎tests/e2e-jdk-specifics/pom.xml‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232

3333
<description>Jersey E2E tests for testing JDK 17+ specifics</description>
3434

35+
<properties>
36+
<http.patch.addopens>--add-opens java.base/java.net=ALL-UNNAMED</http.patch.addopens>
37+
</properties>
38+
3539
<build>
3640
<plugins>
3741
<plugin>
@@ -74,25 +78,4 @@
7478
</dependency>
7579
</dependencies>
7680

77-
<profiles>
78-
<profile>
79-
<id>jdk15-</id>
80-
<activation>
81-
<jdk>[8, 16)</jdk>
82-
</activation>
83-
<properties>
84-
<http.patch.addopens> </http.patch.addopens>
85-
</properties>
86-
</profile>
87-
<profile>
88-
<id>jdk16+</id>
89-
<activation>
90-
<jdk>[16, )</jdk>
91-
</activation>
92-
<properties>
93-
<http.patch.addopens>--add-opens java.base/java.net=ALL-UNNAMED</http.patch.addopens>
94-
</properties>
95-
</profile>
96-
</profiles>
97-
9881
</project>

‎tests/e2e-server/pom.xml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -230,34 +230,6 @@
230230
</dependencies>
231231

232232
<profiles>
233-
<profile>
234-
<id>JettyTestExclude</id>
235-
<activation>
236-
<jdk>[11,17)</jdk>
237-
</activation>
238-
<build>
239-
<plugins>
240-
<plugin>
241-
<groupId>org.apache.maven.plugins</groupId>
242-
<artifactId>maven-compiler-plugin</artifactId>
243-
<executions>
244-
<execution>
245-
<id>default-testCompile</id>
246-
<phase>test-compile</phase>
247-
<configuration>
248-
<testExcludes>
249-
<testExclude>org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java</testExclude>
250-
</testExcludes>
251-
</configuration>
252-
<goals>
253-
<goal>testCompile</goal>
254-
</goals>
255-
</execution>
256-
</executions>
257-
</plugin>
258-
</plugins>
259-
</build>
260-
</profile>
261233
<profile>
262234
<id>xdk</id>
263235
<properties>

‎tests/integration/jersey-5796/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>project</artifactId>
2525
<groupId>org.glassfish.jersey.tests.integration</groupId>
26-
<version>3.1.99-SNAPSHOT</version>
26+
<version>4.0.99-SNAPSHOT</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

‎tests/integration/microprofile/config/helidon/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@
5757
<type>pom</type>
5858
<scope>test</scope>
5959
</dependency>
60+
<dependency>
61+
<groupId>io.smallrye.config</groupId>
62+
<artifactId>smallrye-config</artifactId>
63+
<version>${smallrye.config.version}</version>
64+
<scope>test</scope>
65+
</dependency>
6066
</dependencies>
6167

6268

@@ -79,20 +85,6 @@
7985
</build>
8086

8187
<profiles>
82-
<profile>
83-
<id>smallrye-dependency</id>
84-
<activation>
85-
<jdk>[11,)</jdk>
86-
</activation>
87-
<dependencies>
88-
<dependency>
89-
<groupId>io.smallrye.config</groupId>
90-
<artifactId>smallrye-config</artifactId>
91-
<version>${smallrye.config.version}</version>
92-
<scope>test</scope>
93-
</dependency>
94-
</dependencies>
95-
</profile>
9688
<profile>
9789
<id>helidon-config-dependency</id>
9890
<activation>

‎tests/integration/microprofile/rest-client/pom.xml‎

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -67,46 +67,15 @@
6767
<artifactId>jersey-weld2-se</artifactId>
6868
<scope>test</scope>
6969
</dependency>
70+
<dependency>
71+
<groupId>io.smallrye.config</groupId>
72+
<artifactId>smallrye-config</artifactId>
73+
<version>${smallrye.config.version}</version>
74+
<scope>test</scope>
75+
</dependency>
7076
</dependencies>
7177

7278
<profiles>
73-
<profile>
74-
<id>TestExclude</id>
75-
<activation>
76-
<jdk>1.8</jdk>
77-
</activation>
78-
<build>
79-
<plugins>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-compiler-plugin</artifactId>
83-
<configuration>
84-
<testExcludes>
85-
<testExclude>org/glassfish/jersey/test/microprofile/restclient/ConsumesAndProducesTest.java</testExclude>
86-
<testExclude>org/glassfish/jersey/test/microprofile/restclient/ConnectorTest.java</testExclude>
87-
<testExclude>org/glassfish/jersey/test/microprofile/restclient/InboundHeadersProviderTest.java</testExclude>
88-
<testExclude>org/glassfish/jersey/test/microprofile/restclient/RestClientModelTest.java</testExclude>
89-
<testExclude>org/glassfish/jersey/restclient/PathParamTest.java</testExclude>
90-
</testExcludes>
91-
</configuration>
92-
</plugin>
93-
</plugins>
94-
</build>
95-
</profile>
96-
<profile>
97-
<id>smallrye-dependency</id>
98-
<activation>
99-
<jdk>[11,)</jdk>
100-
</activation>
101-
<dependencies>
102-
<dependency>
103-
<groupId>io.smallrye.config</groupId>
104-
<artifactId>smallrye-config</artifactId>
105-
<version>${smallrye.config.version}</version>
106-
<scope>test</scope>
107-
</dependency>
108-
</dependencies>
109-
</profile>
11079
<profile>
11180
<id>securityOff</id>
11281
<activation>

0 commit comments

Comments
 (0)