dependency version updates

1 files changed, 47 insertions, 28 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