diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4214df4aaf..d75380de31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} - distribution: 'temurin' + distribution: 'zulu' - name: Cache Maven packages uses: actions/cache@v4 with: @@ -69,7 +69,7 @@ jobs: - name: Get latest release version shell: bash run: | - git fetch -t; export git_version_last="$(git describe --abbrev=0 --tags)" ; echo "last release: $git_version_last" + 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 @@ -118,7 +118,7 @@ jobs: - name: Get latest release version shell: bash run: | - git fetch -t; export git_version_last="$(git describe --abbrev=0 --tags)" ; echo "last release: $git_version_last" + 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 diff --git a/openam-cassandra/pom.xml b/openam-cassandra/pom.xml index f2b8a4e676..cfbb5c0dac 100644 --- a/openam-cassandra/pom.xml +++ b/openam-cassandra/pom.xml @@ -99,6 +99,23 @@ + + arm64 + + aarch64 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + diff --git a/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/util/OSCheckerTest.java b/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/util/OSCheckerTest.java index 9d1f404b60..37045c0a5e 100644 --- a/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/util/OSCheckerTest.java +++ b/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/util/OSCheckerTest.java @@ -28,7 +28,7 @@ public class OSCheckerTest { private static final String OS_NAME = System.getProperty("os.name"); private static final List ARCHITECTURES = Arrays.asList( - "i386", "i686", "x86", "x86_64", "amd64", "PowerPC", "ppc", "ppc64", "sparc"); + "i386", "i686", "x86", "x86_64", "amd64", "PowerPC", "ppc", "ppc64", "sparc", "aarch64"); @Test public void testIsUnixOrWindows() { diff --git a/openam-ui/openam-ui-api/pom.xml b/openam-ui/openam-ui-api/pom.xml index b63c032199..4e82ce5f40 100644 --- a/openam-ui/openam-ui-api/pom.xml +++ b/openam-ui/openam-ui-api/pom.xml @@ -59,7 +59,7 @@ initialize - v12.19.0 + v20.12.2 6.14.8 diff --git a/openam-ui/openam-ui-ria/pom.xml b/openam-ui/openam-ui-ria/pom.xml index f2218d2df3..368c92efba 100644 --- a/openam-ui/openam-ui-ria/pom.xml +++ b/openam-ui/openam-ui-ria/pom.xml @@ -331,7 +331,7 @@ initialize - v12.19.0 + v20.12.2 6.14.8 diff --git a/pom.xml b/pom.xml index 319d4afbf4..5bfb2273b5 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 1.8 checkstyle/suppressions.xml - 4.6.2 + 4.6.3-SNAPSHOT 1.0.0 1.0b3 3.0