Update target JDK to 17 and move to JakartaEE 10 (Pax Web 11) (#114)

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: [ '17', '21', '25' ]
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
       fail-fast: false
     steps:
@@ -157,7 +157,7 @@ jobs:
           file: ./Dockerfile-alpine
           build-args: |
             VERSION=${{ env.release_version }}
-          platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le ,linux/arm64/8
+          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: '17'
           distribution: 'temurin'
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -201,7 +201,7 @@ jobs:
           file: ./Dockerfile-alpine
           build-args: |
             VERSION=${{ github.event.inputs.releaseVersion }}
-          platforms: linux/amd64, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le ,linux/arm64/8
+          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,4 +1,4 @@
-FROM openjdk:8-jre-alpine
+FROM alpine:latest
 
 LABEL org.opencontainers.image.authors="Open Identity Platform Community"
 
@@ -12,7 +12,7 @@ WORKDIR /opt
 
 #COPY openidm-zip/target/openidm-*.zip ./
 
-RUN apk add --update --no-cache --virtual builddeps curl unzip \
+RUN apk add --update --no-cache --virtual builddeps curl unzip libc6-compat openjdk17 \
  && apk upgrade --update --no-cache \
  && apk add bash \
  && apk update  \

README.md

@@ -25,7 +25,7 @@ This project is licensed under the [Common Development and Distribution License
 * [OpenIDM ZIP](https://github.com/OpenIdentityPlatform/OpenIDM/releases)
 * [OpenIDM Docker](https://hub.docker.com/r/openidentityplatform/openidm/) (All OS) 
 
-Java 1.8+ required
+Java 17 or later required
 
 ## How-to build
 For windows use:

SECURITY.md

@@ -0,0 +1,18 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version                            | Java Versions Support | EE         | Supported                                                                                                                                 |
+|------------------------------------|-----------------------|------------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| Open Identity Platform OpenIDM 7.x | 17 and later          | Jakarta EE | :white_check_mark: Community support, [approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List) |
+| Open Identity Platform OpenIDM 6.x | 8 and later           | Java EE    | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List)                   |
+| Open Identity Platform OpenIDM 5.x | 8 and later           | Java EE    | :white_check_mark: [Approved vendor support](https://github.com/OpenIdentityPlatform/.github/wiki/Approved-Vendor-List)                  |
+| ForgeRock OpenIDM 5.x              | 8 and later           | Java EE    | :x: upgrade to Open Identity Platform OpenIDM                                                                                             |
+| ForgeRock OpenIDM 4.x              | 1.7, 8 and later      | Java EE    | :x: upgrade to Open Identity Platform OpenIDM                                                                                             |
+
+## Reporting a Vulnerability
+
+Please draft [security advisory](https://github.com/OpenIdentityPlatform/OpenIDM/security/advisories/new)

custom-scripted-connector-bundler/pom.xml

@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.openidentityplatform.openidm</groupId>
         <artifactId>openidm-project</artifactId>
-        <version>6.3.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.openidentityplatform.openidm.tools</groupId>
     <artifactId>custom-scripted-connector-bundler</artifactId>
-    <version>6.3.1-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <name>OpenIDM Custom Scripted Groovy Connector Bundler</name>
     <description>This is a tool to bundle the Groovy connector using configured bundle name and configuration
         parameters without the user needing to write connector code manually (aside from the Groovy scripts).
@@ -94,13 +94,7 @@
         <dependency>
             <groupId>com.github.jknack</groupId>
             <artifactId>handlebars</artifactId>
-            <version>2.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mozilla</groupId>
-                    <artifactId>rhino</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template

@@ -6,7 +6,7 @@
     "author" : "{{author}}",
     "connectorRef" : {
         "bundleName" : "org.openidentityplatform.openicf.connectors.{{lower packageName}}-connector",
-        "bundleVersion" : "[1.4.0.0,2.0.0.0)",
+        "bundleVersion" : "[2.0.0.0,3)",
         "connectorName" : "org.forgerock.openicf.connectors.{{lower packageName}}.{{packageName}}Connector"
     },
     "producerBufferSize" : 100,

openidm-api-servlet/pom.xml

@@ -13,14 +13,14 @@
   ~ information: "Portions copyright [year] [name of copyright owner]".
   ~
   ~ Copyright 2013-2016 ForgeRock AS.
-  ~ Portions Copyrighted 2024 3A Systems LLC.
+  ~ Portions Copyrighted 2024-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.openidm</groupId>
         <artifactId>openidm-project</artifactId>
-        <version>6.3.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>openidm-api-servlet</artifactId>
     <packaging>bundle</packaging>
@@ -94,8 +94,8 @@
 
         <!-- Provided Dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ErrorServletComponent.java

@@ -12,21 +12,21 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions Copyrighted 2024 3A Systems LLC.
+ * Portions Copyrighted 2024-2025 3A Systems LLC.
  */
 
 package org.forgerock.openidm.servlet.internal;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
+import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
 import org.forgerock.openidm.jetty.JettyErrorHandler;
 import org.forgerock.openidm.servletregistration.ServletRegistration;
 import org.ops4j.pax.web.service.WebContainer;
@@ -36,7 +36,7 @@
 import org.osgi.service.component.annotations.ConfigurationPolicy;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.http.NamespaceException;
+import org.ops4j.pax.web.service.http.NamespaceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,14 +81,14 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse
         logger.info("Registered servlet at {}", ERROR_SERVLET_ALIAS);
 
         httpService.registerErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE, ERROR_SERVLET_ALIAS,
-                httpService.getDefaultSharedHttpContext());
+                servletRegistration.getContext());
     }
 
     @Deactivate
     protected synchronized void deactivate(ComponentContext context) {
         servletRegistration.unregisterServlet(errorServlet);
         httpService.unregisterErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE,
-                httpService.getDefaultSharedHttpContext());
+                servletRegistration.getContext());
     }
 
 }

openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java

@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
- * Portions Copyrighted 2024 3A Systems LLC.
+ * Portions Copyrighted 2024-2025 3A Systems LLC.
  */
 package org.forgerock.openidm.servlet.internal;
 
@@ -27,8 +27,8 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.script.ScriptException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
 
 import org.forgerock.http.ApiProducer;
 import org.forgerock.http.DescribedHttpApplication;
@@ -64,7 +64,7 @@
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
 import org.osgi.service.event.propertytypes.EventTopics;
-import org.osgi.service.http.NamespaceException;
+import org.ops4j.pax.web.service.http.NamespaceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;