Merge branch 'integration' into updateECLB03

OpenLiberty · Nov 29, 2024 · cff3369 · cff3369
2 parents 1aa507d + b6c1ed3
commit cff3369
Show file tree

Hide file tree

Showing 218 changed files with 5,596 additions and 5,516 deletions.
diff --git a/.ci-orchestrator/checks.yml b/.ci-orchestrator/checks.yml
@@ -41,13 +41,18 @@ steps:
   properties:
     isBvtCodeChanged: ${PR Changes:is.bvt.code.changed}
     isFatCodeChanged: ${PR Changes:is.fat.code.changed}
+    isFeatureFilesChanged: ${PR Changes:is.feature.files.changed}
     isInfraCodeChanged: ${PR Changes:is.infra.code.changed}
+    isMsgsFilesChanged: ${PR Changes:is.msgs.files.changed}
+    isNlsFilesChanged: ${PR Changes:is.nls.files.changed}
     isProductCodeChanged: ${PR Changes:is.product.code.changed}
     isTestInfraCodeChanged: ${PR Changes:is.test.infra.code.changed}
     isUnittestCodeChanged: ${PR Changes:is.unittest.code.changed}    
     bvtFilesCount: ${PR Changes:bvt.files.count}
     fatFilesCount: ${PR Changes:fat.files.count}
     infraFilesCount: ${PR Changes:infra.files.count}
+    msgsFiles: ${PR Changes:msgs.files}
+    nlsFiles: ${PR Changes:nls.files}
     productFilesCount: ${PR Changes:product.files.count}
     testInfraFilesCount: ${PR Changes:test.infra.files.count}
     unittestFilesCount: ${PR Changes:unittest.files.count}
diff --git a/.ci-orchestrator/pb.yml b/.ci-orchestrator/pb.yml
@@ -10,9 +10,11 @@ triggers:
   groups: ["LibertyDev"]
   keyword: "!pbbeta"
   aliasKeywords:
-    - "#build"
-    - "#pbbeta"
     - "!build"
+    - "!pb"
+    - "#pbbeta"
+    - "#build"
+    - "#pb"
   propertyDefinitions:
     # If a user defines this property, set it for all steps that use it except the "Distributed Full FATs" step.
     - name: fat.buckets.to.run
@@ -77,7 +79,9 @@ triggers:
   groups: ["LibertyDev"]
   keyword: "!fullpbbeta"
   aliasKeywords:
+    - "!fullpb"
     - "#fullpbbeta"
+    - "#fullpb"
   propertyDefinitions:
     # Run all buckets in full mode.
     - name: fat.buckets.to.run
@@ -149,13 +153,18 @@ steps:
     githubPRNumber: ${github_pr_number}
     isBvtCodeChanged: ${PR Changes:is.bvt.code.changed}
     isFatCodeChanged: ${PR Changes:is.fat.code.changed}
+    isFeatureFilesChanged: ${PR Changes:is.feature.files.changed}
     isInfraCodeChanged: ${PR Changes:is.infra.code.changed}
+    isMsgsFilesChanged: ${PR Changes:is.msgs.files.changed}
+    isNlsFilesChanged: ${PR Changes:is.nls.files.changed}
     isProductCodeChanged: ${PR Changes:is.product.code.changed}
     isTestInfraCodeChanged: ${PR Changes:is.test.infra.code.changed}
     isUnittestCodeChanged: ${PR Changes:is.unittest.code.changed}    
     bvtFilesCount: ${PR Changes:bvt.files.count}
     fatFilesCount: ${PR Changes:fat.files.count}
     infraFilesCount: ${PR Changes:infra.files.count}
+    msgsFiles: ${PR Changes:msgs.files}
+    nlsFiles: ${PR Changes:nls.files}
     productFilesCount: ${PR Changes:product.files.count}
     testInfraFilesCount: ${PR Changes:test.infra.files.count}
     unittestFilesCount: ${PR Changes:unittest.files.count}

diff --git a/.ci-orchestrator/pbRTCBuild.yml b/.ci-orchestrator/pbRTCBuild.yml
diff --git a/dev/build.depScanner/src/io/openliberty/depScanner/BestMatch.java b/dev/build.depScanner/src/io/openliberty/depScanner/BestMatch.java
@@ -296,6 +296,7 @@ private static boolean filteredLibraries(Module library) {
         return (library.getGroupId().equals("org.glassfish") && (library.getArtifactId().equals("javax.faces"))) ||
                (library.getArtifactId().equals("tomcat-embed-core")) ||
                (library.getArtifactId().equals("woodstox-core") && (library.getVersion().equals("6.2.6") || library.getVersion().equals("6.2.4"))) ||
+               (library.getArtifactId().equals("commons-io") && (library.getVersion().equals("2.13.0"))) ||
                (library.getArtifactId().equals("netty-codec-http")
                 && (library.getVersion().equals("4.1.73.Final") || library.getVersion().equals("4.1.78.Final") || library.getVersion().equals("4.1.92.Final")))
                ||

diff --git a/...blish/ibm.com_Open_Liberty-24.0.0.swidtag → ...blish/ibm.com_Open_Liberty-25.0.0.swidtag b/...blish/ibm.com_Open_Liberty-24.0.0.swidtag → ...blish/ibm.com_Open_Liberty-25.0.0.swidtag
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SoftwareIdentity name="Open Liberty" tagId="ibm.com-0ca5af184810448c851299b2c615ebb6-24.0.0" version="24.0.0" versionScheme="multipartnumeric" xml:lang="en" xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
+<SoftwareIdentity name="Open Liberty" tagId="ibm.com-0ca5af184810448c851299b2c615ebb6-25.0.0" version="25.0.0" versionScheme="multipartnumeric" xml:lang="en" xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
     <Meta persistentId="0ca5af184810448c851299b2c615ebb6"/>
     <Meta generator="4-1-20210113"/>
     <Entity name="IBM" regid="ibm.com" role="licensor tagCreator softwareCreator"/>

diff --git a/dev/build.image/publish/ibm.com_Open_Liberty_release.swidtag b/dev/build.image/publish/ibm.com_Open_Liberty_release.swidtag
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SoftwareIdentity name="Open Liberty" patch="true" tagId="ibm.com-0ca5af184810448c851299b2c615ebb6-24.0.0" version="@PRODUCT_VERSION@" versionScheme="multipartnumeric" xml:lang="en" xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
+<SoftwareIdentity name="Open Liberty" patch="true" tagId="ibm.com-0ca5af184810448c851299b2c615ebb6-25.0.0" version="@PRODUCT_VERSION@" versionScheme="multipartnumeric" xml:lang="en" xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
     <Meta persistentId="0ca5af184810448c851299b2c615ebb6"/>
     <Meta generator="4-1-20210113"/>
     <Meta revision="@PRODUCT_VERSION@"/>
-    <Link href="swid:ibm.com-0ca5af184810448c851299b2c615ebb6-24.0.0" rel="ancestor"/>
+    <Link href="swid:ibm.com-0ca5af184810448c851299b2c615ebb6-25.0.0" rel="ancestor"/>
     <Entity name="IBM" regid="ibm.com" role="licensor tagCreator softwareCreator"/>
 </SoftwareIdentity>
diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
@@ -3289,7 +3289,7 @@
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.18.600</version>
+      <version>3.21.0</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.transformer</groupId>
@@ -3949,7 +3949,7 @@
     <dependency>
       <groupId>org.jboss.weld.environment</groupId>
       <artifactId>weld-environment-common</artifactId>
-      <version>6.0.0.Beta1</version>
+      <version>6.0.0.CR1</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld.se</groupId>
@@ -3969,7 +3969,7 @@
     <dependency>
       <groupId>org.jboss.weld.se</groupId>
       <artifactId>weld-se-core</artifactId>
-      <version>6.0.0.Beta1</version>
+      <version>6.0.0.CR1</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld</groupId>
@@ -3994,7 +3994,7 @@
     <dependency>
       <groupId>org.jboss.weld</groupId>
       <artifactId>weld-osgi-bundle</artifactId>
-      <version>6.0.0.Beta1</version>
+      <version>6.0.0.CR1</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>

diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven
@@ -785,16 +785,16 @@ org.jboss.shrinkwrap:shrinkwrap-api:1.2.3
 org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.3
 org.jboss.shrinkwrap:shrinkwrap-spi:1.2.3
 org.jboss.weld.environment:weld-environment-common:5.1.1.SP2
-org.jboss.weld.environment:weld-environment-common:6.0.0.Beta1
+org.jboss.weld.environment:weld-environment-common:6.0.0.CR1
 org.jboss.weld.se:weld-se-core:3.1.9.Final
 org.jboss.weld.se:weld-se-core:4.0.3.Final
 org.jboss.weld.se:weld-se-core:5.1.1.SP2
-org.jboss.weld.se:weld-se-core:6.0.0.Beta1
+org.jboss.weld.se:weld-se-core:6.0.0.CR1
 org.jboss.weld:weld-osgi-bundle:2.4.8.Final
 org.jboss.weld:weld-osgi-bundle:3.1.9.Final
 org.jboss.weld:weld-osgi-bundle:4.0.3.Final
 org.jboss.weld:weld-osgi-bundle:5.1.1.SP2
-org.jboss.weld:weld-osgi-bundle:6.0.0.Beta1
+org.jboss.weld:weld-osgi-bundle:6.0.0.CR1
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.9.0
 org.jetbrains:annotations:13.0

diff --git a/dev/cnf/resources/bnd/liberty-release.props b/dev/cnf/resources/bnd/liberty-release.props
@@ -13,14 +13,14 @@
 
 releaseTypeGA=true
 
-libertyBaseVersion=24.0.0
-libertyFixpackVersion=12
+libertyBaseVersion=25.0.0
+libertyFixpackVersion=1
 libertyServiceVersion=${libertyBaseVersion}.${libertyFixpackVersion}
-libertyBetaVersion=2024.12.0.0
+libertyBetaVersion=2025.1.0.0
 libertyRelease=${if;${releaseTypeGA};${libertyServiceVersion};${libertyBetaVersion}}
 
-libertyBundleMicroVersion=96
-copyrightBuildYear=2024
+libertyBundleMicroVersion=97
+copyrightBuildYear=2025
 buildID=${libertyRelease}-${def;buildLabel}
 productEdition=BASE_ILAN
 productLicenseType=ILAN

diff --git a/...om.ibm.rls.jdbc/src/com/ibm/ws/recoverylog/custom/jdbc/impl/SQLMultiScopeRecoveryLog.java b/...om.ibm.rls.jdbc/src/com/ibm/ws/recoverylog/custom/jdbc/impl/SQLMultiScopeRecoveryLog.java
@@ -144,7 +144,7 @@ public class SQLMultiScopeRecoveryLog implements LogCursorCallback, MultiScopeLo
     /**
      * Which RDBMS are we working against?
      */
-    private DBProduct dbProduct;
+    private volatile DBProduct dbProduct;
 
     private boolean isolationFailureReported;
 
@@ -223,7 +223,7 @@ public class SQLMultiScopeRecoveryLog implements LogCursorCallback, MultiScopeLo
      * A flag to indicate that the log was being recovered by a peer
      * but it has been reclaimed by its "home" server.
      */
-    volatile private boolean _peerServerLostLogOwnership;
+    private volatile boolean _peerServerLostLogOwnership;
 
     /**
      * These strings are used for Database table creation. DDL is

diff --git a/...com.ibm.rls.jdbc/src/com/ibm/ws/recoverylog/custom/jdbc/impl/SQLSharedServerLeaseLog.java b/...com.ibm.rls.jdbc/src/com/ibm/ws/recoverylog/custom/jdbc/impl/SQLSharedServerLeaseLog.java
@@ -70,9 +70,9 @@ public class SQLSharedServerLeaseLog extends LeaseLogImpl implements SharedServe
     /**
      * Which RDBMS are we working against?
      */
-    private DBProduct dbProduct;
+    private volatile DBProduct dbProduct;
 
-    volatile private boolean _leaseTableExists;
+    private volatile boolean _leaseTableExists;
     private boolean _sqlTransientErrorHandlingEnabled = true;
     private boolean _logRetriesEnabled;
     private int _leaseTimeout;

diff --git a/dev/com.ibm.tx.jta/src/com/ibm/tx/jta/impl/RecoveryManager.java b/dev/com.ibm.tx.jta/src/com/ibm/tx/jta/impl/RecoveryManager.java
@@ -86,16 +86,16 @@ public class RecoveryManager implements Runnable {
 
     private final RecoveryAgent _agent;
     protected RecoveryLog _tranLog; // 169107
-    protected RecoveryLog _xaLog; // 169107
-    protected final RecoveryLog _recoverXaLog; //@MD18134A
+    private RecoveryLog _xaLog; // 169107
+    private final RecoveryLog _recoverXaLog; //@MD18134A
 
     private SharedServerLeaseLog _leaseLog;
     private String _recoveryGroup;
     private String _localRecoveryIdentity;
     private boolean _peerTranLogEverOpened = false;
     private boolean _peerXaLogEverOpened = false;
 
-    protected PartnerLogTable _recoveryPartnerLogTable;
+    private PartnerLogTable _recoveryPartnerLogTable;
 
     private byte[] _ourApplId;
     private int _ourEpoch;
@@ -126,16 +126,10 @@ public class RecoveryManager implements Runnable {
     // The following relate to the service data recoverable unit in the transaction log
     // This is reserved and holds the servername, applid and epoch.
     //
-    protected RecoverableUnit _tranlogServiceData;
-    protected RecoverableUnitSection _tranlogServerSection;
-    protected RecoverableUnitSection _tranlogApplIdSection;
-    protected RecoverableUnitSection _tranlogEpochSection;
-
-    protected String _classPath; // current classpath for recovery
-    // These are static as they are only initialized from the "server's" own log
-    // We use our own classpaths and not from other servers in case we recover
-    // for a filesystem that does not match our own.
-    protected static String _loggedClassPath; // classpath read from the log at startup
+    private RecoverableUnit _tranlogServiceData;
+    private RecoverableUnitSection _tranlogServerSection;
+    private RecoverableUnitSection _tranlogApplIdSection;
+    private RecoverableUnitSection _tranlogEpochSection;
 
     // Server States logged for serviceability
     private static final int STARTING = 1;
@@ -152,9 +146,9 @@ public class RecoveryManager implements Runnable {
     /**
      * This set contains a list of all recovering transactions.
      */
-    protected Set<TransactionImpl> _recoveringTransactions;
+    private final Set<TransactionImpl> _recoveringTransactions;
 
-    protected final Object _recoveryMonitor = new Object();
+    private final Object _recoveryMonitor = new Object();
 
     private boolean _cleanRemoteShutdown;
 

diff --git a/...m.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java b/...m.ibm.websphere.appserver.features/test/src/com/ibm/ws/feature/tests/VersionlessTest.java
@@ -356,6 +356,9 @@ public void validatePlatformSettings() {
                 if (featurePlatform.equals("javaee-6.0")) {
                     continue;
                 }
+                if(featurePlatform.equals("jakartaee-8.0") && platforms.contains("javaee-8.0")){
+                    continue;
+                }
                 if (platforms.contains(featurePlatform)) {
                     matches++;
                 } else {
@@ -370,6 +373,9 @@ public void validatePlatformSettings() {
                     }
                 }
             }
+            if(platforms.contains("javaee-8.0") && !featurePlatforms.contains("jakartaee-8.0")){
+                errorMessage.append(featureName).append(" is missing platform jakartaee-8.0\n");
+            }
         }
 
         // Special private features that also should have platforms listed in them

diff --git a/...lity/public/appClientSupport-1.0/com.ibm.websphere.appserver.appClientSupport-1.0.feature b/...lity/public/appClientSupport-1.0/com.ibm.websphere.appserver.appClientSupport-1.0.feature
@@ -85,4 +85,4 @@ Subsystem-Name: Application Client Support for Server 1.0
 kind=ga
 edition=base
 WLP-Activation-Type: parallel
-WLP-Platform: javaee-6.0,javaee-7.0,javaee-8.0
+WLP-Platform: javaee-6.0,javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...res/visibility/public/appSecurity-3.0/com.ibm.websphere.appserver.appSecurity-3.0.feature b/...res/visibility/public/appSecurity-3.0/com.ibm.websphere.appserver.appSecurity-3.0.feature
@@ -35,4 +35,4 @@ edition=core
 -jars=com.ibm.websphere.appserver.spi.jaspic; location:=dev/spi/ibm/
 -files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.jaspic_1.1-javadoc.zip
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0