Switch MP7 to GA

OpenLiberty · Oct 15, 2024 · ef3755a · ef3755a
1 parent af02948
commit ef3755a
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 18 deletions.
diff --git a/dev/build.image/build.gradle b/dev/build.image/build.gradle
@@ -529,7 +529,7 @@ if (isAutomatedBuild && !isIFIXBuild) {
         dependsOn parent.subprojects.assemble
         dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
         withFeatures this.&webProfile10Features
-        packageServerConflict = "com.ibm.websphere.appserver.sessionStore,com.ibm.websphere.appserver.jdbc,io.openliberty.microProfile,io.openliberty.mpConfig,io.openliberty.mpMetrics,io.openliberty.mpTelemetry,io.openliberty.org.eclipse.microprofile.config,io.openliberty.org.eclipse.microprofile.metrics,io.openliberty.mpCompatible,io.openliberty.internal.mpVersion"
+        packageServerConflict = "com.ibm.websphere.appserver.sessionStore,com.ibm.websphere.appserver.jdbc,io.openliberty.microProfile,io.openliberty.mpConfig,io.openliberty.mpFaultTolerance,io.openliberty.mpOpenAPI,io.openliberty.mpRestClient,io.openliberty.mpMetrics,io.openliberty.mpTelemetry,io.openliberty.org.eclipse.microprofile.config,io.openliberty.org.eclipse.microprofile.faulttolerance,io.openliberty.org.eclipse.microprofile.openapi,io.openliberty.org.eclipse.microprofile.rest.client,io.openliberty.org.eclipse.microprofile.metrics,io.openliberty.mpCompatible,io.openliberty.internal.mpVersion"
         outputTo new File(packageDir, "webProfile10")
         doLast {
             copy {
@@ -548,7 +548,7 @@ if (isAutomatedBuild && !isIFIXBuild) {
         dependsOn parent.subprojects.assemble
         dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
         withFeatures this.&jakartaee10Features
-        packageServerConflict = "com.ibm.websphere.appserver.sessionStore,com.ibm.websphere.appserver.jdbc,io.openliberty.microProfile,io.openliberty.mpConfig,io.openliberty.mpMetrics,io.openliberty.mpTelemetry,io.openliberty.org.eclipse.microprofile.config,io.openliberty.org.eclipse.microprofile.metrics,io.openliberty.mpCompatible,io.openliberty.internal.mpVersion"
+        packageServerConflict = "com.ibm.websphere.appserver.sessionStore,com.ibm.websphere.appserver.jdbc,io.openliberty.microProfile,io.openliberty.mpConfig,io.openliberty.mpFaultTolerance,io.openliberty.mpOpenAPI,io.openliberty.mpRestClient,io.openliberty.mpMetrics,io.openliberty.mpTelemetry,io.openliberty.org.eclipse.microprofile.config,io.openliberty.org.eclipse.microprofile.faulttolerance,io.openliberty.org.eclipse.microprofile.openapi,io.openliberty.org.eclipse.microprofile.rest.client,io.openliberty.org.eclipse.microprofile.metrics,io.openliberty.mpCompatible,io.openliberty.internal.mpVersion"
         outputTo new File(packageDir, "jakartaee10")
         doLast {
             copy {
@@ -638,7 +638,7 @@ if (isAutomatedBuild && !isIFIXBuild) {
         }
     }
 
-    //currently noship
+    //GA
     task packageOpenLibertyMicroProfile7(type: PackageLibertyWithFeatures) {
         dependsOn parent.subprojects.assemble
         dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
@@ -900,7 +900,7 @@ if (isAutomatedBuild && !isIFIXBuild) {
     }
     publish.dependsOn cleanupOpenLibertyMicroProfile6Package
 
-    // Currently no-ship: Includes only features listed in profiles/microProfile7/features.xml
+    // GA: Includes only features listed in profiles/microProfile7/features.xml
     task zipOpenLibertyMicroProfile7(type: Zip) {
         dependsOn packageOpenLibertyMicroProfile7
         dependsOn genChecksums

diff --git a/dev/build.image/profiles/jakartaee10/features.xml b/dev/build.image/profiles/jakartaee10/features.xml
@@ -14,6 +14,7 @@
 <feature>requestTiming-1.0</feature>
 <feature>microProfile-6.0</feature>
 <feature>microProfile-6.1</feature>
+<feature>microProfile-7.0</feature>
 <feature>appAuthentication</feature>
 <feature>appAuthorization</feature>
 <feature>appClientSupport</feature>

diff --git a/dev/build.image/profiles/jakartaee11/features.xml b/dev/build.image/profiles/jakartaee11/features.xml
@@ -15,6 +15,7 @@
 <feature>sessionDatabase-1.0</feature>
 <feature>webCache-1.0</feature>
 <feature>requestTiming-1.0</feature>
+<feature>microProfile-7.0</feature>
 <feature>appAuthentication</feature>
 <feature>appAuthorization</feature>
 <feature>appClientSupport</feature>
@@ -40,6 +41,13 @@
 <feature>messagingClient</feature>
 <feature>messagingSecurity</feature>
 <feature>messagingServer</feature>
+<feature>mpConfig</feature>
+<feature>mpFaultTolerance</feature>
+<feature>mpHealth</feature>
+<feature>mpJwt</feature>
+<feature>mpOpenAPI</feature>
+<feature>mpRestClient</feature>
+<feature>mpTelemetry</feature>
 <feature>pages</feature>
 <feature>persistence</feature>
 <feature>restfulWS</feature>

diff --git a/dev/build.image/profiles/microProfile7/features.xml b/dev/build.image/profiles/microProfile7/features.xml
@@ -1,14 +1,12 @@
 <feature>microProfile-7.0</feature>
 <feature>localConnector-1.0</feature>
-<feature>mpMetrics-5.1</feature>
 <feature>cdi</feature>
 <feature>jsonb</feature>
 <feature>jsonp</feature>
 <feature>mpConfig</feature>
 <feature>mpFaultTolerance</feature>
 <feature>mpHealth</feature>
 <feature>mpJwt</feature>
-<feature>mpMetrics</feature>
 <feature>mpOpenAPI</feature>
 <feature>mpRestClient</feature>
 <feature>mpTelemetry</feature>

diff --git a/dev/build.image/profiles/webProfile10/features.xml b/dev/build.image/profiles/webProfile10/features.xml
@@ -12,6 +12,7 @@
 <feature>requestTiming-1.0</feature>
 <feature>microProfile-6.0</feature>
 <feature>microProfile-6.1</feature>
+<feature>microProfile-7.0</feature>
 <feature>appAuthentication</feature>
 <feature>appSecurity</feature>
 <feature>beanValidation</feature>

diff --git a/dev/build.image/profiles/webProfile11/features.xml b/dev/build.image/profiles/webProfile11/features.xml
@@ -10,6 +10,7 @@
 <feature>sessionDatabase-1.0</feature>
 <feature>webCache-1.0</feature>
 <feature>requestTiming-1.0</feature>
+<feature>microProfile-7.0</feature>
 <feature>appAuthentication</feature>
 <feature>appSecurity</feature>
 <feature>cdi</feature>
@@ -21,6 +22,13 @@
 <feature>jdbc</feature>
 <feature>jsonb</feature>
 <feature>jsonp</feature>
+<feature>mpConfig</feature>
+<feature>mpFaultTolerance</feature>
+<feature>mpHealth</feature>
+<feature>mpJwt</feature>
+<feature>mpOpenAPI</feature>
+<feature>mpRestClient</feature>
+<feature>mpTelemetry</feature>
 <feature>pages</feature>
 <feature>persistence</feature>
 <feature>restfulWS</feature>

diff --git a/...tures/visibility/private/io.openliberty.internal.versionless.mpFaultTolerance-4.1.feature b/...tures/visibility/private/io.openliberty.internal.versionless.mpFaultTolerance-4.1.feature
@@ -5,5 +5,5 @@ singleton=true
 -features= \
     io.openliberty.internal.mpVersion-7.0, \
     io.openliberty.mpFaultTolerance-4.1
-kind=beta
+kind=ga
 edition=core
diff --git a/...ver.features/visibility/private/io.openliberty.internal.versionless.mpOpenAPI-4.0.feature b/...ver.features/visibility/private/io.openliberty.internal.versionless.mpOpenAPI-4.0.feature
@@ -5,5 +5,5 @@ singleton=true
 -features= \
     io.openliberty.internal.mpVersion-7.0, \
     io.openliberty.mpOpenAPI-4.0
-kind=beta
+kind=ga
 edition=core
diff --git a/....features/visibility/private/io.openliberty.internal.versionless.mpRestClient-4.0.feature b/....features/visibility/private/io.openliberty.internal.versionless.mpRestClient-4.0.feature
@@ -5,5 +5,5 @@ singleton=true
 -features= \
     io.openliberty.internal.mpVersion-7.0, \
     io.openliberty.mpRestClient-4.0
-kind=beta
+kind=ga
 edition=core
diff --git a/...res/visibility/private/io.openliberty.org.eclipse.microprofile.faulttolerance-4.1.feature b/...res/visibility/private/io.openliberty.org.eclipse.microprofile.faulttolerance-4.1.feature
@@ -4,6 +4,6 @@ singleton=true
 # io.openliberty.mpCompatible-x.x comes from io.openliberty.microprofile.cdi.api features
 -features=io.openliberty.microprofile.cdi.api-4.0; ibm.tolerates:="4.1"
 -bundles=io.openliberty.org.eclipse.microprofile.faulttolerance.4.1; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-api:4.1"
-kind=beta
+kind=ga
 edition=core
 WLP-Activation-Type: parallel
diff --git a/...r.features/visibility/private/io.openliberty.org.eclipse.microprofile.openapi-4.0.feature b/...r.features/visibility/private/io.openliberty.org.eclipse.microprofile.openapi-4.0.feature
@@ -4,6 +4,6 @@ singleton=true
 -features=\
  io.openliberty.mpCompatible-7.0
 -bundles=io.openliberty.org.eclipse.microprofile.openapi.4.0; location:="dev/api/stable/,lib/"; mavenCoordinates="org.eclipse.microprofile.openapi:microprofile-openapi-api:4.0"
-kind=beta
+kind=ga
 edition=core
 WLP-Activation-Type: parallel
diff --git a/...erver.features/visibility/public/microProfile-7.0/io.openliberty.microProfile-7.0.feature b/...erver.features/visibility/public/microProfile-7.0/io.openliberty.microProfile-7.0.feature
@@ -20,6 +20,6 @@ Subsystem-Name: MicroProfile 7.0
   io.openliberty.mpJwt-2.1, \
   io.openliberty.mpRestClient-4.0, \
   io.openliberty.mpTelemetry-2.0
-kind=beta
+kind=ga
 edition=core
 WLP-InstantOn-Enabled: true
diff --git a/...atures/visibility/public/mpFaultTolerance-4.1/io.openliberty.mpFaultTolerance-4.1.feature b/...atures/visibility/public/mpFaultTolerance-4.1/io.openliberty.mpFaultTolerance-4.1.feature
@@ -20,7 +20,7 @@ Subsystem-Name: MicroProfile Fault Tolerance 4.1
  com.ibm.ws.microprofile.faulttolerance.2.1.cdi.jakarta; apiJar=false; location:="lib/",\
  com.ibm.ws.microprofile.faulttolerance.2.1.cdi.services; apiJar=false; location:="lib/",\
  io.openliberty.microprofile.faulttolerance.3.0.internal.cdi.jakarta; apiJar=false; location:="lib/"
-kind=beta
+kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true

diff --git a/...e.appserver.features/visibility/public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature b/...e.appserver.features/visibility/public/mpOpenAPI-4.0/io.openliberty.mpOpenAPI-4.0.feature
@@ -50,7 +50,7 @@ IBM-API-Package: \
     io.openliberty.microprofile.openapi.internal.common,\
     io.openliberty.com.fasterxml.jackson, \
     com.ibm.ws.org.jboss.logging
-kind=beta
+kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true

diff --git a/...erver.features/visibility/public/mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature b/...erver.features/visibility/public/mpRestClient-4.0/io.openliberty.mpRestClient-4.0.feature
@@ -27,7 +27,7 @@ Subsystem-Name: MicroProfile Rest Client 4.0
 
 -bundles=\
   io.openliberty.org.jboss.resteasy.mprestclient.4.0; apiJar=false; location:="lib/"
-kind=beta
+kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true

diff --git a/...o.openliberty.checkpoint_fat/fat/src/io/openliberty/checkpoint/fat/OpenAPIConfigTest.java b/...o.openliberty.checkpoint_fat/fat/src/io/openliberty/checkpoint/fat/OpenAPIConfigTest.java
@@ -72,9 +72,6 @@ public class OpenAPIConfigTest extends FATServletClient {
 
     @BeforeClass
     public static void deployApp() throws Exception {
-        // Set guards
-        server.setJvmOptions(Arrays.asList("-Dcom.ibm.ws.beta.edition=true"));
-
         // Deploy test app
         WebArchive war = ShrinkWrap.create(WebArchive.class, APP_NAME + ".war")
                         .addClass(OpenAPIConfigTestResource.class);