Merge branch 'nightlybuild' into 'master'HEAD3.3.0master

Nightlybuild

See merge request egiz/moa-sig!3

2 files changed, 44 insertions, 56 deletions

diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index 0a8fd83..a132b05 100644
--- a/moaSig/moa-asic/build.gradle
+++ b/moaSig/moa-asic/build.gradle
@@ -1,30 +1,33 @@
-//plugins {
-//    id 'com.intershop.gradle.jaxb' version '5.1.0'
-//}
+plugins {
+    id 'java-library'
+    id 'distribution'
+}
 
-apply plugin: 'java-library-distribution'
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 distributions {
-	main{
-		distributionBaseName = 'MOA-ASIC'
-	}
+    main {
+        distributionBaseName.set('MOA-ASIC')
+    }
 }
 
 configurations {
     jaxb
-    
 }
 
 dependencies {
-    jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '3.0.2'
-    jaxb group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
+    jaxb 'com.sun.xml.bind:jaxb-xjc:4.0.5'
+    jaxb 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
 
-	implementation project(':common')
+    implementation project(':common')
     implementation project(':moa-sig-lib')
-	api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
-	api 'jakarta.xml.ws:jakarta.xml.ws-api:3.0.1'
-	implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.7.36'	
 
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+    api 'jakarta.xml.ws:jakarta.xml.ws-api:4.0.2'
+    implementation 'org.slf4j:slf4j-api:2.0.17'
 }
 
 sourceSets {
@@ -35,48 +38,34 @@ sourceSets {
     }
 }
 
-/*
-jaxb {
-     // generate java code from schema
-     javaGen {
-        //generates a 'project' schema file from existing java code
-        posConfig {
-            schema = file('src/main/resources/schemas/asic.xsd')
-            packageName = 'at.gv.egiz.asic'
-            outputDir = file( "${projectDir}/src/generated/java" )            
-        }
+tasks.register('jaxb') {
+    group = 'build'
+    description = 'Generates Java classes from XSD using JAXB'
+
+    doLast {
+        def jaxbTargetDir = file("${projectDir}/src/generated/java")
+        jaxbTargetDir.mkdirs()
+
+        ant.taskdef(
+            name: 'xjc',
+            classname: 'com.sun.tools.xjc.XJCTask',
+            classpath: configurations.jaxb.asPath
+        )
+
+        ant.xjc(
+            destdir: jaxbTargetDir.path,
+            package: 'at.gv.egiz.asic',
+            schema: 'src/main/resources/schemas/asic.xsd'
+        )
     }
-
 }
-*/
-
-task jaxb () {
-	// output directory
-	def jaxbTargetDir = file( "${projectDir}/src/generated/java" )
-	//jaxbTargetDirMoaSig = file( jaxbTargetDir.path )
-
-	// perform actions
-	doLast {
-		jaxbTargetDir.mkdirs()
-
-		ant.taskdef(name: 'xjc', classname: 'com.sun.tools.xjc.XJCTask', classpath: configurations.jaxb.asPath)
-		//ant.jaxbTargetDirMoaSig = jaxbTargetDir
-
-		// MOA Sig
-		ant.xjc(
-				destdir: jaxbTargetDir.path,
-				package: 'at.gv.egiz.asic',
-				schema: 'src/main/resources/schemas/asic.xsd'
-		)
-	}	
-}
-
 
-task releases(type: Copy) {
-	//from jar.outputs
-	from distZip.outputs
-	from distTar.outputs
-	into rootDir.toString() + "/releases/" + version
+tasks.register('releases', Copy) {
+    dependsOn tasks.named('distZip'), tasks.named('distTar')
+    from(tasks.named('distZip'))
+    from(tasks.named('distTar'))
+    into layout.projectDirectory.dir("releases/${version}")
 }
 
-task publishPubNamePublicationToMavenLocal {}
+// This is a placeholder – only include if needed by CI or to avoid errors
+tasks.register('publishPubNamePublicationToMavenLocal') {}
diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
index 34744ef..02fbeb2 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
@@ -74,8 +74,7 @@ public class VerifyASICSignatureResponseBuilder {
    * element being the XML representation of the given
    * <code>VerifyCMSSignatureResponse</code> API object.
    *
-   * @param response The <code>VerifyCMSSignatureResponse</code> to convert to
-   *                 XML.
+   * @param results The <code>VerifyCMSSignatureResponse</code> to convert to XML.
    * @return A document containing the <code>VerifyCMSSignatureResponse</code> DOM
    *         element.
    * @throws MOAApplicationException An error occurred building the response.