Merge branch 'OpenLiberty:integration' into FIPSwork

OpenLiberty · Nov 29, 2024 · 7ffa5ea · 7ffa5ea
2 parents 28144eb + b6c1ed3
commit 7ffa5ea
Show file tree

Hide file tree

Showing 51 changed files with 140 additions and 181 deletions.
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
diff --git a/...server.features/visibility/public/batch-1.0/com.ibm.websphere.appserver.batch-1.0.feature b/...server.features/visibility/public/batch-1.0/com.ibm.websphere.appserver.batch-1.0.feature
@@ -38,5 +38,5 @@ Subsystem-Name: Batch API 1.0
 kind=ga
 edition=base
 WLP-Activation-Type: parallel
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
 WLP-InstantOn-Enabled: true; type:=beta
diff --git a/...sibility/public/beanValidation-2.0/com.ibm.websphere.appserver.beanValidation-2.0.feature b/...sibility/public/beanValidation-2.0/com.ibm.websphere.appserver.beanValidation-2.0.feature
@@ -51,4 +51,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/....appserver.features/visibility/public/cdi-2.0/com.ibm.websphere.appserver.cdi-2.0.feature b/....appserver.features/visibility/public/cdi-2.0/com.ibm.websphere.appserver.cdi-2.0.feature
@@ -66,4 +66,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...tures/visibility/public/concurrent-1.0/com.ibm.websphere.appserver.concurrent-1.0.feature b/...tures/visibility/public/concurrent-1.0/com.ibm.websphere.appserver.concurrent-1.0.feature
@@ -24,4 +24,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/....appserver.features/visibility/public/ejb-3.2/com.ibm.websphere.appserver.ejb-3.2.feature b/....appserver.features/visibility/public/ejb-3.2/com.ibm.websphere.appserver.ejb-3.2.feature
@@ -16,4 +16,4 @@ Subsystem-Category: JavaEE7Application
   com.ibm.websphere.appserver.mdb-3.2
 kind=ga
 edition=base
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...er.features/visibility/public/ejbHome-3.2/com.ibm.websphere.appserver.ejbHome-3.2.feature b/...er.features/visibility/public/ejbHome-3.2/com.ibm.websphere.appserver.ejbHome-3.2.feature
@@ -10,4 +10,4 @@ Subsystem-Name: Enterprise JavaBeans Home Interfaces 3.2
 -bundles=com.ibm.ws.ejbcontainer.ejb2x
 kind=ga
 edition=base
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...er.features/visibility/public/ejbLite-3.2/com.ibm.websphere.appserver.ejbLite-3.2.feature b/...er.features/visibility/public/ejbLite-3.2/com.ibm.websphere.appserver.ejbLite-3.2.feature
@@ -101,4 +101,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/.../public/ejbPersistentTimer-3.2/com.ibm.websphere.appserver.ejbPersistentTimer-3.2.feature b/.../public/ejbPersistentTimer-3.2/com.ibm.websphere.appserver.ejbPersistentTimer-3.2.feature
@@ -15,4 +15,4 @@ Subsystem-Name: Enterprise JavaBeans Persistent Timers 3.2
 -bundles=com.ibm.ws.ejbcontainer.timer.persistent
 kind=ga
 edition=base
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...eatures/visibility/public/ejbRemote-3.2/com.ibm.websphere.appserver.ejbRemote-3.2.feature b/...eatures/visibility/public/ejbRemote-3.2/com.ibm.websphere.appserver.ejbRemote-3.2.feature
@@ -67,4 +67,4 @@ Subsystem-Name: Enterprise JavaBeans Remote 3.2
 -files=clients/ejbRemotePortable.jar
 kind=ga
 edition=base
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...re.appserver.features/visibility/public/el-3.0/com.ibm.websphere.appserver.el-3.0.feature b/...re.appserver.features/visibility/public/el-3.0/com.ibm.websphere.appserver.el-3.0.feature
@@ -20,4 +20,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...sibility/public/j2eeManagement-1.1/com.ibm.websphere.appserver.j2eeManagement-1.1.feature b/...sibility/public/j2eeManagement-1.1/com.ibm.websphere.appserver.j2eeManagement-1.1.feature
@@ -73,4 +73,4 @@ Subsystem-Name: J2EE Management 1.1
 -files=dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.j2eemanagement_1.1-javadoc.zip
 kind=ga
 edition=base
-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/...ppserver.features/visibility/public/jacc-1.5/com.ibm.websphere.appserver.jacc-1.5.feature b/...ppserver.features/visibility/public/jacc-1.5/com.ibm.websphere.appserver.jacc-1.5.feature
@@ -19,5 +19,5 @@ kind=ga
 edition=core
 -jars=com.ibm.websphere.appserver.api.jacc; location:=dev/api/ibm/
 -files=dev/api/ibm/javadoc/com.ibm.websphere.appserver.api.jacc_1.0-javadoc.zip
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
 WLP-InstantOn-Enabled: true
diff --git a/...rver.features/visibility/public/jaspic-1.1/com.ibm.websphere.appserver.jaspic-1.1.feature b/...rver.features/visibility/public/jaspic-1.1/com.ibm.websphere.appserver.jaspic-1.1.feature
@@ -24,4 +24,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-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/....features/visibility/public/javaMail-1.6/com.ibm.websphere.appserver.javaMail-1.6.feature b/....features/visibility/public/javaMail-1.6/com.ibm.websphere.appserver.javaMail-1.6.feature
@@ -53,4 +53,4 @@ IBM-SPI-Package: \
 kind=ga
 edition=core
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...ppserver.features/visibility/public/jaxb-2.2/com.ibm.websphere.appserver.jaxb-2.2.feature b/...ppserver.features/visibility/public/jaxb-2.2/com.ibm.websphere.appserver.jaxb-2.2.feature
@@ -35,4 +35,4 @@ Subsystem-Name: Java XML Bindings 2.2
   bin/jaxb/schemagen.bat
 kind=ga
 edition=core
-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/...server.features/visibility/public/jaxrs-2.1/com.ibm.websphere.appserver.jaxrs-2.1.feature b/...server.features/visibility/public/jaxrs-2.1/com.ibm.websphere.appserver.jaxrs-2.1.feature
@@ -16,4 +16,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...res/visibility/public/jaxrsClient-2.1/com.ibm.websphere.appserver.jaxrsClient-2.1.feature b/...res/visibility/public/jaxrsClient-2.1/com.ibm.websphere.appserver.jaxrsClient-2.1.feature
@@ -30,4 +30,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...server.features/visibility/public/jaxws-2.2/com.ibm.websphere.appserver.jaxws-2.2.feature b/...server.features/visibility/public/jaxws-2.2/com.ibm.websphere.appserver.jaxws-2.2.feature
@@ -97,4 +97,4 @@ Subsystem-Name: Java Web Services 2.2
 kind=ga
 edition=base
 WLP-InstantOn-Enabled: true
-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/....appserver.features/visibility/public/jca-1.7/com.ibm.websphere.appserver.jca-1.7.feature b/....appserver.features/visibility/public/jca-1.7/com.ibm.websphere.appserver.jca-1.7.feature
@@ -25,4 +25,4 @@ kind=ga
 edition=base
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/.../public/jcaInboundSecurity-1.0/com.ibm.websphere.appserver.jcaInboundSecurity-1.0.feature b/.../public/jcaInboundSecurity-1.0/com.ibm.websphere.appserver.jcaInboundSecurity-1.0.feature
@@ -21,5 +21,5 @@ Subsystem-Name: Java Connector Architecture Security Inflow 1.0
    com.ibm.websphere.javaee.jaspic.1.1; location:=dev/api/spec/; mavenCoordinates="javax.security.auth.message:javax.security.auth.message-api:1.1"
 kind=ga
 edition=base
-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
 WLP-InstantOn-Enabled: true; type:=beta
diff --git a/...ppserver.features/visibility/public/jdbc-4.2/com.ibm.websphere.appserver.jdbc-4.2.feature b/...ppserver.features/visibility/public/jdbc-4.2/com.ibm.websphere.appserver.jdbc-4.2.feature
@@ -20,4 +20,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0,jakartaee-9.1,jakartaee-10.0
+WLP-Platform: javaee-8.0,jakartaee-8.0,jakartaee-9.1,jakartaee-10.0
diff --git a/....appserver.features/visibility/public/jms-2.0/com.ibm.websphere.appserver.jms-2.0.feature b/....appserver.features/visibility/public/jms-2.0/com.ibm.websphere.appserver.jms-2.0.feature
@@ -21,4 +21,4 @@ Subsystem-Name: Java Message Service 2.0
 kind=ga
 edition=base
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/....appserver.features/visibility/public/jpa-2.2/com.ibm.websphere.appserver.jpa-2.2.feature b/....appserver.features/visibility/public/jpa-2.2/com.ibm.websphere.appserver.jpa-2.2.feature
@@ -232,4 +232,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...s/visibility/public/jpaContainer-2.2/com.ibm.websphere.appserver.jpaContainer-2.2.feature b/...s/visibility/public/jpaContainer-2.2/com.ibm.websphere.appserver.jpaContainer-2.2.feature
@@ -32,4 +32,4 @@ IBM-App-ForceRestart: uninstall, \
  com.ibm.ws.jpa.container.thirdparty
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/....appserver.features/visibility/public/jsf-2.3/com.ibm.websphere.appserver.jsf-2.3.feature b/....appserver.features/visibility/public/jsf-2.3/com.ibm.websphere.appserver.jsf-2.3.feature
@@ -59,4 +59,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...s/visibility/public/jsfContainer-2.3/com.ibm.websphere.appserver.jsfContainer-2.3.feature b/...s/visibility/public/jsfContainer-2.3/com.ibm.websphere.appserver.jsfContainer-2.3.feature
@@ -24,4 +24,4 @@ IBM-API-Package: org.jboss.weld;type="internal",\
 -jars=com.ibm.ws.jsfContainer; location:=lib/
 kind=ga
 edition=core
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...server.features/visibility/public/jsonb-1.0/com.ibm.websphere.appserver.jsonb-1.0.feature b/...server.features/visibility/public/jsonb-1.0/com.ibm.websphere.appserver.jsonb-1.0.feature
@@ -16,4 +16,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...sibility/public/jsonbContainer-1.0/com.ibm.websphere.appserver.jsonbContainer-1.0.feature b/...sibility/public/jsonbContainer-1.0/com.ibm.websphere.appserver.jsonbContainer-1.0.feature
@@ -14,4 +14,4 @@ Subsystem-Name: JavaScript Object Notation Binding 1.0 via Bells
 -bundles=com.ibm.ws.jsonb.service
 kind=ga
 edition=core
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...server.features/visibility/public/jsonp-1.1/com.ibm.websphere.appserver.jsonp-1.1.feature b/...server.features/visibility/public/jsonp-1.1/com.ibm.websphere.appserver.jsonp-1.1.feature
@@ -13,4 +13,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...sibility/public/jsonpContainer-1.1/com.ibm.websphere.appserver.jsonpContainer-1.1.feature b/...sibility/public/jsonpContainer-1.1/com.ibm.websphere.appserver.jsonpContainer-1.1.feature
@@ -10,4 +10,4 @@ Subsystem-Name: JavaScript Object Notation Processing 1.1 via Bells
 -features=com.ibm.websphere.appserver.jsonpImpl-1.1.0
 kind=ga
 edition=core
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/....appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature b/....appserver.features/visibility/public/jsp-2.3/com.ibm.websphere.appserver.jsp-2.3.feature
@@ -54,4 +54,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...s/visibility/public/managedBeans-1.0/com.ibm.websphere.appserver.managedBeans-1.0.feature b/...s/visibility/public/managedBeans-1.0/com.ibm.websphere.appserver.managedBeans-1.0.feature
@@ -90,4 +90,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-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/....appserver.features/visibility/public/mdb-3.2/com.ibm.websphere.appserver.mdb-3.2.feature b/....appserver.features/visibility/public/mdb-3.2/com.ibm.websphere.appserver.mdb-3.2.feature
@@ -94,4 +94,4 @@ Subsystem-Name: Message-Driven Beans 3.2
 kind=ga
 edition=base
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...er.features/visibility/public/servlet-4.0/com.ibm.websphere.appserver.servlet-4.0.feature b/...er.features/visibility/public/servlet-4.0/com.ibm.websphere.appserver.servlet-4.0.feature
@@ -88,4 +88,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-8.0
+WLP-Platform: javaee-8.0,jakartaee-8.0
diff --git a/...s/visibility/public/wasJmsClient-2.0/com.ibm.websphere.appserver.wasJmsClient-2.0.feature b/...s/visibility/public/wasJmsClient-2.0/com.ibm.websphere.appserver.wasJmsClient-2.0.feature
@@ -34,4 +34,4 @@ Subsystem-Name: JMS 2.0 Client for Message Server
 kind=ga
 edition=base
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/...sibility/public/wasJmsSecurity-1.0/com.ibm.websphere.appserver.wasJmsSecurity-1.0.feature b/...sibility/public/wasJmsSecurity-1.0/com.ibm.websphere.appserver.wasJmsSecurity-1.0.feature
@@ -23,4 +23,4 @@ Subsystem-Name: Message Server Security 1.0
 kind=ga
 edition=base
 WLP-InstantOn-Enabled: true
-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/...s/visibility/public/wasJmsServer-1.0/com.ibm.websphere.appserver.wasJmsServer-1.0.feature b/...s/visibility/public/wasJmsServer-1.0/com.ibm.websphere.appserver.wasJmsServer-1.0.feature
@@ -29,4 +29,4 @@ Subsystem-Name: Message Server 1.0
 kind=ga
 edition=base
 WLP-InstantOn-Enabled: true
-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/...eatures/visibility/public/websocket-1.1/com.ibm.websphere.appserver.websocket-1.1.feature b/...eatures/visibility/public/websocket-1.1/com.ibm.websphere.appserver.websocket-1.1.feature
@@ -23,4 +23,4 @@ kind=ga
 edition=core
 WLP-Activation-Type: parallel
 WLP-InstantOn-Enabled: true
-WLP-Platform: javaee-7.0,javaee-8.0
+WLP-Platform: javaee-7.0,javaee-8.0,jakartaee-8.0
diff --git a/dev/com.ibm.ws.security.acme_fat/bnd.bnd b/dev/com.ibm.ws.security.acme_fat/bnd.bnd
@@ -27,8 +27,8 @@ tested.features: servlet-3.1, appsecurity-4.0, expressionlanguage-4.0, cdi-3.0,
 #fat.test.use.remote.docker: true
 
 fat.test.container.images: mariadb:10.3, \
-                           letsencrypt/pebble:latest, \
-                           letsencrypt/pebble-challtestsrv:latest, \
+                           letsencrypt/pebble:v2.3.1, \
+                           letsencrypt/pebble-challtestsrv:v2.3.1, \
                            ryanesch/acme-boulder:1.2
 
 -buildpath: \

diff --git a/....ws.security.acme_fat/fat/src/com/ibm/ws/security/acme/docker/pebble/PebbleContainer.java b/....ws.security.acme_fat/fat/src/com/ibm/ws/security/acme/docker/pebble/PebbleContainer.java
@@ -58,7 +58,7 @@ public class PebbleContainer extends CAContainer {
 
 	private Network network = Network.newNetwork();
 
-	public final GenericContainer<?> challtestsrv = new GenericContainer<>("letsencrypt/pebble-challtestsrv")
+	public final GenericContainer<?> challtestsrv = new GenericContainer<>(DockerImageName.parse("letsencrypt/pebble-challtestsrv:v2.3.1"))
 			.withCommand("pebble-challtestsrv").withExposedPorts(DNS_PORT, CHALL_MANAGEMENT_PORT).withNetwork(network)
 			.withLogConsumer(o -> System.out.print("[CHL] " + o.getUtf8String()));
 
@@ -102,7 +102,7 @@ public static void log(OutputFrame frame) {
 	public PebbleContainer() {
 		super(new ImageFromDockerfile()
 				.withDockerfileFromBuilder(builder -> builder.from(
-						ImageNameSubstitutor.instance().apply(DockerImageName.parse("letsencrypt/pebble")).asCanonicalNameString())
+						ImageNameSubstitutor.instance().apply(DockerImageName.parse("letsencrypt/pebble:v2.3.1")).asCanonicalNameString())
 						.copy("pebble-config.json", "/test/config/pebble-config.json").build())
 				.withFileFromFile("pebble-config.json", PEBBLE_CONFIG_JSON_FILE), 5002, 14000, 15000);
 		challtestsrv.withStartupAttempts(20);