Update target JDK to 11 and move to JakartaEE 9 (#889)

Co-authored-by: Valery Kharseko <[email protected]>

Author: maximthomas

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8', '11', '17', '21', '25' ]
+        java: [ '11', '17', '21', '25' ]
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
       fail-fast: false
     steps:
@@ -55,17 +55,18 @@ jobs:
           openam-server-only/target/*.war
           openam-distribution/openam-distribution-docker/Dockerfile*
   build-docker:
+    needs: build-maven
     runs-on: 'ubuntu-latest'
     services:
       registry:
         image: registry:2
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          fetch-depth: 0
-          submodules: recursive
+          name: ubuntu-latest-11
       - name: Get latest release version
         shell: bash
         run:   |
@@ -86,11 +87,14 @@ jobs:
         uses: docker/setup-buildx-action@v3
         with:
           driver-opts: network=host
+      - name: Prepare Dockerfile
+        shell: bash
+        run: sed -i -E '/^#COPY openam-(server|distribution)\//s/^#//' ./openam-distribution/openam-distribution-docker/Dockerfile
       - name: Build image
         uses: docker/build-push-action@v5
         continue-on-error: true
         with:
-          context: ./openam-distribution/openam-distribution-docker
+          context: .
           file: ./openam-distribution/openam-distribution-docker/Dockerfile
           build-args: |
             VERSION=${{ env.release_version }}
@@ -149,75 +153,3 @@ jobs:
            http://openam.example.org:8080/openam/json/authenticate | grep tokenId'
           
           docker inspect --format="{{json .State.Health.Status}}" test-openam | grep -q \"healthy\"
-  build-docker-alpine:
-    runs-on: 'ubuntu-latest'
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Get latest release version
-        shell: bash
-        run:   |
-          export git_version_last="$(curl -i -o - --silent https://api.github.com/repos/OpenIdentityPlatform/OpenAM/releases/latest | grep -m1 "\"name\"" | cut -d\" -f4)" ; echo "last release: $git_version_last"
-          echo "release_version=$git_version_last" >> $GITHUB_ENV
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            localhost:5000/${{ github.repository }}
-          tags: |
-            type=raw,value=alpine
-            type=raw,value=${{ env.release_version }}-alpine
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
-      - name: Build image
-        uses: docker/build-push-action@v5
-        continue-on-error: true
-        with:
-          context: ./openam-distribution/openam-distribution-docker
-          file: ./openam-distribution/openam-distribution-docker/Dockerfile-alpine
-          build-args: |
-            VERSION=${{ env.release_version }}
-          platforms: linux/amd64,linux/arm64/8, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-      - name: Docker test
-        shell: bash
-        run: |
-          docker run --rm -it -d --memory="2g" -h openam.example.org --name=test localhost:5000/${GITHUB_REPOSITORY,,}:${{ env.release_version }}-alpine
-          timeout 3m bash -c 'until docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"; do sleep 10; done'
-          docker exec -w '/usr/openam/ssoconfiguratortools' test bash -c \
-          'echo "ACCEPT_LICENSES=true
-          SERVER_URL=http://openam.example.org:8080
-          DEPLOYMENT_URI=/$OPENAM_PATH
-          BASE_DIR=$OPENAM_DATA_DIR
-          locale=en_US
-          PLATFORM_LOCALE=en_US
-          AM_ENC_KEY=
-          ADMIN_PWD=passw0rd
-          AMLDAPUSERPASSWD=p@passw0rd
-          COOKIE_DOMAIN=example.org
-          ACCEPT_LICENSES=true
-          DATA_STORE=embedded
-          DIRECTORY_SSL=SIMPLE
-          DIRECTORY_SERVER=openam.example.org
-          DIRECTORY_PORT=50389
-          DIRECTORY_ADMIN_PORT=4444
-          DIRECTORY_JMX_PORT=1689
-          ROOT_SUFFIX=dc=openam,dc=example,dc=org
-          DS_DIRMGRDN=cn=Directory Manager
-          DS_DIRMGRPASSWD=passw0rd" > conf.file && java -jar openam-configurator-tool*.jar --file conf.file'
-          sleep 35
-          docker inspect --format="{{json .State.Health.Status}}" test | grep -q \"healthy\"

.github/workflows/deploy.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Java for publishing to Maven Central Repository OSS
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ github.event.workflow_run.head_branch == 'release/16.0.0-SNAPSHOT' && '11' || '8'}}
+          java-version: ${{ github.event.workflow_run.head_branch == 'sustaining/15.2.x' && '8' || '11'}}
           distribution: 'zulu'
           server-id: ossrh
           server-username: MAVEN_USERNAME

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Java for publishing to Maven Central Repository OSS
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'zulu'
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -163,50 +163,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-  release-docker-alpine:
-    runs-on: 'ubuntu-latest'
-    needs:
-      - release-maven
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.releaseVersion }}
-          fetch-depth: 1
-          submodules: recursive
-      - name: Docker meta (alpine)
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ github.repository }}
-            ghcr.io/${{ github.repository }}/${{ github.event.repository.name }}
-          tags: |
-            type=raw,value=alpine
-            type=raw,value=${{ github.event.inputs.releaseVersion }}-alpine
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push image
-        continue-on-error: true
-        uses: docker/build-push-action@v5
-        with:
-          context: ./openam-distribution/openam-distribution-docker
-          file: ./openam-distribution/openam-distribution-docker/Dockerfile-alpine
-          build-args: |
-            VERSION=${{ github.event.inputs.releaseVersion }}
-          platforms: linux/amd64,linux/arm64/8, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

README.md

@@ -48,7 +48,7 @@ This project is licensed under the [Common Development and Distribution License
   * [IIS  Windows x32/x64](https://github.com/OpenIdentityPlatform/OpenAM-Web-Agents/releases)
 
 ## How-to Build OpenAM from Source
-To build OpenAM from source you should use JDK 8 or higher
+To build OpenAM from source you should use JDK 11 or higher
 
 For Windows users before clone and build run the following command:
 ```bash

SECURITY.md

@@ -2,13 +2,15 @@
 
 ## Supported Versions
 
-| Version                                | Supported                                    |
-| -------------------------------------- | -------------------------------------------- |
-| Open Identity Platform OpenAM 14.x.x   | :white_check_mark:                           |
-| Forgerock OpenAM 13.х.x                | :x: upgrade to Open Identity Platform OpenAM |
-| Forgerock OpenAM 12.х.x                | :x: upgrade to Open Identity Platform OpenAM |
-| Forgerock OpenAM 11.х.x                | :x: upgrade to Open Identity Platform OpenAM |
-| Sun/Oracle OpenSSO 10.х.x              | :x: upgrade to Open Identity Platform OpenAM |
+| Version                              | Java Versions Support | EE         | Supported                                                                                                                                   |
+|--------------------------------------|-----------------------|------------|---------------------------------------------------------------------------------------------------------------------------------------------|
+| Open Identity Platform OpenAM 16.x.x | 11 and later          | Jakarta EE | :white_check_mark: Community support, [approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List)  |
+| Open Identity Platform OpenAM 15.x.x | 8 and later           | Java EE    | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List)                     |
+| Open Identity Platform OpenAM 14.x.x | 8 and later           | Java EE    | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List)                     |
+| Forgerock OpenAM 13.х.x              | 1.7, 8 and later      | Java EE    | :x: upgrade to Open Identity Platform OpenAM                                                                                                |
+| Forgerock OpenAM 12.х.x              | 1.7, 8 and later      | Java EE    | :x: upgrade to Open Identity Platform OpenAM                                                                                                |
+| Forgerock OpenAM 11.х.x              | 1.6, 1.7              | Java EE    | :x: upgrade to Open Identity Platform OpenAM                                                                                                |
+| Sun/Oracle OpenSSO 10.х.x            | 1.5, 1.6              | Java EE    | :x: upgrade to Open Identity Platform OpenAM                                                                                                |
 
 ## Reporting a Vulnerability
 

jato-shaded/pom.xml

@@ -13,6 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2025 3A Systems LLC.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -21,15 +22,16 @@
     <parent>
         <groupId>org.openidentityplatform.openam</groupId>
         <artifactId>openam</artifactId>
-        <version>15.2.3-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
     </parent>
 
     <!-- Component Definition -->
     <name>OpenAM Jato Shaded</name>
     <description>OpenAM Jato Shaded Library</description>
-    <groupId>org.openidentityplatform.openam.shaded</groupId>
+    <groupId>org.openidentityplatform.external.com.iplanet.jato</groupId>
     <artifactId>jato-shaded</artifactId>
     <packaging>jar</packaging>
+    <version>2005-05-04</version>
 
     <!-- Build -->
 
@@ -38,6 +40,7 @@
         <dependency>
             <groupId>org.openidentityplatform.external.com.iplanet.jato</groupId>
             <artifactId>jato</artifactId>
+            <version>2005-05-04</version>
         </dependency>
     </dependencies>
     <build>

jato-shaded/src/main/java/com/iplanet/jato/util/Encoder.java

@@ -13,8 +13,8 @@
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
-
 public class Encoder {
+
     private Encoder() {
     }
 
@@ -35,20 +35,11 @@ public static byte[] decodeBase64(String s) {
     }
 
     public static String encodeHttp64(byte[] bytes, int compressThreshold) {
-        byte[] result;
-        if (bytes.length > compressThreshold) {
-            result = compress(bytes);
-        } else {
-            result = new byte[bytes.length + 1];
-            result[0] = 0;
-            System.arraycopy(bytes, 0, result, 1, bytes.length);
-        }
-        return Base64.getUrlEncoder().encodeToString(result);
+        return Base64.getUrlEncoder().encodeToString(bytes);
     }
 
     public static byte[] decodeHttp64(String s) {
-        byte[] result = Base64.getUrlDecoder().decode(s);
-        return decompress(result);
+        return Base64.getUrlDecoder().decode(s);
     }
 
     public static byte[] compress(byte[] in) {
@@ -104,7 +95,7 @@ private static byte[] subBuffer(byte[] in, int idx, int len) {
     public static byte[] serialize(Serializable o, boolean compress) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
         DeflaterOutputStream dos = null;
-        ObjectOutputStream oos;
+        ObjectOutputStream oos = null;
         if (compress) {
             dos = new DeflaterOutputStream(baos, new Deflater(9));
             oos = new ObjectOutputStream(dos);
@@ -125,8 +116,8 @@ public static byte[] serialize(Serializable o, boolean compress) throws IOExcept
 
     public static Object deserialize(byte[] b, boolean compressed) throws IOException, ClassNotFoundException {
         ByteArrayInputStream bais = new ByteArrayInputStream(b);
-        InflaterInputStream iis;
-        ObjectInputStream ois;
+        InflaterInputStream iis = null;
+        ObjectInputStream ois = null;
         if (compressed) {
             iis = new InflaterInputStream(bais);
             ois = new ApplicationObjectInputStream(iis);
@@ -138,3 +129,4 @@ public static Object deserialize(byte[] b, boolean compressed) throws IOExceptio
         return result;
     }
 }
+

openam-annotations/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openidentityplatform.openam</groupId>
         <artifactId>openam</artifactId>
-        <version>15.2.3-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
     </parent>
 
     <!-- Component Definition -->

openam-audit/openam-audit-configuration/pom.xml

@@ -13,13 +13,13 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
- * Portions copyright 2023 3A Systems LLC
+ * Portions copyright 2023-2025 3A Systems LLC
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>openam-audit</artifactId>
         <groupId>org.openidentityplatform.openam</groupId>
-        <version>15.2.3-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -80,10 +80,17 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.activemq</groupId>
+            <groupId>org.openidentityplatform.openam.jakarta</groupId>
             <artifactId>activemq-client</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--activemq dependencies-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+            <version>1.0.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

openam-audit/openam-audit-configuration/src/main/java/org/forgerock/openam/audit/configuration/AuditServiceConfigurationProviderImpl.java

@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2025 3A Systems LLC.
  */
 package org.forgerock.openam.audit.configuration;
 
@@ -43,7 +44,7 @@
 import org.forgerock.openam.utils.JsonValueBuilder;
 import org.forgerock.openam.utils.RealmUtils;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.AccessController;