Update target JDK to 11 and move to JakartaEE 9

.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:
@@ -172,7 +172,7 @@ jobs:
           file: ./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
+          platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.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: 'temurin'
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -168,7 +168,7 @@ jobs:
           file: ./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
+          platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile-alpine

@@ -1,6 +1,6 @@
-FROM openjdk:8-jre-alpine
+FROM alpine:latest
 
-MAINTAINER Open Identity Platform Community <open-identity-platform-opendj@googlegroups.com>
+LABEL org.opencontainers.image.authors="Open Identity Platform Community"
 
 ENV USER="openicf"
 ENV OPENICF_OPTS="-server -XX:+UseContainerSupport"
@@ -11,7 +11,7 @@ WORKDIR /opt
 
 #COPY OpenICF-java-framework/openicf-zip/target/*.zip ./
 
-RUN apk add --update --no-cache --virtual builddeps curl unzip \
+RUN apk add --update --no-cache --virtual builddeps curl unzip openjdk11-jre \
  && apk upgrade --update --no-cache \
  && apk add bash \
  && bash -c 'if [ ! -z "$VERSION" ] ; then rm -rf ./*.zip ; curl -L https://github.com/OpenIdentityPlatform/OpenICF/releases/download/$VERSION/openicf-$VERSION.zip --output openicf-$VERSION.zip ; fi' \

OpenICF-csvfile-connector/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.connectors</groupId>
         <artifactId>connectors-parent</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../OpenICF-java-framework/bundles-parent</relativePath>
     </parent>
     <groupId>org.openidentityplatform.openicf.connectors</groupId>

OpenICF-databasetable-connector/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.connectors</groupId>
         <artifactId>connectors-parent</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../OpenICF-java-framework/bundles-parent</relativePath>
     </parent>
     <groupId>org.openidentityplatform.openicf.connectors</groupId>

OpenICF-dbcommon/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../OpenICF-java-framework</relativePath>
     </parent>
     <groupId>org.openidentityplatform.openicf.connectors.misc</groupId>

OpenICF-groovy-connector/pom.xml

@@ -22,14 +22,14 @@
  your own identifying information:
  "Portions Copyrighted [year] [name of copyright owner]"
 
- Portions Copyrighted 2018-2024 3A Systems, LLC
+ Portions Copyrighted 2018-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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.openidentityplatform.openicf.connectors</groupId>
         <artifactId>connectors-parent</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../OpenICF-java-framework/bundles-parent</relativePath>
     </parent>
     <groupId>org.openidentityplatform.openicf.connectors</groupId>
@@ -236,6 +236,7 @@
                 <version>3.0.2</version>
                 <configuration>
                     <sourceEncoding>UTF-8</sourceEncoding>
+                    <targetBytecode>1.8</targetBytecode>
                 </configuration>
                 <executions>
                     <execution>

OpenICF-java-framework/bundles-parent/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.openidentityplatform.openicf.connectors</groupId>
     <artifactId>connectors-parent</artifactId>

OpenICF-java-framework/connector-framework-contract/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>connector-framework-contract</artifactId>
     <name>OpenICF Contract Tests</name>

OpenICF-java-framework/connector-framework-internal/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>connector-framework-internal</artifactId>
     <packaging>bundle</packaging>

OpenICF-java-framework/connector-framework-osgi/pom.xml

@@ -21,13 +21,15 @@
  with the fields enclosed by brackets [] replaced by
  your own identifying information:
  "Portions Copyrighted [year] [name of copyright owner]"
+
+ 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>
     <parent>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>connector-framework-osgi</artifactId>
     <packaging>bundle</packaging>
@@ -64,7 +66,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

OpenICF-java-framework/connector-framework-protobuf/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

OpenICF-java-framework/connector-framework-rpc/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

OpenICF-java-framework/connector-framework-server/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,6 +39,7 @@
     <properties>
         <!-- maven-compiler-plugin -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <osgi.grizzly.version>[3.0,5)</osgi.grizzly.version>
     </properties>
 
     <dependencies>
@@ -104,7 +105,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -164,6 +164,22 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Import-Package>
+                            org.glassfish.grizzly;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.asyncqueue;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.attributes;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.filterchain;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.http;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.http.util;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.nio.transport;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.ssl;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.strategies;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.threadpool;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.utils;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.websockets;version="${osgi.grizzly.version}",
+                            org.glassfish.grizzly.websockets.frametypes;version="${osgi.grizzly.version}",
+                            *
+                        </Import-Package>
                         <Bundle-Activator>org.forgerock.openicf.framework.osgi.internal.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>

OpenICF-java-framework/connector-framework/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>connector-framework</artifactId>
     <packaging>bundle</packaging>

OpenICF-java-framework/connector-server-grizzly/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -66,8 +66,8 @@
             <artifactId>grizzly-websockets</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- Test Dependencies -->

OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/ConnectorServer.java

@@ -20,6 +20,8 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2025 3A Systems LLC.
  */
 
 package org.forgerock.openicf.framework.server;
@@ -106,7 +108,7 @@ public class ConnectorServer {
             "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
             "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
             "SSL_RSA_WITH_RC4_128_MD5",
-            "TLS_EMPTY_RENEGOTIATION_INFO_SCSVFo", // per RFC 5746
+            "TLS_EMPTY_RENEGOTIATION_INFO_SCSV", // per RFC 5746
     };
     // @formatter:on
 

OpenICF-java-framework/connector-server-grizzly/src/main/java/org/forgerock/openicf/framework/server/grizzly/OpenICFWebSocketServlet.java

@@ -20,13 +20,15 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2025 3A Systems LLC.
  */
 
 package org.forgerock.openicf.framework.server.grizzly;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
 
 import org.forgerock.openicf.framework.ConnectorFramework;
 import org.glassfish.grizzly.websockets.WebSocketEngine;

OpenICF-java-framework/connector-server-jetty/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>framework</artifactId>
         <groupId>org.openidentityplatform.openicf.framework</groupId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -48,15 +48,25 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-server</artifactId>
+            <artifactId>websocket-jetty-server</artifactId>
             <scope>provided</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.eclipse.jetty.websocket</groupId>-->
+<!--            <artifactId>javax-websocket-server-impl</artifactId>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>javax.servlet</groupId>-->
+<!--            <artifactId>javax.servlet-api</artifactId>-->
+<!--            <version>3.1.0</version>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
 
         <!-- Test Dependencies -->
         <dependency>
@@ -121,7 +131,12 @@
                 <configuration>
                     <reuseForks>false</reuseForks>
                     <shutdown>kill</shutdown>
+                    <forkCount>1</forkCount>
                     <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+                    <argLine>-Dorg.eclipse.jetty.LEVEL=DEBUG</argLine>
+<!--                    <includes>-->
+<!--                        <include>AsyncRemotePlainConnectorInfoManagerTest.java</include>-->
+<!--                    </includes>-->
                 </configuration>
             </plugin>
         </plugins>

OpenICF-java-framework/connector-server-jetty/src/main/java/org/forgerock/openicf/framework/server/jetty/Authenticator.java

@@ -12,18 +12,19 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions copyright 2025 3A Systems LLC.
  */
 
 package org.forgerock.openicf.framework.server.jetty;
 
 
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
 
 import javax.security.auth.callback.NameCallback;
 
 public interface Authenticator {
 
-    void authenticate(ServletUpgradeRequest request, ServletUpgradeResponse response,
+    void authenticate(JettyServerUpgradeRequest request, JettyServerUpgradeResponse response,
                                         NameCallback callback);
 }