From 637dddb9db0accff260b7531fb8380a940fbb91a Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Fri, 17 Dec 2021 12:39:40 +0100 Subject: update gradle version and third-party libs --- simpleSigning/build.gradle | 31 ++++++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/simpleSigning/build.gradle b/simpleSigning/build.gradle index 89e4c16..02dae00 100644 --- a/simpleSigning/build.gradle +++ b/simpleSigning/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'eclipse-wtp' apply plugin: 'war' sourceCompatibility = 1.7 -version = '1.4' +version = '1.4.1' war { manifest { @@ -12,10 +12,6 @@ war { } } -task wrapper(type: Wrapper) { - gradleVersion = '2.3' -} - repositories { mavenCentral() } @@ -31,16 +27,23 @@ def getCheckedOutGitCommitHash() { } dependencies { - compile group: 'commons-collections', name: 'commons-collections', version: '3.2' - compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.2' - compile group: 'org.apache.commons', name: 'commons-io', version: '1.3.2' - compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.5' - compile "commons-codec:commons-codec:1.9" + implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4' + implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4' + implementation group: 'commons-io', name: 'commons-io', version: '2.11.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.16.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.16.0' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.8' + implementation "commons-codec:commons-codec:1.9" //compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.5' - compile 'com.lowagie:itext:4.2.0' - compile 'com.thetransactioncompany:cors-filter:2.2.1' - providedCompile 'javax.servlet:javax.servlet-api:3.1.0' - testCompile group: 'junit', name: 'junit', version: '4.+' + implementation ('com.lowagie:itext:2.1.7') { + exclude group: 'bouncycastle' + } + implementation 'com.thetransactioncompany:cors-filter:2.10' + implementation group: 'org.bouncycastle', name: 'bcmail-jdk15on', version: '1.70' + implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.70' + implementation group: 'org.bouncycastle', name: 'bctsp-jdk15on', version: '1.46' + compileOnly 'javax.servlet:javax.servlet-api:3.1.0' + testImplementation group: 'junit', name: 'junit', version: '4.+' } test { systemProperties 'property': 'value' } diff --git a/simpleSigning/gradle/wrapper/gradle-wrapper.properties b/simpleSigning/gradle/wrapper/gradle-wrapper.properties index ad70da3..d4b9b4e 100644 --- a/simpleSigning/gradle/wrapper/gradle-wrapper.properties +++ b/simpleSigning/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip -- cgit v1.2.3