Build add MacOs m1 arm64 support on jdk 1.8 (#738)

OpenIdentityPlatform · May 7, 2024 · 1804c49 · 1804c49
1 parent bffd192
commit 1804c49
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git 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
@@ -99,6 +99,23 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>arm64</id>
+			<activation>
+				<os><arch>aarch64</arch></os>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
 
diff --git a/.../openam-installtools/src/test/java/com/sun/identity/install/tools/util/OSCheckerTest.java b/.../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<String> 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
@@ -59,7 +59,7 @@
                         </goals>
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v12.19.0</nodeVersion>
+                            <nodeVersion>v20.12.2</nodeVersion>
                             <npmVersion>6.14.8</npmVersion>
 <!--                             <downloadRoot>http://maven.forgerock.org/repo/forgerock-third-party-virtual/</downloadRoot> -->
 <!--                             <npmDownloadRoot>http://maven.forgerock.org/repo/api/npm/npm-virtual/npm/-/</npmDownloadRoot> -->

diff --git a/openam-ui/openam-ui-ria/pom.xml b/openam-ui/openam-ui-ria/pom.xml
@@ -331,7 +331,7 @@
                         </goals>
                         <phase>initialize</phase>
                         <configuration>
-                            <nodeVersion>v12.19.0</nodeVersion>
+                            <nodeVersion>v20.12.2</nodeVersion>
                             <npmVersion>6.14.8</npmVersion>
 <!--                             <downloadRoot>http://maven.forgerock.org/repo/forgerock-third-party-virtual/</downloadRoot> -->
 <!--                             <npmDownloadRoot>http://maven.forgerock.org/repo/api/npm/npm-virtual/npm/-/</npmDownloadRoot> -->

diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <!-- Supress checkstyle errors on legacy com.iplanet and com.sun.identity packages -->
     <checkstyleUnitTestSuppressionsLocation>checkstyle/suppressions.xml</checkstyleUnitTestSuppressionsLocation>
-    <opendj.version>4.6.2</opendj.version>
+    <opendj.version>4.6.3-SNAPSHOT</opendj.version>
     <javadoc-utils.version>1.0.0</javadoc-utils.version>
     <ant.contrib.version>1.0b3</ant.contrib.version>
     <guice.version>3.0</guice.version>