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

Nightlybuild

See merge request egiz/moa-sig!3

1 files changed, 46 insertions, 39 deletions

diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index 985e768..c5187a6 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -1,48 +1,55 @@
-apply plugin: 'java-library-distribution'
-apply plugin: 'maven-publish'
+plugins {
+    id 'java-library'
+    id 'distribution'
+    id 'maven-publish'
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 distributions {
     main {
-        distributionBaseName = 'moa-spss-lib'
+        distributionBaseName.set('moa-spss-lib')
     }
 }
 
-dependencies {	
-	implementation project(':common')	
-	testImplementation project(path: ':common', configuration: 'testArtifacts')
-	
-	api fileTree(dir: '../libs', include: '*.jar')
-	//api fileTree(dir: '../libs_debug', include: '*.jar')
-			
-	api group: 'at.gv.egovernment.moa.sig', name: 'tsl-lib', version: '2.1.4'
-	api 'commons-logging:commons-logging:1.2'
-	api 'commons-io:commons-io:2.16.1'
-	api 'commons-codec:commons-codec:1.16.0'
-	api 'org.apache.axis:axis-jaxrpc:1.4'
-	api 'org.xerial:sqlite-jdbc:3.46.1.0'
-	api 'javax.activation:activation:1.1.1'	
-	api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
-	api 'com.sun.xml.bind:jaxb-core:3.0.2'
-	api 'com.sun.xml.bind:jaxb-impl:3.0.2'
-	api 'org.postgresql:postgresql:42.7.1'		
-	api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.32'
-	api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.32'
-	api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.32'
-	api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.32'
-	api group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.32'
-	api group: 'org.apache.commons', name: 'commons-lang3', version: '3.16.0'
-	api group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.14'
-	api group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.36'
-	
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.10.1'
-	testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.10.1'
-	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1'
-    testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
+dependencies {
+    implementation project(':common')
+
+    api fileTree(dir: '../libs', include: ['*.jar'])
+    // api fileTree(dir: '../libs_debug', include: ['*.jar'])
+
+    api 'at.gv.egovernment.moa.sig:tsl-lib:2.2.0'
+    api 'commons-logging:commons-logging:1.3.5'
+    api 'commons-io:commons-io:2.20.0'
+    api 'commons-codec:commons-codec:1.19.0'
+    api 'org.apache.axis:axis-jaxrpc:1.4'
+    api 'org.xerial:sqlite-jdbc:3.50.3.0'
+    api 'jakarta.activation:jakarta.activation-api:2.1.3'
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
+    api 'com.sun.xml.bind:jaxb-impl:4.0.5'
+    api 'org.postgresql:postgresql:42.7.7'
+
+    api 'org.apache.pdfbox:pdfbox:2.0.34'
+    api 'org.apache.pdfbox:pdfbox-tools:2.0.34'
+    api 'org.apache.pdfbox:pdfbox-app:2.0.34'
+    api 'org.apache.pdfbox:preflight:2.0.34'
+    api 'org.apache.pdfbox:preflight-app:2.0.34'
+    api 'org.apache.commons:commons-lang3:3.18.0'
+    api 'org.apache.httpcomponents.client5:httpclient5-cache:5.4.4'
+    api 'org.slf4j:jcl-over-slf4j:2.0.17'
+
+
+    testImplementation project(path: ':common', configuration: 'testArtifacts') 
+    testImplementation 'org.junit.jupiter:junit-jupiter-migrationsupport:5.13.4'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
+    testImplementation 'ch.qos.logback:logback-classic:1.5.18'
 }
 
-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'))  // Ensure distZip runs first
+    from(tasks.named('distZip'))
+    into layout.projectDirectory.dir("releases/${version}")
 }