Java 21 upgrade fixes (#504)

* adjusting release notes

* generating jar for native image generation except amd 64 dynamic linking ,this jar excludes graalvm sdk deps

* using specific jar to generate native image, not the fat jar

* [Gradle Release Plugin] - new version commit:  '3.22.3-snapshot'.

* calling native image jar gradle task

* set main class manifest attribute

* fixing java.lang.SecurityException: Invalid signature file digest for Manifest main attributes

* updating release notes, reverting cd

Author: mageddo

Dockerfile.builder.linux-amd64

@@ -18,13 +18,13 @@ RUN uname -a && whoami && $JAVA_HOME/bin/java -version
 COPY ./ /app
 WORKDIR /app
 
-RUN ./gradlew clean build compTest shadowJar nativeCompile -i &&\
+RUN ./gradlew clean build compTest shadowJar nativeImageJar nativeCompile -i &&\
   ls -lha ./build &&\
   echo "min required GLIBC version:" &&\
   objdump -T /app/build/native/nativeCompile/dns-proxy-server | grep GLIBC | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -Vu | tail -n1 &&\
   mkdir -p ./build/artifacts/linux-amd64 && mv ./build/native/nativeCompile/dns-proxy-server ./build/artifacts/linux-amd64/ &&\
   mkdir -p ./build/artifacts/jre && mv ./build/libs/dns-proxy-server-*-all.jar ./build/artifacts/jre/dns-proxy-server.jar &&\
-  mkdir -p ./build/artifacts/native-image-source && cp ./build/artifacts/jre/dns-proxy-server.jar ./build/artifacts/native-image-source/ &&\
+  mkdir -p ./build/artifacts/native-image-source && cp ./build/libs/native-image-*.jar ./build/artifacts/native-image-source/dns-proxy-server.jar &&\
   ls -lhS ./build/artifacts/*
 
 ENTRYPOINT cat

RELEASE-NOTES.md

@@ -1,8 +1,6 @@
-## 3.22.2
+## 3.22.3
 * Fixing graal-sdk dep binary impacts arm, windows, amd static generation
-
-## 3.22.1 
-* #502: Fixed Jar release which was broken when upgraded to java 21 at `3.22.0`
+* Fixed Jar release which was broken when at `3.22.0` depending on the JRE vendor
 
 ## 3.22.0 
 * #473: Qemu upgrade

build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 buildscript {
   repositories {
     mavenLocal()
@@ -107,6 +109,28 @@ jar {
   }
 }
 
+tasks.register('nativeImageJar', ShadowJar) {
+
+  from sourceSets.main.output
+  configurations = [project.configurations.runtimeClasspath]
+  mergeServiceFiles()
+
+  archiveBaseName = "native-image"
+
+  manifest {
+    attributes("Main-Class": mainClassName)
+  }
+
+  dependencies {
+    exclude(dependency('org.graalvm.sdk:'))
+  }
+
+  exclude("/META-INF/*.SF")
+  exclude("/META-INF/*.DSA")
+  exclude("/META-INF/*.RSA")
+
+}
+
 shadowJar {
   mergeServiceFiles()
 }

gradle.properties

@@ -1 +1 @@
-version=3.22.2-snapshot
+version=3.22.3-snapshot