Merge remote-tracking branch 'origin/integration' into HEAD

.ci-orchestrator/jvms/dev/checkpoint_linux_x86_64.properties

@@ -1,3 +1,3 @@
 reportingJVM=IBM_SEMERU_OPEN_JDK_17
-jvmUnderTestPath=/liberty/jvms/linux_x86_64/ibm-semerujdk-17.0.9+9_openj9-0.41.0/jdk-17.0.9+9.tar.gz
+jvmUnderTestPath=/liberty/jvms/linux_x86_64/ibm-semerujdk-17.0.10+7_openj9-0.43.0/jdk-17.0.10+7.tar.gz
 jvmFrameworkPath=/liberty/jvms/linux_x86_64/ibm-semerujdk-21.0.2+13_openj9-0.43.0/jdk-21.0.2+13.tar.gz

.github/ISSUE_TEMPLATE/03_feature.md

@@ -2,7 +2,7 @@
 name: Open Liberty Feature Template
 about: Steps for Feature Creation and Delivery (Open Liberty org members only)
 title: 'Open Liberty Feature Template'
-labels: Epic
+labels: Epic,Feature
 assignees: ''
 
 ---
@@ -25,7 +25,7 @@ When available, add links to required feature documents. Use "N/A" to mark parti
     - Click "Share" > select "People with link" > click "Link Settings" > under "Link Expiration" select "Disable Shared Link on" > set an expiration date ~10 years into the future
     - If you lack permissions, contact [OpenLiberty/release-architect](https://github.com/orgs/OpenLiberty/teams/release-architect)
 - FTS: Link to Feature Test Summary GH Issue
-- Beta Blog: Link to Beta Blog Post GH Issue
+- Beta Blog(s): Link to Beta Blog Post GH Issue(s)
 - GA Blog: Link to GA Blog Post GH Issue
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -58,9 +58,9 @@ If you need assistance, reach out to the [OpenLiberty/release-architect](https:/
 The [OpenLiberty/chief-architect](https://github.com/orgs/OpenLiberty/teams/chief-architect) and area leads are responsible for prioritizing the features and determining which features are being actively worked on.
 
 ### **Prioritization**
-- [ ] Feature added to the "New" column of the [Open Liberty project board](https://github.com/orgs/OpenLiberty/projects/2)
-  - Feature owner adds label `Prioritization - Requested`
-  - Feature added to "New" column of the Open Liberty Roadmap. ([OpenLiberty/project-manager](https://github.com/orgs/OpenLiberty/teams/project-manager))
+- [ ] Feature owner adds label `Prioritization - Requested`
+  - This puts the feature on the radar of the [OpenLiberty/chief-architect](https://github.com/orgs/OpenLiberty/teams/chief-architect) and [OpenLiberty/project-manager](https://github.com/orgs/OpenLiberty/teams/project-manager). They are responsible for querying for new features that need to be prioritized.
+- [ ] [OpenLiberty/project-manager](https://github.com/orgs/OpenLiberty/teams/project-manager) adds feature to the "New" column of the [Open Liberty project board](https://github.com/orgs/OpenLiberty/projects/2)
 - [ ] Priority assigned
   - Attend the Liberty Backlog Prioritization meeting
   - `Prioritization - Requested` label removed ([OpenLiberty/project-manager](https://github.com/orgs/OpenLiberty/teams/project-manager) or feature owner)
@@ -142,14 +142,18 @@ In order to facilitate early feedback from users, all new features and functiona
 - [ ] [Beta fence](https://github.com/OpenLiberty/open-liberty/wiki/Beta-Fencing) the functionality
   - E.g. `kind=beta`, `ibm:beta`, `ProductInfo.getBetaEdition()`
 - [ ] Beta development complete and feature ready for inclusion in a beta release
-  - Add label `target:beta` and the appropriate `target:YY00X-beta` (where YY00X is the targeted beta version).
+  - Add label `target:beta` and the appropriate `target:YY00X-beta` (where YY00X is the targeted beta version) to the feature issue.
+    - Note: This is expected to be done only once, for the initial beta that includes this feature. You do not need to add a `target:YY00(X+1)-beta`, `target:YY00(X+2)-beta`, etc. label for each additional beta that includes this feature.
 - [ ] Feature delivered into beta
   - ([OpenLiberty/release-manager](https://github.com/orgs/OpenLiberty/teams/release-manager)) adds label `release:YY00X-beta` (where YY00X is the first beta version that included the functionality).
 
 ### **Beta Blog** (Complete by beta eGA)
 - [ ] Beta blog issue created and populated using the [Open Liberty BETA blog post](https://github.com/OpenLiberty/open-liberty/issues/new/choose) template.
   - Add a link to the beta blog issue in the [Documents](#documents) section.
   - Note: This is for inclusion into the overall [beta release blog post](https://openliberty.io/blog/?search=beta&key=tag).  If, in addition, you'd also like to create a dedicated blog post about your feature, then follow the "Standalone Feature Blog Post" instructions under the [Other Deliverables](#other-deliverables) section.
+  - A feature may have multiple beta blogs associated with it. This is especially useful for features that are continuously adding functionality each release and want to advertise what is new since the previous beta.
+    - Each beta blog issue should have the appropriate `target:YY00X-beta` label added to it.
+    - Include each beta blog issue in the [Documents](#documents) section.
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ## **GA**

.github/ISSUE_TEMPLATE/04_blog_post_beta.md

@@ -8,40 +8,22 @@ assignees: ReeceNana
 ---
 
 The information you provide here will be included in the Open Liberty beta blog post ([example](https://openliberty.io/blog/2020/08/05/jakarta-grpc-beta-20009.html)), which will be published on [openliberty.io/blog/](https://www.openliberty.io/blog/), and potentially elsewhere, to promote this beta feature/function of Open Liberty. For this post to be included in the beta issue please make sure that this is completed by the end of Friday following the GM (Tuesday). The beta and release blogs are created using automation and rely on you following the template's structure. **DO NOT REMOVE/ALTER THE `<GHA>` TAGS THROUGHOUT THIS TEMPLATE.**
-
-Please provide the following information:
-&#8203;<GHA-BLOG-RELATED-FEATURES>
-1. Which Liberty feature(s) does your update relate to? 
-
-    Human-readable name (eg WebSockets feature): 
-
-    Short feature name (eg websockets-1.0):  
-
-
-    </GHA-BLOG-RELATED-FEATURES>
-
-    <GHA-BLOG-TARGET-PERSONA>
-2. Who is the target persona? Who do you expect to use the update? eg application developer, operations.  
-
-
-    </GHA-BLOG-TARGET-PERSONA>
 
     <GHA-BLOG-SUMMARY>
-3. Provide a summary of the update, including the following points:
+Please provide a summary of the update, including the following points:
 
    - A sentence or two that introduces the update to someone new to the general technology/concept.
-
+   - The Human-readable name and short feature name for your feature- eg WebSockets feature (websockets-1.0).
+   - Who is the target persona? Who do you expect to use the update? eg application developer, operations. 
    - What was the problem before and how does your update make their life better? (Why should they care?)
-
-   - Briefly explain how to make your update work. Include screenshots, diagrams, and/or code snippets, and provide a `server.xml` snippet.
-
+   - Briefly explain how to make your update work. Include screenshots, diagrams, and/or code snippets, and provide a `server.xml` snippet.  
    - Where can they find out more about this specific update (eg Open Liberty docs, Javadoc) and/or the wider technology?  
 
 
     </GHA-BLOG-SUMMARY>
 
 ## What happens next?
-- Add the label for the beta you're targeting: `target:YY00X-beta`.
+- Add the label to the blog issue for the beta you're targeting (e.g. `target:YY00X-beta`).
 - Make sure this blog post is linked back to the Epic for this feature/function.
 - Your paragraph will be included in the beta blog post. It might be edited for style and consistency.
 - You will be asked to review a draft before publication.

.github/ISSUE_TEMPLATE/05_blog_post_ga_release.md

@@ -14,32 +14,18 @@ Please provide the following information:
 1. If this was previously published in a beta blog post, then provide the link to that `OpenLiberty/open-liberty` beta blog post issue on the next line between the `<GHA-BLOG-BETA-LINK>` tags. If nothing has changed since the beta, you're done and can omit the remaining steps. If you need to make updates/alterations to the beta content, then do all the steps. 
    <GHA-BLOG-BETA-LINK>https://github.com/OpenLiberty/open-liberty/issues/0</GHA-BLOG-BETA-LINK>
 
-   <GHA-BLOG-RELATED-FEATURES>
-2. Which Liberty feature(s) does your update relate to?
-
-   Human-readable name (eg WebSockets feature):
-
-   Short feature name (eg websockets-1.0): 
-
-
-   </GHA-BLOG-RELATED-FEATURES>
-
-   <GHA-BLOG-TARGET-PERSONA>
-3. Who is the target persona? Who do you expect to use the update? eg application developer, operations.
-
-
-   </GHA-BLOG-TARGET-PERSONA>
-
    <GHA-BLOG-SUMMARY>
-4. Provide a summary of the update, including the following points:
+Please provide a summary of the update, including the following points:
 
    - A sentence or two that introduces the update to someone new to the general technology/concept.
-
+   - The Human-readable name and short feature name for your feature- eg WebSockets feature (websockets-1.0).
+   - Who is the target persona? Who do you expect to use the update? eg application developer, operations. 
    - What was the problem before and how does your update make their life better? (Why should they care?)
-
-   - Briefly explain how to make your update work. Include screenshots, diagrams, and/or code snippets, and provide a `server.xml` snippet.
-
-   - Where can they find out more about this specific update (eg Open Liberty docs, Javadoc) and/or the wider technology?
+   - Briefly explain how to make your update work. Include screenshots, diagrams, and/or code snippets, and provide a `server.xml` snippet.  
+   - Where can they find out more about this specific update (eg Open Liberty docs, Javadoc) and/or the wider technology?  
+
+
+
 
    </GHA-BLOG-SUMMARY>
 

dev/build.changeDetector/src/com/ibm/ws/infra/depchain/FeatureCollection.java

@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -81,7 +81,7 @@ public Feature get(String featureSymbolicName) {
     }
 
     public Set<String> getEnabledFeatures(Set<String> rootFeatures) {
-        Result resolverResult = resolver.resolveFeatures(repoImpl, rootFeatures, Collections.emptySet(), true);
+        Result resolverResult = resolver.resolve(repoImpl, rootFeatures, Collections.emptySet(), true, Collections.<String> emptySet());
         if (resolverResult.getConflicts().size() != 0) {
             throw new RuntimeException("Unable to resolve: " + resolverResult.getConflicts() + "  from " + rootFeatures);
         }

dev/build.example_fat/build.gradle

@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2017 IBM Corporation and others.
+ * Copyright (c) 2017, 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
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -13,7 +13,7 @@
 
 dependencies {
   //if there is a existing project, reference it directly
-  requiredLibs project(':io.openliberty.org.apache.commons.logging')
+  //requiredLibs project(':io.openliberty.org.apache.commons.logging')
 
   //if not, Define G:A:V coordinates of each dependency
   //requiredLibs 'commons-logging:commons-logging:1.1.3'

dev/build.featureStart.base/resources/com/ibm/ws/test/featurestart/features/feature-levels.properties

@@ -12,6 +12,8 @@ concurrent-3.0=11
 concurrent-3.1=17
 connectors-2.1=11
 data-1.0=17
+data-1.1=17
+dataContainer-1.0=17
 expressionLanguage-5.0=11
 expressionLanguage-6.0=17
 faces-4.0=11

dev/build.featureStart.base/src/com/ibm/ws/test/featurestart/features/FeatureFilter.java

@@ -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
@@ -67,9 +67,8 @@ public static String skipFeature(String shortName) {
             // location variable.
             return "Required variable 'wmqJmsClient.rar.location' is not set";
 
-        } else if (shortName.equalsIgnoreCase("mpHealth") ||
-                   shortName.equalsIgnoreCase("mpMetrics")){
-            // Versionless feature cannot run by itself
+        } else if (shortName.indexOf("-") == -1 ) {
+            // Versionless features cannot run by themselves
             // Requires other features to be configured for it to resolve
             return "Cannot start by itself";
 

dev/build.image/build.gradle

@@ -528,7 +528,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"
+        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"
         outputTo new File(packageDir, "webProfile10")
         doLast {
             copy {
@@ -547,7 +547,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"
+        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"
         outputTo new File(packageDir, "jakartaee10")
         doLast {
             copy {
@@ -627,7 +627,7 @@ if (isAutomatedBuild && !isIFIXBuild) {
         dependsOn parent.subprojects.assemble
         dependsOn ':com.ibm.websphere.appserver.features:publishFeatureResources'
         withFeatures this.&microProfile6Features
-        packageServerConflict = "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"
+        packageServerConflict = "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"
         outputTo new File(packageDir, "microProfile6")
         doLast {
             copy {