Skip to content

Commit ba120ef

Browse files
Update target JDK to 11 and move to JakartaEE 9 (#67)
Co-authored-by: Valery Kharseko <[email protected]>
1 parent 3a5b877 commit ba120ef

File tree

45 files changed

+417
-263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+417
-263
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
java: [ '8', '11', '17', '21', '25' ]
13+
java: [ '11', '17', '21', '25' ]
1414
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
1515
fail-fast: false
1616
steps:
@@ -172,7 +172,7 @@ jobs:
172172
file: ./Dockerfile-alpine
173173
build-args: |
174174
VERSION=${{ env.release_version }}
175-
platforms: linux/amd64,linux/arm64/8, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le
175+
platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le
176176
push: true
177177
tags: ${{ steps.meta.outputs.tags }}
178178
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Java for publishing to Maven Central Repository OSS
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: '8'
29+
java-version: '11'
3030
distribution: 'temurin'
3131
server-id: ossrh
3232
server-username: MAVEN_USERNAME
@@ -168,7 +168,7 @@ jobs:
168168
file: ./Dockerfile-alpine
169169
build-args: |
170170
VERSION=${{ github.event.inputs.releaseVersion }}
171-
platforms: linux/amd64,linux/arm64/8, linux/s390x, linux/386, linux/arm/v7, linux/arm/v6, linux/ppc64le
171+
platforms: linux/amd64, linux/arm64/8, linux/s390x, linux/ppc64le
172172
push: true
173173
tags: ${{ steps.meta.outputs.tags }}
174174
labels: ${{ steps.meta.outputs.labels }}

Dockerfile-alpine

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM openjdk:8-jre-alpine
1+
FROM alpine:latest
22

3-
MAINTAINER Open Identity Platform Community <[email protected]>
3+
LABEL org.opencontainers.image.authors="Open Identity Platform Community"
44

55
ENV USER="openicf"
66
ENV OPENICF_OPTS="-server -XX:+UseContainerSupport"
@@ -11,7 +11,7 @@ WORKDIR /opt
1111

1212
#COPY OpenICF-java-framework/openicf-zip/target/*.zip ./
1313

14-
RUN apk add --update --no-cache --virtual builddeps curl unzip \
14+
RUN apk add --update --no-cache --virtual builddeps curl unzip openjdk11-jre \
1515
&& apk upgrade --update --no-cache \
1616
&& apk add bash \
1717
&& 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.openidentityplatform.openicf.connectors</groupId>
2424
<artifactId>connectors-parent</artifactId>
25-
<version>1.8.1-SNAPSHOT</version>
25+
<version>2.0.0-SNAPSHOT</version>
2626
<relativePath>../OpenICF-java-framework/bundles-parent</relativePath>
2727
</parent>
2828
<groupId>org.openidentityplatform.openicf.connectors</groupId>

OpenICF-databasetable-connector/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.openidentityplatform.openicf.connectors</groupId>
2929
<artifactId>connectors-parent</artifactId>
30-
<version>1.8.1-SNAPSHOT</version>
30+
<version>2.0.0-SNAPSHOT</version>
3131
<relativePath>../OpenICF-java-framework/bundles-parent</relativePath>
3232
</parent>
3333
<groupId>org.openidentityplatform.openicf.connectors</groupId>

OpenICF-dbcommon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.openidentityplatform.openicf.framework</groupId>
2929
<artifactId>framework</artifactId>
30-
<version>1.8.1-SNAPSHOT</version>
30+
<version>2.0.0-SNAPSHOT</version>
3131
<relativePath>../OpenICF-java-framework</relativePath>
3232
</parent>
3333
<groupId>org.openidentityplatform.openicf.connectors.misc</groupId>

OpenICF-groovy-connector/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
your own identifying information:
2323
"Portions Copyrighted [year] [name of copyright owner]"
2424
25-
Portions Copyrighted 2018-2024 3A Systems, LLC
25+
Portions Copyrighted 2018-2025 3A Systems, LLC
2626
-->
2727
<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">
2828
<modelVersion>4.0.0</modelVersion>
2929
<parent>
3030
<groupId>org.openidentityplatform.openicf.connectors</groupId>
3131
<artifactId>connectors-parent</artifactId>
32-
<version>1.8.1-SNAPSHOT</version>
32+
<version>2.0.0-SNAPSHOT</version>
3333
<relativePath>../OpenICF-java-framework/bundles-parent</relativePath>
3434
</parent>
3535
<groupId>org.openidentityplatform.openicf.connectors</groupId>
@@ -236,6 +236,7 @@
236236
<version>3.0.2</version>
237237
<configuration>
238238
<sourceEncoding>UTF-8</sourceEncoding>
239+
<targetBytecode>1.8</targetBytecode>
239240
</configuration>
240241
<executions>
241242
<execution>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.openidentityplatform.openicf.framework</groupId>
3030
<artifactId>framework</artifactId>
31-
<version>1.8.1-SNAPSHOT</version>
31+
<version>2.0.0-SNAPSHOT</version>
3232
</parent>
3333
<groupId>org.openidentityplatform.openicf.connectors</groupId>
3434
<artifactId>connectors-parent</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.openidentityplatform.openicf.framework</groupId>
2929
<artifactId>framework</artifactId>
30-
<version>1.8.1-SNAPSHOT</version>
30+
<version>2.0.0-SNAPSHOT</version>
3131
</parent>
3232
<artifactId>connector-framework-contract</artifactId>
3333
<name>OpenICF Contract Tests</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.openidentityplatform.openicf.framework</groupId>
2929
<artifactId>framework</artifactId>
30-
<version>1.8.1-SNAPSHOT</version>
30+
<version>2.0.0-SNAPSHOT</version>
3131
</parent>
3232
<artifactId>connector-framework-internal</artifactId>
3333
<packaging>bundle</packaging>

0 commit comments

Comments
 (0)