From c8ae5bfc35556ba7f12e44881792017a69568b28 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Sun, 12 Dec 2021 16:39:39 +0100
Subject: some GitLab CI and third-party lib. updates

---
 moaSig/build.gradle             |  9 ---------
 moaSig/moa-asic/build.gradle    |  2 +-
 moaSig/moa-sig-lib/build.gradle | 10 +++++-----
 moaSig/moa-sig/build.gradle     |  3 ++-
 4 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'moaSig')

diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 2732203..07dc8eb 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -72,16 +72,7 @@ subprojects {
     	deployerJars    	
     	
 	}
-
-	//configurations.archives.artifacts.removeAll {PublishArtifact publishArtifact -> publishArtifact.extension == 'zip'}
-
-	//configurations.archives.artifacts.removeAll {
-    	// exclude from the archives configuration all artifacts that were generated by distZip & distTar
-    //	def depTasks = it.getBuildDependencies().getDependencies()
-    //	depTasks.contains(distZip) || depTasks.contains(distTar)      	
-	//}
 	
-
 	dependencies {
     	deployerJars "org.apache.maven.wagon:wagon-ssh:2.9"
     	
diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index ba87519..07c9c32 100644
--- a/moaSig/moa-asic/build.gradle
+++ b/moaSig/moa-asic/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
 	implementation project(':common')
     implementation project(':moa-sig-lib')
-	implementation 'org.slf4j:slf4j-log4j12:1.7.30'	
+	implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0'
 	api group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
 	api group: 'javax.xml.ws', name: 'jaxws-api', version: '2.3.1'
 
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index ca2786a..0be9afc 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -22,11 +22,11 @@ dependencies {
 	api 'com.sun.xml.bind:jaxb-core:2.3.0.1'
 	api 'com.sun.xml.bind:jaxb-impl:2.3.2'
 	api 'org.postgresql:postgresql:42.2.19.jre7'		
-	api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.23'
-	api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.23'
-	api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.23'
-	api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.23'
-	api group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.23'
+	api group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.24'
+	api group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.24'
+	api group: 'org.apache.pdfbox', name: 'pdfbox-app', version: '2.0.24'
+	api group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.24'
+	api group: 'org.apache.pdfbox', name: 'preflight-app', version: '2.0.24'
 	api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
 	api group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.13'
 	
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index ed56524..57200d1 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -12,7 +12,8 @@ dependencies {
 	compileOnly 'javax.servlet:servlet-api:2.4'
 	
 	implementation 'commons-discovery:commons-discovery:0.5'
-	implementation 'org.slf4j:slf4j-log4j12:1.7.30'
+	implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0'
+	implementation 'org.apache.logging.log4j:log4j-1.2-api:2.15.0'
     implementation group: 'javax.jws', name: 'javax.jws-api', version: '1.1'
 
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.7.1'
-- 
cgit v1.2.3