Merge pull request #861 from jansupol/20to21a

Merge 2.0.x -> 2.x
eclipse-ee4j · Nov 1, 2023 · a780d46 · a780d46
2 parents c0c732c + 4b4d38c
commit a780d46
Show file tree

Hide file tree

Showing 21 changed files with 245 additions and 149 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -51,6 +51,11 @@ jakarta.xml.bind-api Version: 3.0
 * License: BSD-3-Clause
 * Copyright (c) 2017, 2018 Oracle and/or its affiliates
 
+jline (2.14.5)
+* License: BSD-3-Clause
+* Project: https://github.com/jline/jline2
+* Source: https://github.com/jline/jline2
+
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ Building Tyrus can be done using `mvn clean install`, but sometimes (such as for
 
 ## Links
 
+- Documentation: https://eclipse-ee4j.github.io/tyrus/
 - Website: https://projects.eclipse.org/projects/ee4j.tyrus
 - Issues tracker: https://github.com/eclipse-ee4j/tyrus/issues
 - Mailing list: https://accounts.eclipse.org/mailing-list/tyrus-dev 

diff --git a/archetypes/echo/src/main/resources/archetype-resources/pom.xml b/archetypes/echo/src/main/resources/archetype-resources/pom.xml
@@ -15,19 +15,20 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <inherited>true</inherited>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <showWarnings>false</showWarnings>
+                    <fork>false</fork>
                 </configuration>
             </plugin>
         </plugins>
@@ -66,6 +67,7 @@
     </dependencies>
     <properties>
         <websocket-api.version>2.1.0</websocket-api.version>
+        <java.version>11</java.version>
         <tyrus.version>${project.version}</tyrus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    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
@@ -125,7 +125,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>

diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    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
@@ -176,7 +176,7 @@
                         <phase>package</phase>
                         <!-- append to the packaging phase. -->
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                             <!-- goals == mojos -->
                         </goals>
                     </execution>

diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    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/bundles/websocket-risrc-licensee/pom.xml b/bundles/websocket-risrc-licensee/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2020 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
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-risrc-licensee</artifactId>
@@ -103,7 +103,7 @@
                         <phase>package</phase>
                         <!-- append to the packaging phase. -->
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                             <!-- goals == mojos -->
                         </goals>
                     </execution>

diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    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/docs/pom.xml b/docs/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    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
@@ -44,7 +44,7 @@
                 <executions>
                     <execution>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <echo message="Preparing char entities" />
                                 <mkdir dir="${src.dir}" />
                                 <copy todir="${src.dir}">
@@ -53,7 +53,7 @@
                                 <replace file="${src.dir}/tyrus.ent" token="$version" value="${project.version}" />
                                 <replace file="${src.dir}/tyrus.ent" token="$repository" value="${javanet.repository.id}" />
                                 <replace file="${src.dir}/tyrus.ent" token="$websocket-api-version" value="${websocket-api.version}" />
-                            </tasks>
+                            </target>
                         </configuration>
                         <id>process-entities</id>
                         <phase>package</phase>
@@ -137,7 +137,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>

diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2014, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 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
@@ -28,6 +28,12 @@
     <packaging>bundle</packaging>
     <name>Tyrus Extension - Per Message Deflate</name>
 
+    <properties>
+        <argLine>
+            --add-reads org.glassfish.tyrus.ext.extension.deflate=org.glassfish.tyrus.client
+        </argLine>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>

diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml
@@ -28,6 +28,12 @@
     <artifactId>tyrus-monitoring-jmx</artifactId>
     <name>Tyrus Monitoring JMX</name>
 
+    <properties>
+        <argLine>
+            --add-reads org.glassfish.tyrus.ext.monitoring.jmx=org.glassfish.tyrus.client
+        </argLine>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>