Merge remote-tracking branch 'MSTR/master' into 2.0.6a

Signed-off-by: jansupol <[email protected]>

NOTICE.md

@@ -36,37 +36,18 @@ The project maintains the following source code repositories:
 
 This project leverages the following third party content.
 
-asm (5.0.3)
-
-* License: New BSD license
-
-atinject (Package javax.inject) (1.0)
+atinject (Package jakarta.inject) (1.0)
 
 * License: Apache License, 2.0
 
-cdi-api (1.2)
-
-* License: Apache-2.0
-
-ejb-api (3.2)
+cdi-api (2.0.2)
 
-* License: (CDDL-1.1 OR GPL-2.0+ OR GPL-2.0+ WITH Classpath-exception-2.0)
-* Project: https://javaee.github.io/glassfish/
-* Source:
-   http://search.maven.org/remotecontent?filepath=javax/ejb/javax.ejb-api/3.2/javax.ejb-api-3.2-sources.jar
+* License: Apache License, 2.0
 
 Google Guava (18.0)
 
 * License: Apache License, 2.0
 
-grizzly-framework (2.3.22)
-
-* License: (CDDL-1.1 OR GPL-2.0-only Or GPL-2.0 only With
-   Classpath-exception-2.0) AND LicenseRef-Public-Domain AND BSD-3-Clause AND
-   Apache-2.0
-* Project: https://javaee.github.io/grizzly/
-* Source: https://github.com/eclipse-ee4j/grizzly/
-
 hamcrest-core (1.1)
 
 * License: BSD-3-Clause
@@ -81,37 +62,18 @@ javassist (3.18)
 * Source:
    https://github.com/jboss-javassist/javassist/releases/tag/rel_3_18_1_ga
 
-javax.json-api (1.0)
-
-* License: CDDL-1.1 OR GPL-2.0 
-
-javax.servlet-api (3.1.0)
-
-* License: Apache-2.0 AND (CDDL-1.1 or GPL-2.0)
-
+
 javax.validation:validation-api:jar:1.1.0.Final (1.1.0)
 
 * License: Apache-2.0
 
-javax.websocket-api (1.1)
-
-* License: (CDDL-1.1 OR GPL-2.0-only OR GPL-2.0-only WITH
-   Classpath-exception-2.0) AND BSD-3-Clause AND Public Domain
-* Project: https://projects.eclipse.org/projects/ee4j.websocket
-* Source: https://github.com/eclipse-ee4j/websocket-api
-
-javax.ws.rs-api:2.0.1 (2.0.1)
-
-* License: (CDDL-1.1 OR GPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0) AND
-   Apache-2.0
-
 jline (2.14.5)
 
 * License: BSD-3-Clause
 * Project: https://github.com/jline/jline2
 * Source: https://github.com/jline/jline2
 
-junit (4.10)
+junit (4.13.2)
 
 * License: Common Public License 1.0
 

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 

archetypes/echo/src/main/resources/archetype-resources/pom.xml

@@ -15,11 +15,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <showWarnings>false</showWarnings>
+                    <fork>false</fork>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -28,7 +39,7 @@
             <dependency>
                 <groupId>org.glassfish.tyrus</groupId>
                 <artifactId>tyrus-bom</artifactId>
-                <version>\${tyrus.version}</version>
+                <version>${tyrus.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -50,6 +61,7 @@
         </dependency>
     </dependencies>
     <properties>
+        <java.version>1.8</java.version>
         <tyrus.version>${project.version}</tyrus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

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

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

pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
     </parent>
 
     <groupId>org.glassfish.tyrus</groupId>
@@ -76,6 +76,9 @@
     </developers>
 
     <contributors>
+        <contributor>
+            <name>Pavel Bucek</name>
+        </contributor>
         <contributor>
             <name>Martin Matula</name>
             <url>http://blog.alutam.com</url>

samples/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 Distribution License v. 1.0, which is available at