1 files changed, 93 insertions, 81 deletions

diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 5528fe9..9284338 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -1,98 +1,110 @@
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
+plugins {
+    id 'java-library'
+    id 'eclipse'
+    id 'maven-publish'
+}
+
+allprojects {
+    version = '3.3.0'
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven {
+            url = uri("https://apps.egiz.gv.at/maven/")
+            mavenContent {
+                releasesOnly()
+            }
+        }
+        maven {
+            url = uri("https://apps.egiz.gv.at/maven-snapshot/")
+            mavenContent {
+                snapshotsOnly()
+            }
+        }
     }
-  }
-  dependencies {
-    classpath "com.bmuschko:gradle-tomcat-plugin:2.2.4"
-  }
+}
+
+configurations.all {
+    exclude group: 'xml-apis', module: 'xml-apis'
 }
 
 subprojects {
     apply plugin: 'java-library'
     apply plugin: 'eclipse'
     apply plugin: 'maven-publish'
-    apply plugin: 'maven'
 
-	version = '3.2.4'
-
-    repositories {
-       mavenCentral()
-       
-       maven {
-        	url "https://apps.egiz.gv.at/maven/"     	
-        	mavenContent {
-            	releasesOnly()
-        	}
-    	}
-    	maven {
-        	url "https://apps.egiz.gv.at/maven-snapshot/"
-        	mavenContent {
-            	snapshotsOnly()
-        	}
-    	}
-       
-    }
-	
     dependencies {
+        implementation 'org.projectlombok:lombok:1.18.38'
         testImplementation 'junit:junit:4.13.2'
     }
-    
-    jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version  }
 
-	compileJava {
-    	sourceCompatibility = 1.8
-    	targetCompatibility = 1.8
-	}
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+        withJavadocJar()
+        withSourcesJar()
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        options.compilerArgs << '-Xlint:-options'
+    }
+
+    tasks.withType(Javadoc).configureEach {
+        failOnError = false
+        options.addStringOption('Xdoclint:none', '-quiet')
+    }
 
-	tasks.withType(JavaCompile) {
-    	options.compilerArgs << '-Xlint:-options' 
-	}    
-    
-	publishing {
-		publications {
-        	mavenJava(MavenPublication) {
-            	from components.java
-            	// more goes in here
-        	}
-    	}
-    	repositories {
-        	maven {
-            	// change to point to your repo, e.g. http://my.org/repo
-            	url = "$buildDir/repo"
-    	   	}
-    	   	mavenLocal()
-    	}
+    tasks.withType(Test).configureEach {
+        failOnNoDiscoveredTests = false;
     }
-    
-	task deployJar(type: Jar)
 
-	configurations {
-    	deployerJars    	
-    	
-	}
-	
-	dependencies {
-    	deployerJars "org.apache.maven.wagon:wagon-ssh:3.4.3"
-    	
-	}
+    jar {
+        manifest {
+            attributes(
+                provider: 'EGIZ',
+                'Specification-Version': getCheckedOutGitCommitHash(),
+                'Implementation-Version': project.version
+            )
+        }
+    }
 
-	uploadArchives {
-    	repositories.mavenDeployer {        	
-        	configuration = configurations.deployerJars        	        	
-        	repository(url: "sftp://apps.egiz.gv.at/maven") {
-            	authentication(userName: System.getenv("EGIZ_MAVEN_USER"), password: System.getenv("EGIZ_MAVEN_PASSWORD"))
-            	
-        	}
-        	snapshotRepository(url: "sftp://apps.egiz.gv.at/maven-snapshot") {
-            	authentication(userName: System.getenv("EGIZ_MAVEN_USER"), password: System.getenv("EGIZ_MAVEN_PASSWORD"))
-            	
-        	}
-    	}
-	}    
-	
-    
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                from components.java
+            }
+        }
+        repositories {
+            maven {
+                url = uri("$buildDir/repo")
+            }
+            mavenLocal()
+            maven {
+                name = "egizReleases"
+                url = "sftp://apps.egiz.gv.at:22/maven"
+                credentials {
+                    //username = System.getenv("EGIZ_MAVEN_USER")
+                    //password = System.getenv("EGIZ_MAVEN_PASSWORD")
+                    username = "appsegiz"
+                    password = "dechof5air5Ix2thoh2e"
+                }
+                allowInsecureProtocol = true
+            }
+            maven {
+                name = "egizSnapshots"
+                url = "sftp://apps.egiz.gv.at:22/maven-snapshot"
+                credentials {
+                    //username = System.getenv("EGIZ_MAVEN_USER")
+                    //password = System.getenv("EGIZ_MAVEN_PASSWORD")
+                    username = "appsegiz"
+                    password = "dechof5air5Ix2thoh2e"
+                }
+                allowInsecureProtocol = true
+            }
+        }
+    }
 }
 
 def getCheckedOutGitCommitHash() {
@@ -100,7 +112,7 @@ def getCheckedOutGitCommitHash() {
     def takeFromHash = 40
     def head = new File(gitFolder + "HEAD").text.split(":")
     def isCommit = head.length == 1
-    if(isCommit) return head[0].trim().take(takeFromHash)
+    if (isCommit) return head[0].trim().take(takeFromHash)
     def refHead = new File(gitFolder + head[1].trim())
-    refHead.text.trim().take takeFromHash
+    refHead.text.trim().take(takeFromHash)
 }