From 2d64e28a3bc2c9d47e6692d851eab121b31f6638 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 27 Jun 2024 13:20:40 +0200
Subject: [PATCH] Integrate latest dependencies

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .github/workflows/codeql-analysis.yml |  2 +-
 .github/workflows/maven.yml           |  2 +-
 wsit/boms/bom-ext/pom.xml             | 22 +++++++++++-----------
 wsit/boms/bom/pom.xml                 |  6 +++---
 wsit/bundles/webservices-osgi/pom.xml |  3 ++-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6248a068..5e4d833c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 21
         cache: maven
 
     # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3c8f67b1..1e5adf4c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,7 +22,7 @@ jobs:
       jdk: ${{ steps.build.outputs.jdk }}
     strategy:
       matrix:
-        java_version: [ 17 ]
+        java_version: [ 21 ]
 
     steps:
       - name: Checkout for build
diff --git a/wsit/boms/bom-ext/pom.xml b/wsit/boms/bom-ext/pom.xml
index 7d60effb..70c59e4e 100644
--- a/wsit/boms/bom-ext/pom.xml
+++ b/wsit/boms/bom-ext/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2024 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
@@ -28,27 +28,27 @@
     <description>Metro Web Services Stack Dependency POM for Metro-CS</description>
 
     <properties>
-        <authentication-api.version>3.0.0</authentication-api.version>
+        <authentication-api.version>3.1.0</authentication-api.version>
         <connector-api.version>2.1.0</connector-api.version>
         <ejb-api.version>4.0.1</ejb-api.version>
         <transaction-api.version>2.0.1</transaction-api.version>
-        <interceptor-api.version>2.1.0</interceptor-api.version>
-        <cdi-api.version>4.0.1</cdi-api.version>
+        <interceptor-api.version>2.2.0</interceptor-api.version>
+        <cdi-api.version>4.1.0</cdi-api.version>
         <inject-api.version>2.0.1</inject-api.version>
-        <el-api.version>5.0.1</el-api.version>
-        <santuario.version>4.0.0</santuario.version>
-        <commons-codec.version>1.16.0</commons-codec.version>
+        <el-api.version>6.0.0</el-api.version>
+        <santuario.version>4.0.2</santuario.version>
+        <commons-codec.version>1.17.0</commons-codec.version>
 
         <stax-utils.version>20070216</stax-utils.version>
 
-        <hk2.version>3.0.5</hk2.version>
-        <grizzly.version>4.0.1</grizzly.version>
-        <tomcat.coyote.version>10.1.15</tomcat.coyote.version>
+        <hk2.version>3.1.0</hk2.version>
+        <grizzly.version>4.1.0-M1</grizzly.version>
+        <tomcat.coyote.version>11.0.0-M21</tomcat.coyote.version>
         <graal.sdk.version>22.3.3</graal.sdk.version>
 
         <junit.version>4.13.2</junit.version>
 
-        <jaxws.home.uri>http://eclipse-ee4j.github.io/metro-jax-ws</jaxws.home.uri>
+        <jaxws.home.uri>https://eclipse-ee4j.github.io/metro-jax-ws</jaxws.home.uri>
     </properties>
 
     <dependencyManagement>
diff --git a/wsit/boms/bom/pom.xml b/wsit/boms/bom/pom.xml
index a0ba1764..f4214248 100644
--- a/wsit/boms/bom/pom.xml
+++ b/wsit/boms/bom/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2024 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
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
         <relativePath/>
     </parent>
 
@@ -53,7 +53,7 @@
     </developers>
 
     <properties>
-        <jaxws.ri.version>4.0.2</jaxws.ri.version>
+        <jaxws.ri.version>4.0.3</jaxws.ri.version>
     </properties>
 
     <dependencyManagement>
diff --git a/wsit/bundles/webservices-osgi/pom.xml b/wsit/bundles/webservices-osgi/pom.xml
index 123da958..d4354d9f 100644
--- a/wsit/bundles/webservices-osgi/pom.xml
+++ b/wsit/bundles/webservices-osgi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997, 2024 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
@@ -179,6 +179,7 @@
                                     *
                                 </Export-Package>
                                 <Import-Package>
+                                    jakarta.annotation*;version=!,
                                     com.sun.enterprise.webservice;resolution:=optional,
                                     com.sun.net.httpserver;resolution:=optional,
                                     com.sun.security.auth.callback;resolution:=optional,