From 438b10ca214703f69e4c6bca0815497722c800bf Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@omnifish.ee>
Date: Tue, 5 Mar 2024 00:28:33 +0100
Subject: [PATCH 1/2] Update dependencies to Jakarta EE 11 ones

Also update copyright dates

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
---
 api/pom.xml |  4 ++--
 pom.xml     | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index ce18cb20..99de5388 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2024 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
@@ -164,7 +164,7 @@
                             <header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
                             <bottom><![CDATA[
 Comments to: <a href="mailto:cu-dev@eclipse.org">cu-dev@eclipse.org</a>.<br>
-Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
+Copyright &#169; 2020, 2024 Eclipse Foundation. All rights reserved.<br>
 Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
                             </bottom>
                             <docfilessubdirs>true</docfilessubdirs>
diff --git a/pom.xml b/pom.xml
index 3d25beb8..2756d5e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+  ~ Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
   ~ 
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0, which is available at
@@ -78,13 +78,12 @@
         <junit5.version>5.10.2</junit5.version>
         <arquillian.version>1.8.0.Final</arquillian.version>
 
-        <!-- TODO update for Jakarta 11 -->
-        <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
+        <jakarta.servlet.version>6.1.0-M2</jakarta.servlet.version>
         <jakarta.ejb.version>4.0.1</jakarta.ejb.version>
-        <jakarta.jsp.version>3.1.1</jakarta.jsp.version>
-        <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
-        <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
-        <jakarta.cdi.version>4.0.1</jakarta.cdi.version>
+        <jakarta.jsp.version>4.0.0-M2</jakarta.jsp.version>
+        <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
+        <jakarta.interceptor.version>2.2.0</jakarta.interceptor.version>
+        <jakarta.cdi.version>4.1.0</jakarta.cdi.version>
     </properties>
 
     <dependencyManagement>

From d1899ee8813d20e2d458e7b03cfc751e4aa8b278 Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@omnifish.ee>
Date: Tue, 5 Mar 2024 01:18:36 +0100
Subject: [PATCH 2/2] Using staging repo to build

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d27ded89..3d07e9ff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,4 +31,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B -Pstaging package --file pom.xml