aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle75
-rw-r--r--pdf-as-lib/build.gradle18
-rw-r--r--pdf-as-tests/build.gradle6
-rw-r--r--pdf-as-web-client/build.gradle2
-rw-r--r--pdf-as-web/build.gradle16
-rw-r--r--signature-standards/sigs-pades/build.gradle2
-rw-r--r--signature-standards/sigs-pkcs7detached/build.gradle2
7 files changed, 70 insertions, 51 deletions
diff --git a/build.gradle b/build.gradle
index 93fe2674..25d48445 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,46 @@
+buildscript {
+ repositories {
+ jcenter()
+ mavenCentral()
+ }
+
+ dependencies {
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.+'
+ }
+}
+
+allprojects {
+ apply plugin: 'com.github.ben-manes.versions'
+ repositories { mavenCentral() }
+}
+
+configurations {
+ cveCheck
+}
+
+// Assign dependencies to the sshAntTask configuration.
+dependencies {
+ cveCheck 'org.owasp:dependency-check-ant:1.2.5'
+}
+
+task checkCVE << {
+ // Redefine checkCVEAnt Ant task, with the classpath property set to our newly defined
+ // cveCheck configuration classpath.
+ ant.taskdef(name: 'checkCVEAnt', classname: 'org.owasp.dependencycheck.taskdefs.DependencyCheckTask',
+ classpath: configurations.cveCheck.asPath)
+
+ // executing checkCVEAnt Task
+ ant.checkCVEAnt(
+ applicationname: "PDF-AS",
+ reportoutputdirectory: (new File(rootDir, 'releases/cvecheck/' + project.name)).toString(),
+ reportformat: "ALL") {
+ fileset(dir: (new File(rootDir, 'build/alldependencies')).toString()) {
+ include(name: '**/**')
+ }
+ }
+}
+
+
subprojects {
apply plugin: 'java'
apply plugin: 'eclipse'
@@ -13,7 +56,7 @@ subprojects {
dependencies {
testCompile 'junit:junit:4.8.2'
//to use WebDav protocol on upload
- deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2'
+ //deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2'
}
sourceCompatibility = 1.6
@@ -26,6 +69,8 @@ subprojects {
revision = getCheckedOutGitCommitHash()
//tomcatVersion = '7.0.54';
tomcatVersion = '8.0.9';
+ slf4jVersion = '1.7.7'
+
}
jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version }
@@ -35,7 +80,7 @@ subprojects {
into (new File(rootDir, 'build/alldependencies')).toString()
}
- checkCVE.dependsOn copyDeps
+ rootProject.checkCVE.dependsOn copyDeps
uploadArchives {
repositories.mavenDeployer {
@@ -45,32 +90,6 @@ subprojects {
}
}
-configurations {
- cveCheck
-}
-
-// Assign dependencies to the sshAntTask configuration.
-dependencies {
- cveCheck 'org.owasp:dependency-check-ant:1.2.5'
-}
-
-task checkCVE << {
- // Redefine checkCVEAnt Ant task, with the classpath property set to our newly defined
- // cveCheck configuration classpath.
- ant.taskdef(name: 'checkCVEAnt', classname: 'org.owasp.dependencycheck.taskdefs.DependencyCheckTask',
- classpath: configurations.cveCheck.asPath)
-
- // executing checkCVEAnt Task
- ant.checkCVEAnt(
- applicationname: "PDF-AS",
- reportoutputdirectory: (new File(rootDir, 'releases/cvecheck/' + project.name)).toString(),
- reportformat: "ALL") {
- fileset(dir: (new File(rootDir, 'build/alldependencies')).toString()) {
- include(name: '**/**')
- }
- }
-}
-
def getCheckedOutGitCommitHash() {
def gitFolder = "$projectDir/.git/"
def takeFromHash = 40
diff --git a/pdf-as-lib/build.gradle b/pdf-as-lib/build.gradle
index c8e4e75f..b0309ea3 100644
--- a/pdf-as-lib/build.gradle
+++ b/pdf-as-lib/build.gradle
@@ -38,25 +38,25 @@ repositories {
dependencies {
compile project (':pdf-as-common')
- compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.3.1'
- compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.1'
- compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.5'
- compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.1'
+ compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.3.5'
+ compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'
+ compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.7'
+ compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.3.2'
compile group: 'commons-io', name: 'commons-io', version: '2.4'
- compile group: 'commons-collections', name: 'commons-collections', version: '3.2'
+ compile 'org.apache.commons:commons-collections4:4.0'
compile group: 'org.apache.axis2', name: 'axis2', version: '1.6.2'
compile group: 'org.apache.axis2', name: 'axis2-jaxws', version: '1.6.2'
compile group: 'org.apache.axis2', name: 'axis2-transport-local', version: '1.6.2'
- compile group: 'ognl', name: 'ognl', version: '3.0.6'
+ compile group: 'ognl', name: 'ognl', version: '3.0.8'
compile files('libs/iaik_eccelerate_cms.jar')
compile files('libs/iaik_eccelerate.jar')
compile files('libs/iaik_jce.jar')
compile files('libs/iaik_jce_full.jar')
compile files('libs/iaik_cms.jar')
compile group: 'log4j', name: 'log4j', version: '1.2.17'
- compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
- compile group: 'com.google.zxing', name: 'core', version: '2.2'
- compile group: 'com.google.zxing', name: 'javase', version: '2.2'
+ compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+ compile group: 'com.google.zxing', name: 'core', version: '3.1.0'
+ compile group: 'com.google.zxing', name: 'javase', version: '3.1.0'
testCompile group: 'junit', name: 'junit', version: '4.+'
}
diff --git a/pdf-as-tests/build.gradle b/pdf-as-tests/build.gradle
index 07beea24..cb674910 100644
--- a/pdf-as-tests/build.gradle
+++ b/pdf-as-tests/build.gradle
@@ -19,10 +19,10 @@ dependencies {
compile project (':signature-standards:sigs-pkcs7detached')
compile project (':signature-standards:sigs-pades')
compile group: 'log4j', name: 'log4j', version: '1.2.17'
- compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
+ compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7'
testCompile group: 'junit', name: 'junit', version: '4.+'
- testCompile group: 'org.apache.pdfbox', name: 'preflight', version: '1.8.5'
- testCompile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.6'
+ testCompile group: 'org.apache.pdfbox', name: 'preflight', version: '1.8.7'
+ testCompile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.7'
testCompile group: 'org.icepdf', name: 'icepdf-core', version: '5.0.7'
}
diff --git a/pdf-as-web-client/build.gradle b/pdf-as-web-client/build.gradle
index b506564a..b820ede0 100644
--- a/pdf-as-web-client/build.gradle
+++ b/pdf-as-web-client/build.gradle
@@ -13,7 +13,7 @@ repositories {
}
dependencies {
- compile group: 'commons-collections', name: 'commons-collections', version: '3.2'
+ compile 'org.apache.commons:commons-collections4:4.+'
compile project (':pdf-as-common')
testCompile group: 'junit', name: 'junit', version: '4.+'
}
diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle
index c662f0e5..cd180ad0 100644
--- a/pdf-as-web/build.gradle
+++ b/pdf-as-web/build.gradle
@@ -19,20 +19,20 @@ dependencies {
compile project (':pdf-as-lib')
compile project (':signature-standards:sigs-pkcs7detached')
compile project (':signature-standards:sigs-pades')
- compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.2'
- compile group: 'commons-collections', name: 'commons-collections', version: '3.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 group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1'
+ compile 'org.apache.commons:commons-collections4:4.0'
+ compile 'commons-io:commons-io:2.4'
+ compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.7'
compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
compile 'javax.xml.ws:jaxws-api:2.2.11'
compile "commons-codec:commons-codec:1.9"
compile 'com.sun.xml.ws:jaxws-rt:2.2.8'
compile 'com.sun.xml.bind:jaxb-impl:2.2.7'
compile 'org.apache.commons:commons-lang3:3.3.2'
- compile 'org.apache.httpcomponents:httpclient:4.3.4'
- compile "org.hibernate:hibernate-core:4.3.5.Final"
- compile "org.hibernate:hibernate-entitymanager:4.3.5.Final"
- compile "mysql:mysql-connector-java:5.1.28"
+ compile 'org.apache.httpcomponents:httpclient:4.3.5'
+ compile "org.hibernate:hibernate-core:4.3.6.Final"
+ compile "org.hibernate:hibernate-entitymanager:4.3.6.Final"
+ compile "mysql:mysql-connector-java:5.1.33"
compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.8.5'
providedCompile "javax.servlet:servlet-api:2.5"
testCompile group: 'junit', name: 'junit', version: '4.+'
diff --git a/signature-standards/sigs-pades/build.gradle b/signature-standards/sigs-pades/build.gradle
index 0a0c471e..86f1b6c3 100644
--- a/signature-standards/sigs-pades/build.gradle
+++ b/signature-standards/sigs-pades/build.gradle
@@ -20,7 +20,7 @@ task releases(type: Copy) {
dependencies {
compile project (':pdf-as-lib')
compile project (':pdf-as-common')
- compile group: 'commons-collections', name: 'commons-collections', version: '3.2'
+ compile 'org.apache.commons:commons-collections4:4.0'
testCompile group: 'junit', name: 'junit', version: '4.+'
}
diff --git a/signature-standards/sigs-pkcs7detached/build.gradle b/signature-standards/sigs-pkcs7detached/build.gradle
index 9a30feeb..22227532 100644
--- a/signature-standards/sigs-pkcs7detached/build.gradle
+++ b/signature-standards/sigs-pkcs7detached/build.gradle
@@ -20,7 +20,7 @@ task releases(type: Copy) {
dependencies {
compile project (':pdf-as-lib')
compile project (':pdf-as-common')
- compile group: 'commons-collections', name: 'commons-collections', version: '3.2'
+ compile 'org.apache.commons:commons-collections4:4.0'
testCompile group: 'junit', name: 'junit', version: '4.+'
}