re-enable native builds

apereo · Dec 19, 2023 · 1d415de · 1d415de
1 parent e1ed6ab
commit 1d415de
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/app/src/main/resources/common/gradle/build.gradle.mustache b/app/src/main/resources/common/gradle/build.gradle.mustache
@@ -189,10 +189,6 @@ bootBuildImage {
 {{/dockerSupported}}
 
 {{#nativeImageSupported}}
-configurations {
-    nativeImageClasspath.extendsFrom(graalImplementation)
-}
-
 if (nativeImage) {
     sourceSets {
         graal {
@@ -203,6 +199,10 @@ if (nativeImage) {
     }
 }
 
+configurations {
+    nativeImageClasspath.extendsFrom(graalImplementation)
+}
+
 graalvmNative {
     metadataRepository {
         enabled = true
@@ -231,23 +231,27 @@ graalvmNative {
             buildArgs.add('-H:+TraceSecurityServices')
             buildArgs.add('-H:+UnlockExperimentalVMOptions')
 
-            buildArgs.add('--trace-class-initialization=true')
+            buildArgs.add('-J-Xmx12G')
+            buildArgs.add('-J-Xms4G')
+            buildArgs.add('--native-image-info')
+            buildArgs.add('-march=native')
 
-            buildArgs.add('--initialize-at-build-time=org.hibernate.internal.util.ReflectHelper')
+            buildArgs.add('--trace-class-initialization=true')
 
-            buildArgs.add('--initialize-at-build-time=java.beans.Introspector')
+            buildArgs.add('--initialize-at-build-time=java.beans')
             buildArgs.add('--initialize-at-build-time=com.sun.beans')
-
             buildArgs.add('--initialize-at-build-time=groovyjarjarantlr4.v4.runtime')
             buildArgs.add('--initialize-at-build-time=org.codehaus.groovy')
             buildArgs.add('--initialize-at-build-time=org.apache.groovy')
             buildArgs.add('--initialize-at-build-time=groovy.lang')
 
-            buildArgs.add('--initialize-at-run-time=com.sun.xml.ws,org.codehaus.groovy.control.XStreamUtils,org.codehaus.groovy.vmplugin.v8.Java8\$LookupHolder,groovy.grape.GrapeIvy')
-            buildArgs.add("--initialize-at-run-time=org.bouncycastle.jcajce.provider.drbg.DRBG\$Default,org.bouncycastle.jcajce.provider.drbg.DRBG\$NonceAndIV")
+            buildArgs.add('--initialize-at-run-time=com.sun.xml.ws')
+            buildArgs.add('--initialize-at-run-time=groovy.grape.GrapeIvy')
+            buildArgs.add("--initialize-at-run-time=org.bouncycastle.jcajce.provider.drbg.DRBG\$Default")
+            buildArgs.add("--initialize-at-run-time=org.bouncycastle.jcajce.provider.drbg.DRBG\$NonceAndIV")
 
             buildArgs.add('--features=org.apereo.cas.nativex.features.DefaultNativeImageFeature')
-            buildArgs.add('--enable-url-protocols=jar')
+            buildArgs.add('--enable-url-protocols=jar,file,resource,http,https')
 
             /*
             buildArgs.add("-g")

diff --git a/app/src/main/resources/common/gradle/springboot.gradle.mustache b/app/src/main/resources/common/gradle/springboot.gradle.mustache
@@ -84,13 +84,14 @@ bootRun {
 def nativeImage = project.hasProperty("nativeImage") && Boolean.valueOf(project.getProperty("nativeImage"))
 {{/nativeImageSupported}}
 springBoot {
-    buildInfo()
     {{#casServer}}
     {{#nativeImageSupported}}
     if (nativeImage) {
         {{mainClass}} = "org.apereo.cas.nativex.CasNativeWebApplication"
     } else {
         {{mainClass}} = "org.apereo.cas.web.CasWebApplication"
+        buildInfo()
+        bootBuildInfo.mustRunAfter(compileJava)
     }
     {{/nativeImageSupported}}
     {{^nativeImageSupported}}{{mainClass}} = "org.apereo.cas.web.CasWebApplication"{{/nativeImageSupported}}
@@ -163,5 +164,3 @@ if (!nativeImage) {
 {{#nativeImageSupported}}
 }
 {{/nativeImageSupported}}
-
-bootBuildInfo.mustRunAfter(compileJava)
diff --git a/ci/validate-cas-native.sh b/ci/validate-cas-native.sh
@@ -44,7 +44,7 @@ if [[ -d /tmp ]] ; then
 fi
 
 printgreen "Building CAS Native Image. This may take several minutes..."
-./gradlew clean build nativeCompile -PnativeImage=true --warning-mode all --no-daemon
+./gradlew clean build nativeCompile -PnativeImage=true --warning-mode all --no-daemon --no-configuration-cache
 
 if [[ $? -ne 0 ]]; then
   printred "CAS native image build failed"