From 0147186684e54dbf042c263b6c9fd2aab1065d55 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Wed, 15 Dec 2021 12:38:41 +0100 Subject: switch from log4j to logback --- moaSig/moa-asic/build.gradle | 1 - moaSig/moa-sig/build.gradle | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'moaSig') diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle index c228d3d..89a4a6a 100644 --- a/moaSig/moa-asic/build.gradle +++ b/moaSig/moa-asic/build.gradle @@ -21,7 +21,6 @@ dependencies { implementation project(':common') implementation project(':moa-sig-lib') - implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0' api 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1' api 'jakarta.xml.ws:jakarta.xml.ws-api:3.0.1' diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle index 8911aa0..d3985bc 100644 --- a/moaSig/moa-sig/build.gradle +++ b/moaSig/moa-sig/build.gradle @@ -4,17 +4,26 @@ apply plugin: 'eclipse-wtp' apply plugin: 'distribution' apply plugin: 'maven-publish' +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' + implementation project(':common') implementation project(':moa-sig-lib') implementation project(':moa-asic') implementation fileTree(dir: 'libs', include: '*.jar') compileOnly 'javax.servlet:javax.servlet-api:3.1.0' - implementation 'commons-discovery:commons-discovery:0.5' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.16.0' + implementation 'commons-discovery:commons-discovery:0.5' implementation 'org.apache.logging.log4j:log4j-1.2-api:2.16.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.16.0' implementation group: 'javax.jws', name: 'javax.jws-api', version: '1.1' + implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.7' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.7' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-migrationsupport', version: '5.8.2' testImplementation group: 'org.junit.platform', name: 'junit-platform-engine', version: '1.8.2' @@ -35,17 +44,6 @@ war { duplicatesStrategy = DuplicatesStrategy.EXCLUDE } -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' - - implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.7' - implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.7' -} task jaxb () { // output directory -- cgit v1.2.3