4.x jakarta ee upgrades (#9089)

* Upgrade Jakarta EE dependencies and some reference impls * Add seperate version for jsonb-tck
helidon-io · Aug 2, 2024 · 45e0005 · 45e0005
1 parent 30088db
commit 45e0005
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -65,26 +65,27 @@
         <version.lib.handlebars>4.3.1</version.lib.handlebars>
         <version.lib.hibernate.family>6.3</version.lib.hibernate.family>
         <version.lib.hibernate>${version.lib.hibernate.family}.1.Final</version.lib.hibernate>
-        <version.lib.hibernate-validator>7.0.2.Final</version.lib.hibernate-validator>
+        <version.lib.hibernate-validator>7.0.5.Final</version.lib.hibernate-validator>
         <version.lib.hikaricp>5.0.1</version.lib.hikaricp>
         <version.lib.hystrix>1.5.18</version.lib.hystrix>
         <version.lib.jackson>2.15.2</version.lib.jackson>
-        <version.lib.jakarta.activation-api>2.1.1</version.lib.jakarta.activation-api>
+        <version.lib.jakarta.activation-api>2.1.3</version.lib.jakarta.activation-api>
         <version.lib.jakarta.annotation-api>2.1.1</version.lib.jakarta.annotation-api>
         <version.lib.jakarta.cdi-api>4.0.1</version.lib.jakarta.cdi-api>
         <version.lib.jakarta.el-api>5.0.1</version.lib.jakarta.el-api>
         <version.lib.jakarta.inject>2.0.1</version.lib.jakarta.inject>
         <version.lib.jakarta.interceptor-api>2.1.0</version.lib.jakarta.interceptor-api>
         <version.lib.jakarta.jaxrs-api>3.1.0</version.lib.jakarta.jaxrs-api>
         <version.lib.jakarta.jms-api>3.1.0</version.lib.jakarta.jms-api>
-        <version.lib.jakarta.jsonb-api>3.0.0</version.lib.jakarta.jsonb-api>
+        <version.lib.jakarta.jsonb-api>3.0.1</version.lib.jakarta.jsonb-api>
+        <version.lib.jakarta.jsonb-tck>3.0.0</version.lib.jakarta.jsonb-tck>
         <version.lib.jakarta.jsonp-api>2.1.3</version.lib.jakarta.jsonp-api>
         <version.lib.jakarta.persistence-api>3.1.0</version.lib.jakarta.persistence-api>
-        <version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
-        <version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
+        <version.lib.jakarta.transaction-api>2.0.1</version.lib.jakarta.transaction-api>
+        <version.lib.jakarta.validation-api>3.0.2</version.lib.jakarta.validation-api>
         <version.lib.jakarta.websockets-api>2.1.1</version.lib.jakarta.websockets-api>
         <!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
-        <version.lib.jakarta.xml.bind-api>4.0.0</version.lib.jakarta.xml.bind-api>
+        <version.lib.jakarta.xml.bind-api>4.0.2</version.lib.jakarta.xml.bind-api>
         <version.lib.jandex>3.1.2</version.lib.jandex>
         <version.lib.jaxb-core>4.0.3</version.lib.jaxb-core>
         <version.lib.jaxb-impl>4.0.3</version.lib.jaxb-impl>
@@ -146,7 +147,7 @@
         <version.lib.opentracing.grpc>0.2.1</version.lib.opentracing.grpc>
         <version.lib.opentracing.tracerresolver>0.1.8</version.lib.opentracing.tracerresolver>
         <version.lib.perfmark-api>0.25.0</version.lib.perfmark-api>
-        <version.lib.parsson>1.1.5</version.lib.parsson>
+        <version.lib.parsson>1.1.6</version.lib.parsson>
         <version.lib.postgresql>42.7.2</version.lib.postgresql>
         <version.lib.prometheus>0.16.0</version.lib.prometheus>
         <version.lib.reactivestreams>1.0.4</version.lib.reactivestreams>

diff --git a/integrations/jta/jdbc/pom.xml b/integrations/jta/jdbc/pom.xml
@@ -49,6 +49,11 @@
             <artifactId>jakarta.transaction-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test-scoped dependencies. -->
         <dependency>

diff --git a/microprofile/server/src/main/java/module-info.java b/microprofile/server/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
     requires transitive io.helidon.webserver.context;
     requires transitive io.helidon.webserver;
     requires transitive io.helidon.webserver.observe;
+    requires transitive jakarta.validation;
     requires transitive jakarta.cdi;
     requires transitive jakarta.json;
     requires transitive jakarta.ws.rs;

diff --git a/microprofile/tests/tck/tck-jsonb/pom.xml b/microprofile/tests/tck/tck-jsonb/pom.xml
@@ -32,9 +32,9 @@
     <name>Helidon Microprofile Tests TCK JSONB</name>
 
     <properties>
-        <tck.filename>jakarta-jsonb-tck-${version.lib.jakarta.jsonb-api}</tck.filename>
+        <tck.filename>jakarta-jsonb-tck-${version.lib.jakarta.jsonb-tck}</tck.filename>
         <tck.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/promoted/eftl/${tck.filename}.zip</tck.url>
-        <tck.artifact>jakarta.json.bind-tck-${version.lib.jakarta.jsonb-api}</tck.artifact>
+        <tck.artifact>jakarta.json.bind-tck-${version.lib.jakarta.jsonb-tck}</tck.artifact>
         <stage.dir>${project.build.directory}/tck</stage.dir>
     </properties>
 

diff --git a/microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml b/microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-tck</artifactId>
-            <version>${version.lib.jakarta.jsonb-api}</version>
+            <version>${version.lib.jakarta.jsonb-tck}</version>
             <scope>test</scope>
         </dependency>
         <dependency>