CP year
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml
index e2b3e89..0fdeca1 100644
--- a/connectors/jdk-connector/pom.xml
+++ b/connectors/jdk-connector/pom.xml
@@ -105,6 +105,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
+ <!-- Excluding TLS1* tests -->
<excludes>
<exclude>**/SslFilterTLS1Test.java</exclude>
<exclude>**/SslFilterTLS11Test.java</exclude>
diff --git a/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpsServerTest.java b/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpsServerTest.java
index 7c2473e..51385db 100644
--- a/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpsServerTest.java
+++ b/containers/jdk-http/src/test/java/org/glassfish/jersey/jdkhttp/JdkHttpsServerTest.java
@@ -228,4 +228,4 @@
server = null;
}
}
-}
\ No newline at end of file
+}
diff --git a/containers/jersey-servlet-core/src/main/java/module-info.java b/containers/jersey-servlet-core/src/main/java/module-info.java
index fcf91bb..37081a7 100644
--- a/containers/jersey-servlet-core/src/main/java/module-info.java
+++ b/containers/jersey-servlet-core/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/core-client/pom.xml b/core-client/pom.xml
index 668f70b..24d981c 100644
--- a/core-client/pom.xml
+++ b/core-client/pom.xml
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
-<!-- <inherited>false</inherited>-->
<executions>
<execution>
<id>default-compile</id>
@@ -57,8 +56,6 @@
<!-- Do not warn about using sun.misc.Unsafe -->
<XDignore.symbol.file/>
</compilerArguments>
-<!-- <showWarnings>false</showWarnings>-->
-<!-- <fork>false</fork>-->
</configuration>
</execution>
</executions>
@@ -190,4 +187,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/RuntimeDelegateImplTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/RuntimeDelegateImplTest.java
index df71374..dfd0d64 100644
--- a/core-server/src/test/java/org/glassfish/jersey/server/internal/RuntimeDelegateImplTest.java
+++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/RuntimeDelegateImplTest.java
@@ -109,7 +109,6 @@
// when
final SeBootstrap.Configuration configuration = configurationBuilder.property("property", "value").build();
- // then
assertThat(configuration, is(notNullValue()));
assertTrue(configuration.hasProperty("property"));
assertThat(configuration.property("property"), is("value"));
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index 4326316..4fa6f5b 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -132,7 +132,6 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
-<!-- <scope>test</scope>-->
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
index 22d6d50..6a868c6 100644
--- a/ext/bean-validation/pom.xml
+++ b/ext/bean-validation/pom.xml
@@ -136,7 +136,7 @@
</dependency>
- <!-- java-el related dependencies are in scope "provided" in hibernate-validator -->
+ <!-- jakarta-el related dependencies are in scope "provided" in hibernate-validator -->
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
diff --git a/ext/cdi/jersey-cdi1x/pom.xml b/ext/cdi/jersey-cdi1x/pom.xml
index afc33a7..654f80a 100644
--- a/ext/cdi/jersey-cdi1x/pom.xml
+++ b/ext/cdi/jersey-cdi1x/pom.xml
@@ -79,6 +79,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <!-- Felix plugin -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/ext/metainf-services/pom.xml b/ext/metainf-services/pom.xml
index 60a142d..19d3c09 100644
--- a/ext/metainf-services/pom.xml
+++ b/ext/metainf-services/pom.xml
@@ -62,8 +62,6 @@
<XDignore.symbol.file />
</compilerArguments>
<compilerArgs>
-<!-- <arg>--module-source-path=${build.sourceDirectory}</arg>-->
-<!-- <arg>--patch-module=org.glassfish.jersey.ext.metainf.services=${build.sourceDirectory}</arg>-->
<arg>-Xdiags:verbose</arg>
</compilerArgs>
<showWarnings>false</showWarnings>
diff --git a/ext/microprofile/mp-config/src/main/java/module-info.java b/ext/microprofile/mp-config/src/main/java/module-info.java
index 3019dc4..13bc0bf 100644
--- a/ext/microprofile/mp-config/src/main/java/module-info.java
+++ b/ext/microprofile/mp-config/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml
index 0bf5d0d..eee1e15 100644
--- a/ext/microprofile/mp-rest-client/pom.xml
+++ b/ext/microprofile/mp-rest-client/pom.xml
@@ -106,6 +106,7 @@
<artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <!-- Felix plugin -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml
index 28f5404..f07882d 100644
--- a/incubator/cdi-inject-weld/pom.xml
+++ b/incubator/cdi-inject-weld/pom.xml
@@ -115,6 +115,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <!-- Felix plugin -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index 57e8d83..02fe6ea 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -90,14 +90,6 @@
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
<scope>test</scope>
-<!--
- <exclusions>
- <exclusion>
- <groupId>com.vaadin.external.google</groupId>
- <artifactId>android-json</artifactId>
- </exclusion>
- </exclusions>
--->
</dependency>
</dependencies>
diff --git a/incubator/kryo/src/main/java/module-info.java b/incubator/kryo/src/main/java/module-info.java
index b342a473d..b9c7384 100644
--- a/incubator/kryo/src/main/java/module-info.java
+++ b/incubator/kryo/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/incubator/open-tracing/pom.xml b/incubator/open-tracing/pom.xml
index 9d927e2..208a855 100644
--- a/incubator/open-tracing/pom.xml
+++ b/incubator/open-tracing/pom.xml
@@ -85,6 +85,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <!-- Felix plugin -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/inject/hk2/pom.xml b/inject/hk2/pom.xml
index b742910..a070c3b 100644
--- a/inject/hk2/pom.xml
+++ b/inject/hk2/pom.xml
@@ -107,6 +107,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <!-- Felix plugin -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml
index a54232e..088b4a0 100644
--- a/media/json-binding/pom.xml
+++ b/media/json-binding/pom.xml
@@ -105,6 +105,7 @@
</dependencies>
<properties>
+ <!-- JPMS relatest test config -->
<surefire.coverage.argline>--add-modules=ALL-MODULE-PATH</surefire.coverage.argline>
</properties>
</project>
diff --git a/media/json-jackson/pom.xml b/media/json-jackson/pom.xml
index f056729..6af11d1 100644
--- a/media/json-jackson/pom.xml
+++ b/media/json-jackson/pom.xml
@@ -108,14 +108,6 @@
<version>${project.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.fasterxml.jackson.jaxrs</groupId>-->
- <!--<artifactId>jackson-jaxrs-base</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>com.fasterxml.jackson.jaxrs</groupId>-->
- <!--<artifactId>jackson-jaxrs-json-provider</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
diff --git a/media/json-jettison/pom.xml b/media/json-jettison/pom.xml
index 93c6b79..2aa5447 100644
--- a/media/json-jettison/pom.xml
+++ b/media/json-jettison/pom.xml
@@ -61,9 +61,6 @@
<Export-Package>org.glassfish.jersey.jettison.*</Export-Package>
- <!--<Import-Package>
- com.sun.xml.bind.annotation;resolution:=optional,com.sun.xml.bind.v2.*;resolution:=optional, *
- </Import-Package>-->
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
diff --git a/media/json-processing/src/test/java/module-info.java b/media/json-processing/src/test/java/module-info.java
index 67f5b5d..47b248e 100644
--- a/media/json-processing/src/test/java/module-info.java
+++ b/media/json-processing/src/test/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableClientTest.java b/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableClientTest.java
index 76177b9..0cbe9e3 100644
--- a/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableClientTest.java
+++ b/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableClientTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableServerTest.java b/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableServerTest.java
index 64887a6..254f33c 100644
--- a/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableServerTest.java
+++ b/media/json-processing/src/test/java/org/glassfish/jersey/jsonp/test/JsonProcessingAutoDiscoverableServerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml
index ddc8069..5395012 100644
--- a/media/moxy/pom.xml
+++ b/media/moxy/pom.xml
@@ -47,7 +47,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
-
+ <!-- Felix plugin -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/media/sse/pom.xml b/media/sse/pom.xml
index 5615faf..d7cd94c 100644
--- a/media/sse/pom.xml
+++ b/media/sse/pom.xml
@@ -89,8 +89,6 @@
</plugins>
</build>
<properties>
- <surefire.coverage.argline>
- --add-modules=ALL-MODULE-PATH
- </surefire.coverage.argline>
+ <surefire.coverage.argline>--add-modules=ALL-MODULE-PATH</surefire.coverage.argline>
</properties>
</project>
diff --git a/test-framework/core/src/main/java/module-info.java b/test-framework/core/src/main/java/module-info.java
index 5db5966..c355860 100644
--- a/test-framework/core/src/main/java/module-info.java
+++ b/test-framework/core/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/integration/cdi-integration/cdi-manually-bound/src/main/java/module-info.java b/tests/integration/cdi-integration/cdi-manually-bound/src/main/java/module-info.java
index 0c44271..9425a7c 100644
--- a/tests/integration/cdi-integration/cdi-manually-bound/src/main/java/module-info.java
+++ b/tests/integration/cdi-integration/cdi-manually-bound/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/integration/cdi-integration/cdi-test-webapp/src/main/java/module-info.java b/tests/integration/cdi-integration/cdi-test-webapp/src/main/java/module-info.java
index f82a4b7..d2987e2 100644
--- a/tests/integration/cdi-integration/cdi-test-webapp/src/main/java/module-info.java
+++ b/tests/integration/cdi-integration/cdi-test-webapp/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java b/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java
index bb006a5..fd8b025 100644
--- a/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java
+++ b/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
