From 8ed8e4e931c1cb3d3c814a53a07f73b566c3b719 Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Fri, 2 Jul 2021 14:06:44 +0200
Subject: v4.2.0

---
 build.gradle | 51 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

(limited to 'build.gradle')

diff --git a/build.gradle b/build.gradle
index f57f4555..7ef1711c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	repositories {
-		jcenter()
+		gradlePluginPortal()
 		mavenCentral()
 	}
 	
@@ -9,16 +9,10 @@ buildscript {
 	}
 }
 
-/*
-task wrapper(type: Wrapper) {
-    gradleVersion = '5.6.4'
-}
-*/
-
 allprojects {
 	apply plugin: "com.github.ben-manes.versions"
 	repositories {  mavenCentral()  }
-	version = '4.1.7-RC-0.0.4'
+	version = '4.2.0'
 }
 
 configurations {
@@ -50,9 +44,10 @@ task checkCVE {
 
 
 subprojects {
-	apply plugin: 'java'
+	apply plugin: 'java-library'
 	apply plugin: 'eclipse'
-	apply plugin: 'maven'
+	apply plugin: 'maven-publish'
+	//apply plugin: 'maven'
 	group = 'at.gv.egiz.pdfas'
 
 	configurations {
@@ -63,8 +58,8 @@ subprojects {
 	repositories { mavenCentral() }
 
 	dependencies { 
-		testCompile 'junit:junit:4.8.2' 
-		cveCheck 'org.owasp:dependency-check-ant:1.2.5'
+		testImplementation 'junit:junit:4.13.2' 
+		cveCheck 'org.owasp:dependency-check-ant:6.1.3'
 	}
 
 	task sourcesJar(type: Jar, dependsOn: classes) {
@@ -77,6 +72,8 @@ subprojects {
 	}
 
 	sourceCompatibility = 1.7
+	compileJava.options.encoding = "UTF-8"
+	compileTestJava.options.encoding = "UTF-8"
 	project.ext{
 		releaseRepoUrl = "file://${project(':').projectDir}/../mvn-repo/releases"
 		snapshotRepoUrl = "file://${project(':').projectDir}/../mvn-repo/snapshots"
@@ -84,7 +81,8 @@ subprojects {
 		pdfasversion = version
 		revision = getCheckedOutGitCommitHash()
 		//tomcatVersion = '7.0.54';
-		tomcatVersion = '8.0.36';
+		//tomcatVersion = '8.0.36';
+		tomcatVersion = '9.0.46';
 		slf4jVersion = '1.7.30'
 		cxfVersion = '3.0.1'
 	  }
@@ -124,12 +122,27 @@ subprojects {
 	checkCVELocal.dependsOn copyDepsLocal
 
 	
-	uploadArchives {
-		repositories.mavenDeployer {
-			repository(url: project.releaseRepoUrl)
-			snapshotRepository(url: project.snapshotRepoUrl)
-		}
-	}
+	publishing {
+    	publications {
+        	myLibrary(MavenPublication) {
+            	from components.java
+        	}
+    	}
+
+    	repositories {
+        	maven {
+            	name = 'egiz_repo'
+            	 url = version.endsWith('SNAPSHOT') ? project.snapshotRepoUrl : project.releaseRepoUrl
+        	}
+    	}
+	}	
+	
+//	uploadArchives {
+//		repositories.mavenDeployer {
+//			repository(url: project.releaseRepoUrl)
+//			snapshotRepository(url: project.snapshotRepoUrl)
+//		}
+//	}
 	
 	task(internalRelease) {
 		doLast {
-- 
cgit v1.2.3