Move up to Jakarta 10

IBMStockTrader · Mar 29, 2024 · 1aeb2a7 · 1aeb2a7
1 parent 863f505
commit 1aeb2a7
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 105 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@
 # RUN mvn -f /usr/pom.xml clean package
 
 # FROM openliberty/open-liberty:kernel-slim-java11-openj9-ubi
-FROM openliberty/open-liberty:23.0.0.12-full-java17-openj9-ubi
+FROM openliberty/open-liberty:24.0.0.3-full-java17-openj9-ubi
 
 # ARG extract_keycloak_cert
 USER root

diff --git a/pom.xml b/pom.xml
@@ -50,13 +50,13 @@
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-web-api</artifactId>
-            <version>8.0.0</version>
+            <version>10.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency> 
             <groupId>org.eclipse.microprofile</groupId> 
             <artifactId>microprofile</artifactId> 
-            <version>4.1</version>
+            <version>6.1</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency> 
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>2.0.10</version>
+            <version>2.0.12</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/BrokerService.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/BrokerService.java
@@ -1,6 +1,6 @@
 /*
        Copyright 2020-2021 IBM Corp, All Rights Reserved
-       Copyright 2021-2023 Kyndryl, All Rights Reserved
+       Copyright 2021-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@
 import java.util.stream.Collectors;
 
 //CDI 2.0
-import javax.inject.Inject;
-import javax.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.enterprise.context.RequestScoped;
 
 //mpConfig 1.3
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -56,22 +56,22 @@
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 //Servlet 4.0
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 //JAX-RS 2.1 (JSR 339)
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.Path;
 
 @ApplicationPath("/")
 @Path("/")

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/AccountClient.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/AccountClient.java
@@ -1,5 +1,6 @@
 /*
        Copyright 2020-2021 IBM Corp All Rights Reserved
+       Copyright 2022-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,20 +21,20 @@
 import com.ibm.hybrid.cloud.sample.stocktrader.broker.json.Feedback;
 import com.ibm.hybrid.cloud.sample.stocktrader.broker.json.WatsonInput;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/CashAccountClient.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/CashAccountClient.java
@@ -1,5 +1,5 @@
 /*
-       Copyright 2023 Kyndryl, All Rights Reserved
+       Copyright 2023-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -18,20 +18,20 @@
 
 import com.ibm.hybrid.cloud.sample.stocktrader.broker.json.CashAccount;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/PortfolioClient.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/PortfolioClient.java
@@ -1,5 +1,6 @@
 /*
        Copyright 2017-2021 IBM Corp All Rights Reserved
+       Copyright 2022-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,20 +21,20 @@
 import com.ibm.hybrid.cloud.sample.stocktrader.broker.json.Portfolio;
 import com.ibm.hybrid.cloud.sample.stocktrader.broker.json.WatsonInput;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/TradeHistoryClient.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/client/TradeHistoryClient.java
@@ -1,5 +1,6 @@
 /*
        Copyright 2020-2021 IBM Corp All Rights Reserved
+       Copyright 2022-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -16,16 +17,16 @@
 
 package com.ibm.hybrid.cloud.sample.stocktrader.broker.client;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.Path;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
 @ApplicationPath("/")

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/json/Broker.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/json/Broker.java
@@ -1,5 +1,6 @@
 /*
-       Copyright 2017-2023 IBM Corp All Rights Reserved
+       Copyright 2017-2021 IBM Corp All Rights Reserved
+       Copyright 2022-2024 Kyndrul, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -21,10 +22,10 @@
 import java.util.Iterator;
 
 //JSON-P 1.0 (JSR 353).  This replaces my old usage of IBM's JSON4J (com.ibm.json.java.JSONObject)
-import javax.json.Json;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 
 /** JSON-B POJO class representing a Broker JSON object */

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/json/Portfolio.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/json/Portfolio.java
@@ -1,6 +1,6 @@
 /*
        Copyright 2020-2021 IBM Corp, All Rights Reserved
-       Copyright 2023 Kyndryl, All Rights Reserved
+       Copyright 2023-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -21,20 +21,20 @@
 import java.util.List;
 import java.util.Iterator;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.Id;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.json.JsonObject;
-import javax.json.bind.annotation.JsonbTransient;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.persistence.Id;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.json.JsonObject;
+import jakarta.json.bind.annotation.JsonbTransient;
 
 //JSON-P 1.0 (JSR 353).  This replaces my old usage of IBM's JSON4J (com.ibm.json.java.JSONObject)
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
 
 @Entity
 @Table

diff --git a/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/json/Stock.java b/src/main/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/json/Stock.java
@@ -1,5 +1,6 @@
 /*
-       Copyright 2017-2019 IBM Corp All Rights Reserved
+       Copyright 2017-2021 IBM Corp All Rights Reserved
+       Copyright 2022-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -16,14 +17,14 @@
 
 package com.ibm.hybrid.cloud.sample.stocktrader.broker.json;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.NamedQuery;
-import javax.persistence.Column;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Column;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 @Table

diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
@@ -17,8 +17,8 @@
 
 <server description="Broker server">
     <featureManager>
-        <feature>microProfile-4.1</feature>
-        <feature>appSecurity-2.0</feature>
+        <feature>microProfile-6.1</feature>
+        <feature>appSecurity-3.0</feature>
 <!--    <feature>logstashCollector-1.1</feature> -->
     </featureManager>
 

diff --git a/src/test/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/test/HealthEndpointIT.java b/src/test/java/com/ibm/hybrid/cloud/sample/stocktrader/broker/test/HealthEndpointIT.java
@@ -1,5 +1,6 @@
 /*
-       Copyright 2020 IBM Corp All Rights Reserved
+       Copyright 2020-2021 IBM Corp All Rights Reserved
+       Copyright 2022-2024 Kyndryl, All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -18,10 +19,10 @@
 
 import static org.junit.Assert.assertTrue;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
 
 import org.junit.Test;