Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
branches: [ 'sustaining/5.4.x','master' ]
pull_request:
branches: [ 'sustaining/5.4.x','master' ]

jobs:
build-maven:
runs-on: ${{ matrix.os }}
Expand All @@ -15,17 +13,17 @@ jobs:
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: recursive
- name: Java ${{ matrix.Java }} (${{ matrix.os }})
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
- name: Cache Maven packages
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
Expand All @@ -35,7 +33,7 @@ jobs:
MAVEN_OPTS: -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10
run: mvn --batch-mode --errors --update-snapshots package --file pom.xml
- name: Upload artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: ${{ matrix.os }}-${{ matrix.java }}
retention-days: 5
Expand All @@ -52,7 +50,7 @@ jobs:
- 5000:5000
steps:
- name: Download artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: ubuntu-latest-11
- name: Get latest release version
Expand All @@ -62,24 +60,24 @@ jobs:
echo "release_version=$git_version_last" >> $GITHUB_ENV
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
localhost:5000/${{ github.repository }}
tags: |
type=raw,value=latest
type=raw,value=${{ env.release_version }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
with:
driver-opts: network=host
- name: Prepare Dockerfile
shell: bash
run: sed -i -E '/^#COPY openig-war\//s/^#//' ./openig-docker/target/Dockerfile
- name: Build image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
continue-on-error: true
with:
context: .
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: recursive
ref: ${{ github.event.workflow_run.head_branch }}
- name: Set up Java for publishing to Maven Central Repository OSS
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ github.event.workflow_run.head_branch == 'sustaining/5.4.x' && '8' || '11'}}
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache Maven packages
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -58,12 +58,12 @@ jobs:
- name: Build Javadoc
run: mvn javadoc:aggregate -pl '!openig-war' -pl '!openig-ui'
- name: Upload artifacts OpenIG Server Only Component
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: OpenIG Server
path: openig-war/target/*.war
- name: Upload artifacts OpenIG Dockerfile
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: OpenIG Dockerfile
path: openig-docker/target/Dockerfile*
Expand All @@ -72,7 +72,7 @@ jobs:
git config --global user.name "Open Identity Platform Community"
git config --global user.email "open-identity-platform-opendj@googlegroups.com"
cd ..
- uses: actions/checkout@v4
- uses: actions/checkout@v6
continue-on-error: true
with:
repository: ${{ github.repository }}.wiki
Expand All @@ -92,7 +92,7 @@ jobs:
git commit -a -m "upload docs after deploy ${{ github.sha }}"
git push --quiet --force

- uses: actions/checkout@v4
- uses: actions/checkout@v6
continue-on-error: true
with:
repository: OpenIdentityPlatform/doc.openidentityplatform.org
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ jobs:
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: recursive
- name: Set up Java for publishing to Maven Central Repository OSS
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ github.event.workflow_run.head_branch == 'sustaining/5.4.x' && '8' || '11'}}
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache Maven packages
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
target/checkout/openig-war/target/*.war
target/checkout/openig-docker/target/Dockerfile*

- uses: actions/checkout@v4
- uses: actions/checkout@v6
continue-on-error: true
with:
repository: ${{ github.repository }}.wiki
Expand All @@ -93,7 +93,7 @@ jobs:
git tag -f ${{ github.event.inputs.releaseVersion }}
git push --quiet --force
git push --quiet --force origin ${{ github.event.inputs.releaseVersion }}
- uses: actions/checkout@v4
- uses: actions/checkout@v6
continue-on-error: true
with:
repository: OpenIdentityPlatform/doc.openidentityplatform.org
Expand All @@ -113,14 +113,14 @@ jobs:
needs:
- release-maven
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: ${{ github.event.inputs.releaseVersion }}
fetch-depth: 1
submodules: recursive
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
${{ github.repository }}
Expand All @@ -129,22 +129,22 @@ jobs:
type=raw,value=latest
type=raw,value=${{ github.event.inputs.releaseVersion }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4
- name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GHCR
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
continue-on-error: true
with:
context: ./openig-docker
Expand Down
10 changes: 10 additions & 0 deletions openig-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.18.6</version>
</dependency>
<dependency>
<groupId>org.openidentityplatform.commons</groupId>
<artifactId>util</artifactId>
Expand Down Expand Up @@ -166,6 +171,11 @@
<artifactId>swagger-request-validator-core</artifactId>
<version>2.46.0</version>
</dependency>
<dependency>
<groupId>net.datafaker</groupId>
<artifactId>datafaker</artifactId>
<version>1.9.0</version>
</dependency>

<!-- test dependencies -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.forgerock.openig.handler.ClientHandler;
import org.forgerock.openig.handler.DesKeyGenHandler;
import org.forgerock.openig.handler.DispatchHandler;
import org.forgerock.openig.handler.OpenApiMockResponseHandler;
import org.forgerock.openig.handler.ScriptableHandler;
import org.forgerock.openig.handler.SequenceHandler;
import org.forgerock.openig.handler.StaticResponseHandler;
Expand Down Expand Up @@ -102,6 +103,7 @@ public class CoreClassAliasResolver implements ClassAliasResolver {
ALIASES.put("KeyStore", KeyStoreHeaplet.class);
ALIASES.put("LocationHeaderFilter", LocationHeaderFilter.class);
ALIASES.put("MappedThrottlingPolicy", MappedThrottlingPolicyHeaplet.class);
ALIASES.put("OpenApiMockResponseHandler", OpenApiMockResponseHandler.class);
ALIASES.put("OpenApiValidationFilter", OpenApiValidationFilter.class);
ALIASES.put("PasswordReplayFilter", PasswordReplayFilterHeaplet.class);
ALIASES.put("Router", RouterHandler.class);
Expand Down
Loading