From 93a8fb5d9ce55fd8a6110e84a89fb4dff4869ff2 Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <mateusz.gajewski@gmail.com>
Date: Tue, 6 Jun 2023 17:06:26 +0200
Subject: [PATCH] Add jakarta dependency definitions

This defines Jakarta dependencies to use by downstream projects:

- rs.ws-api
- xml.bind-api
- servlet-api
- annotation-api
---
 CHANGES.md      |  4 ++++
 airbase/pom.xml | 42 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 262b515a3..8d4c2077c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+Airbase 141
+
+* Add jakarta dependencies
+
 Airbase 140
 
 * Pass `user.timezone` in tests as a system property, not as a JVM argument
diff --git a/airbase/pom.xml b/airbase/pom.xml
index 0161ffe63..99bb6cf99 100644
--- a/airbase/pom.xml
+++ b/airbase/pom.xml
@@ -200,9 +200,9 @@
         <dep.assertj-core.version>3.24.2</dep.assertj-core.version>
         <dep.bval.version>2.0.6</dep.bval.version>
         <dep.guava.version>32.0.0-jre</dep.guava.version>
-        <dep.guice.version>6.0.0</dep.guice.version>
+        <dep.guice.version>7.0.0</dep.guice.version>
         <dep.jackson.version>2.15.0</dep.jackson.version>
-        <dep.javax-inject.version>1</dep.javax-inject.version>
+        <dep.jakarta-inject.version>2.0.1</dep.jakarta-inject.version>
         <dep.javax-validation.version>2.0.1.Final</dep.javax-validation.version>
         <dep.jmh.version>1.36</dep.jmh.version>
         <dep.jmxutils.version>1.23</dep.jmxutils.version>
@@ -1130,23 +1130,45 @@
 
             <!-- Java APIs -->
             <dependency>
+                <!-- keep it for the migration phase, remove once it's completed -->
                 <groupId>javax.inject</groupId>
                 <artifactId>javax.inject</artifactId>
-                <version>${dep.javax-inject.version}</version>
+                <version>1</version>
             </dependency>
+
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
                 <version>${dep.javax-validation.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+                <version>${dep.jakarta-inject.version}</version>
+            </dependency>
+
             <!-- servlet -->
             <dependency>
+                <!-- keep it for the migration phase, remove once it's completed -->
                 <groupId>org.eclipse.jetty.toolchain</groupId>
                 <artifactId>jetty-servlet-api</artifactId>
                 <version>4.0.6</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.eclipse.jetty.toolchain</groupId>
+                <artifactId>jetty-jakarta-servlet-api</artifactId>
+                <version>5.0.2</version>
+            </dependency>
+
+            <!-- xml bind -->
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>4.0.0</version>
+            </dependency>
+
             <!-- logging -->
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -1202,18 +1224,32 @@
 
             <!-- jaxrs -->
             <dependency>
+                <!-- keep it for the migration phase, remove once it's completed -->
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
                 <version>2.1.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>jakarta.ws.rs</groupId>
+                <artifactId>jakarta.ws.rs-api</artifactId>
+                <version>3.1.0</version>
+            </dependency>
+
             <!-- jsr 250 -->
             <dependency>
+                <!-- keep it for the migration phase, remove once it's completed -->
                 <groupId>javax.annotation</groupId>
                 <artifactId>javax.annotation-api</artifactId>
                 <version>1.3.2</version>
             </dependency>
 
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>2.1.1</version>
+            </dependency>
+
             <!-- jackson -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>