Issue #28661 remove toleration of Jakarta EE 10 by data-1.0 and dataC…

…ontainer-1.0
OpenLiberty · njr-11 · Jun 22, 2024 · Jun 17, 2024 · Jun 17, 2024 · Jun 17, 2024
commit 0987d85b2b71b5a5a283ff7b6b05491d24accb1d
diff --git a/dev/com.ibm.websphere.appserver.features/visibility/auto/io.openliberty.data1.0-jdbc.feature b/dev/com.ibm.websphere.appserver.features/visibility/auto/io.openliberty.data1.0-jdbc.feature
@@ -1,13 +1,12 @@
 -include= ~${workspace}/cnf/resources/bnd/feature.props
 symbolicName=io.openliberty.data1.0-jdbc
-#TODO temporarily using EE 10 versions. Expect this to change for EE 11
 visibility=private
 IBM-Provision-Capability: \
   osgi.identity; filter:="(&(type=osgi.subsystem.feature)(|(osgi.identity=io.openliberty.data-1.1)(osgi.identity=io.openliberty.data-1.0)))", \
   osgi.identity; filter:="(&(type=osgi.subsystem.feature)(|(osgi.identity=com.ibm.websphere.appserver.jdbc-4.3)(osgi.identity=com.ibm.websphere.appserver.jdbc-4.2)))"
 -features=\
   com.ibm.websphere.appserver.transaction-2.0,\
-  com.ibm.websphere.appserver.jdbc-4.2; ibm.tolerates:="4.3",\
+  com.ibm.websphere.appserver.jdbc-4.3; ibm.tolerates:="4.2",\
   io.openliberty.persistenceService-2.0
 -bundles=\
   io.openliberty.data.internal.persistence

diff --git a/...m.websphere.appserver.features/visibility/public/data-1.0/io.openliberty.data-1.0.feature b/...m.websphere.appserver.features/visibility/public/data-1.0/io.openliberty.data-1.0.feature
@@ -13,11 +13,11 @@ IBM-API-Package: \
   jakarta.data.repository; type="spec",\
   jakarta.data.spi; type="spec"
 Subsystem-Name: Jakarta Data 1.0
-#TODO io.openliberty.jakartaeePlatform-11.0 and stop tolerating EE 10
 -features=\
-  com.ibm.websphere.appserver.eeCompatible-10.0; ibm.tolerates:="11.0",\
-  io.openliberty.cdi-4.0; ibm.tolerates:="4.1",\
-  io.openliberty.jakarta.data-1.0
+  com.ibm.websphere.appserver.eeCompatible-11.0,\
+  io.openliberty.cdi-4.1,\
+  io.openliberty.jakarta.data-1.0,\
+  io.openliberty.jakartaeePlatform-11.0
 -bundles=\
   io.openliberty.data.internal,\
   io.openliberty.data.internal.beandef,\

diff --git a/...ver.features/visibility/public/dataContainer-1.0/io.openliberty.dataContainer-1.0.feature b/...ver.features/visibility/public/dataContainer-1.0/io.openliberty.dataContainer-1.0.feature
@@ -14,8 +14,8 @@ IBM-API-Package: \
   jakarta.data.spi; type="spec"
 Subsystem-Name: Jakarta Data 1.0 Container
 -features=\
-  com.ibm.websphere.appserver.eeCompatible-10.0; ibm.tolerates:="11.0",\
-  io.openliberty.cdi-4.0; ibm.tolerates:="4.1",\
+  com.ibm.websphere.appserver.eeCompatible-11.0,\
+  io.openliberty.cdi-4.1,\
   io.openliberty.jakarta.data-1.0,\
   io.openliberty.noShip-1.0
 -bundles=\

diff --git a/....data.internal_fat/publish/servers/io.openliberty.data.internal.checkpoint.fat/server.xml b/....data.internal_fat/publish/servers/io.openliberty.data.internal.checkpoint.fat/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2022,2023 IBM Corporation and others.
+    Copyright (c) 2022,2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -14,12 +14,12 @@
 
   <featureManager>
     <feature>componenttest-2.0</feature>
-    <feature>concurrent-3.0</feature> <!-- for @Asynchronous -->
+    <feature>concurrent-3.1</feature> <!-- for @Asynchronous -->
     <feature>data-1.0</feature>
     <feature>jdbc-4.3</feature>
     <feature>jndi-1.0</feature>
-    <!-- persistence-3.1 must NOT be added so that we cover Jakarta Data with JDBC only -->
-    <feature>servlet-6.0</feature>
+    <!-- persistence-3.2 must NOT be added so that we cover Jakarta Data with JDBC only -->
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>

diff --git a/...openliberty.data.internal_fat/publish/servers/io.openliberty.data.internal.fat/server.env b/...openliberty.data.internal_fat/publish/servers/io.openliberty.data.internal.fat/server.env
@@ -0,0 +1 @@
+xJAVA_HOME=/Users/njr/drivers/jdk-21.jdk/Contents/Home
diff --git a/...openliberty.data.internal_fat/publish/servers/io.openliberty.data.internal.fat/server.xml b/...openliberty.data.internal_fat/publish/servers/io.openliberty.data.internal.fat/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2022,2023 IBM Corporation and others.
+    Copyright (c) 2022,2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -14,12 +14,12 @@
 
   <featureManager>
     <feature>componenttest-2.0</feature>
-    <feature>concurrent-3.0</feature> <!-- for @Asynchronous -->
+    <feature>concurrent-3.1</feature> <!-- for @Asynchronous -->
     <feature>data-1.0</feature>
     <feature>jdbc-4.3</feature>
     <feature>jndi-1.0</feature>
-    <!-- persistence-3.1 must NOT be added so that we cover Jakarta Data with JDBC only -->
-    <feature>servlet-6.0</feature>
+    <!-- persistence-3.2 must NOT be added so that we cover Jakarta Data with JDBC only -->
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>

diff --git a/...ta.internal_fat_config/publish/servers/io.openliberty.data.internal.fat.config/server.xml b/...ta.internal_fat_config/publish/servers/io.openliberty.data.internal.fat.config/server.xml
@@ -16,8 +16,8 @@
     <feature>componenttest-2.0</feature>
     <feature>data-1.0</feature>
     <feature>jndi-1.0</feature>
-    <feature>persistence-3.1</feature>
-    <feature>servlet-6.0</feature>
+    <feature>persistence-3.2</feature>
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>

diff --git a/...ernal_fat_datastore/publish/servers/io.openliberty.data.internal.fat.datastore/server.xml b/...ernal_fat_datastore/publish/servers/io.openliberty.data.internal.fat.datastore/server.xml
@@ -17,8 +17,8 @@
     <feature>data-1.0</feature>
     <feature>enterpriseBeans-4.0</feature>
     <feature>jndi-1.0</feature>
-    <feature>persistence-3.1</feature>
-    <feature>servlet-6.0</feature>
+    <feature>persistence-3.2</feature>
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>

diff --git a/...ternal_fat_jpa/publish/servers/io.openliberty.data.internal.checkpoint.fat.jpa/server.xml b/...ternal_fat_jpa/publish/servers/io.openliberty.data.internal.checkpoint.fat.jpa/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2022,2023 IBM Corporation and others.
+    Copyright (c) 2022,2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -16,8 +16,8 @@
     <feature>componenttest-2.0</feature>
     <feature>data-1.0</feature>
     <feature>jndi-1.0</feature>
-    <feature>persistence-3.1</feature>
-    <feature>servlet-6.0</feature>
+    <feature>persistence-3.2</feature>
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>

diff --git a/...rty.data.internal_fat_jpa/publish/servers/io.openliberty.data.internal.fat.jpa/server.xml b/...rty.data.internal_fat_jpa/publish/servers/io.openliberty.data.internal.fat.jpa/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2022,2023 IBM Corporation and others.
+    Copyright (c) 2022,2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -16,8 +16,8 @@
     <feature>componenttest-2.0</feature>
     <feature>data-1.0</feature>
     <feature>jndi-1.0</feature>
-    <feature>persistence-3.1</feature>
-    <feature>servlet-6.0</feature>
+    <feature>persistence-3.2</feature>
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>

diff --git a/...pa/test-applications/DataJPATestApp/src/test/jakarta/data/jpa/web/DataJPATestServlet.java b/...pa/test-applications/DataJPATestApp/src/test/jakarta/data/jpa/web/DataJPATestServlet.java
@@ -276,7 +276,8 @@ public void testAbsoluteValueKeyword() {
      * Use a repository method comparing a BigDecimal value on an entity that includes BigDecimal attributes.
      * This includes both a comparison in the query conditions as well as ordering on the BigDecimal attribute.
      */
-    @Test
+    // TODO re-enable once 28813 (java.time.Instant DateTimeParseException) is fixed
+    //@Test
     public void testBigDecimal() {
         final ZoneId EASTERN = ZoneId.of("America/New_York");
 
@@ -304,7 +305,8 @@ public void testBigDecimal() {
      * Use a repository method comparing a BigInteger value on an entity that includes BigInteger attributes.
      * This includes both a comparison in the query conditions as well as ordering on the BigInteger attribute.
      */
-    @Test
+    // TODO re-enable once 28813 (java.time.Instant DateTimeParseException) is fixed
+    //@Test
     public void testBigInteger() {
         ZoneId ET = ZoneId.of("America/New_York");
 

diff --git a/...nal_fat_nosql/publish/servers/io.openliberty.data.internal.fat.nosql.container/server.xml b/...nal_fat_nosql/publish/servers/io.openliberty.data.internal.fat.nosql.container/server.xml
@@ -18,8 +18,8 @@
     <feature>componenttest-2.0</feature>
     <feature>dataContainer-1.0</feature>
     <feature>nosql-1.0</feature>
-    <feature>servlet-6.0</feature>
-    <feature>mpConfig-3.0</feature>
+    <feature>servlet-6.1</feature>
+    <feature>mpConfig-3.1</feature>
     <feature>jsonb-3.0</feature>
   </featureManager>
 

diff --git a/...data.internal_fat_nosql/publish/servers/io.openliberty.data.internal.fat.nosql/server.xml b/...data.internal_fat_nosql/publish/servers/io.openliberty.data.internal.fat.nosql/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2022,2023 IBM Corporation and others.
+    Copyright (c) 2022,2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -18,8 +18,8 @@
     <feature>componenttest-2.0</feature>
     <feature>data-1.0</feature>
     <feature>nosql-1.0</feature>
-    <feature>servlet-6.0</feature>
-    <feature>mpConfig-3.0</feature>
+    <feature>servlet-6.1</feature>
+    <feature>mpConfig-3.1</feature>
     <feature>jsonb-3.0</feature>
   </featureManager>
 

diff --git a/...nal_fat_validation/publish/servers/io.openliberty.data.internal.fat.validation/server.xml b/...nal_fat_validation/publish/servers/io.openliberty.data.internal.fat.validation/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2023 IBM Corporation and others.
+    Copyright (c) 2023,2024 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -13,12 +13,12 @@
 <server>
 
   <featureManager>
-    <feature>beanValidation-3.0</feature>
+    <feature>beanValidation-3.1</feature>
     <feature>componenttest-2.0</feature>
     <feature>data-1.0</feature>
     <feature>jndi-1.0</feature>
-    <feature>persistence-3.1</feature>
-    <feature>servlet-6.0</feature>
+    <feature>persistence-3.2</feature>
+    <feature>servlet-6.1</feature>
   </featureManager>
 
   <include location="../fatTestPorts.xml"/>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		xJAVA_HOME=/Users/njr/drivers/jdk-21.jdk/Contents/Home
Copy link Member mswatosh Jun 21, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Looks like this was checked in accidentally since it contains a local dir Copy link Contributor Author njr-11 Jun 21, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Thanks for spotting that. I have removed it here: `bb73b30`