From 2b693262c4b4713768e8c41b47f233aadece2513 Mon Sep 17 00:00:00 2001
From: jansupol <jan.supol@oracle.com>
Date: Thu, 26 Oct 2023 16:20:27 +0200
Subject: [PATCH] Updated legal information

Signed-off-by: jansupol <jan.supol@oracle.com>
---
 NOTICE.md                                     | 48 ++-----------------
 .../resources/archetype-resources/pom.xml     | 18 +++++--
 bundles/websocket-ri-bundle/pom.xml           |  6 +--
 containers/glassfish/cdi/pom.xml              |  6 +--
 pom.xml                                       | 22 +++++----
 samples/cdi/pom.xml                           |  6 +--
 samples/shared-collection/pom.xml             |  4 +-
 7 files changed, 45 insertions(+), 65 deletions(-)

diff --git a/NOTICE.md b/NOTICE.md
index 9f250f52..11b5aec2 100644
--- a/NOTICE.md
+++ b/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
 
diff --git a/archetypes/echo/src/main/resources/archetype-resources/pom.xml b/archetypes/echo/src/main/resources/archetype-resources/pom.xml
index e69c259b..682032ae 100644
--- a/archetypes/echo/src/main/resources/archetype-resources/pom.xml
+++ b/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>
@@ -39,7 +50,7 @@
         <dependency>
             <groupId>jakarta.websocket</groupId>
             <artifactId>jakarta.websocket-api</artifactId>
-            <version>1.0</version>
+            <version>1.1.2</version>
         </dependency>
 
         <!-- adds dependency on grizzly based client and server container - just for tests -->
@@ -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>
diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
index 41400cd0..01ceac5a 100755
--- 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, 2017 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
@@ -38,8 +38,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
             <version>${cdi-api.version}</version>
         </dependency>
diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
index 2deb57ce..71177e4b 100755
--- a/containers/glassfish/cdi/pom.xml
+++ b/containers/glassfish/cdi/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2017 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
@@ -36,8 +36,8 @@
             <artifactId>tyrus-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/pom.xml b/pom.xml
index 27f60a3f..930e1d35 100644
--- a/pom.xml
+++ b/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>
@@ -68,8 +68,8 @@
 
     <developers>
         <developer>
-            <id>roman_grigoriadi</id>
-            <name>Roman Grigoriadi</name>
+            <id>jan_supol</id>
+            <name>Jan Supol</name>
             <organization>Oracle Corporation</organization>
             <organizationUrl>http://www.oracle.com</organizationUrl>
             <roles>
@@ -79,6 +79,9 @@
     </developers>
 
     <contributors>
+        <contributor>
+            <name>Pavel Bucek</name>
+        </contributor>
         <contributor>
             <name>Martin Matula</name>
             <url>http://blog.alutam.com</url>
@@ -95,16 +98,19 @@
         <contributor>
             <name>Petr Janouch</name>
         </contributor>
+        <contributor>
+            <name>Roman Grigoriadi</name>
+        </contributor>
     </contributors>
 
     <properties>
-        <websocket-api.version>1.1.1</websocket-api.version>
+        <websocket-api.version>1.1.2</websocket-api.version>
         <!--<websocket.api.build_number>18</websocket.api.build_number>-->
 
         <servlet.api.version>4.0.4</servlet.api.version>
         <grizzly.version>2.4.4</grizzly.version>
         <javax.ejb-api.version>3.2.6</javax.ejb-api.version>
-        <cdi-api.version>1.2</cdi-api.version>
+        <cdi-api.version>2.0.2</cdi-api.version>
         <json-api.version>1.1.6</json-api.version>
         <json-impl.version>1.1.6</json-impl.version>
         <spring.boot.version>2.6.7</spring.boot.version>
@@ -123,7 +129,7 @@
         <packages.private>org.glassfish.*</packages.private>
 
         <!-- Non Final properties for impl jar -->
-        <apijar.bundle.version>1.1</apijar.bundle.version>
+        <apijar.bundle.version>1.1.2</apijar.bundle.version>
         <impljar.bundle.specversion>${spec_version}.99.b${build_number}</impljar.bundle.specversion>
         <impljar.maven.version>${new_impl_version}-b${build_number}</impljar.maven.version>
         <impljar.bundle.version>${spec_version}.99.b${build_number}</impljar.bundle.version>
@@ -491,8 +497,8 @@
                 <version>${javax.ejb-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.enterprise</groupId>
-                <artifactId>cdi-api</artifactId>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-api</artifactId>
                 <version>${cdi-api.version}</version>
             </dependency>
             <dependency>
diff --git a/samples/cdi/pom.xml b/samples/cdi/pom.xml
index 3152a7ba..3e81f7e7 100755
--- a/samples/cdi/pom.xml
+++ b/samples/cdi/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    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 Distribution License v. 1.0, which is available at
@@ -31,8 +31,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/samples/shared-collection/pom.xml b/samples/shared-collection/pom.xml
index 3f3daa9c..cdc5513e 100644
--- a/samples/shared-collection/pom.xml
+++ b/samples/shared-collection/pom.xml
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>2.1.2</version>
+            <version>2.1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-sse</artifactId>
-            <version>2.19</version>
+            <version>2.40</version>
             <scope>provided</scope>
         </dependency>