SSDM-9372 : Gradle 4 to Gradle 5 update

big_data_link_server/build.gradle

@@ -22,6 +22,8 @@ dependencies {
 			'fasterxml:jackson-core:2.9.10',
 			'fasterxml:jackson-databind:2.9.10',
 			'openbis:openbis-v3-api-batteries-included:S269'
+
+    annotationProcessor 'lombok:lombok:1.16.20'
 }
 
 

deep_sequencing_unit/build.gradle

@@ -62,7 +62,7 @@ task trackingJar(type: Jar) {
         include '**/com/google/gwt/user/client/rpc/SerializableException.class'
     }
     
-    from (sourceSets.main.output.classesDir) {
+    from (sourceSets.main.output.classesDirs) {
         include '**/*'
     }    
 

gradle/javaproject.gradle

@@ -18,10 +18,10 @@ configurations.all {
     resolutionStrategy.cacheChangingModulesFor 0, 'hours'
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.3'
-    distributionUrl = "https://services.gradle.org/distributions/gradle-4.10.3-bin.zip"
-}
+//task wrapper(type: Wrapper) {
+//    gradleVersion = '4.10.3'
+//    distributionUrl = "https://services.gradle.org/distributions/gradle-4.10.3-bin.zip"
+//}
 sourceCompatibility='1.8'
 targetCompatibility='1.8'
 
@@ -331,13 +331,15 @@ task testRuntimeDependencies(type: Copy) {
     from configurations.testRuntime
 }
 
-task checkDependencies(dependsOn: classes) << {
-	ant.taskdef(name: 'dependencychecker', classname: 'classycle.ant.DependencyCheckingTask', classpath: configurations.testRuntime.asPath)
-    ant.dependencychecker(
-                definitionFile: 'resource/dependency-structure.ddf', 
-                failOnUnwantedDependencies: 'true',
-                mergeInnerClasses: 'true') {
-        fileset(dir: "${buildDir}", includes: "**/*.class")
+task checkDependencies(dependsOn: classes) {
+    doLast {
+        ant.taskdef(name: 'dependencychecker', classname: 'classycle.ant.DependencyCheckingTask', classpath: configurations.testRuntime.asPath)
+        ant.dependencychecker(
+                    definitionFile: 'resource/dependency-structure.ddf',
+                    failOnUnwantedDependencies: 'true',
+                    mergeInnerClasses: 'true') {
+            fileset(dir: "${buildDir}", includes: "**/*.class")
+        }
     }
 }
 

installation/build.gradle

@@ -126,31 +126,35 @@ def fixJarFile = { String jarFilePath ->
  
 }
 
-task(listVersions) << {
-    println "project: ${project.name} [${version}]"
-    for (p in project.subprojects) {
-        println "subproject: ${p.name} [${p.version}]"
+task(listVersions) {
+    doLast {
+        println "project: ${project.name} [${version}]"
+        for (p in project.subprojects) {
+            println "subproject: ${p.name} [${p.version}]"
+        }
     }
 }
-task(compileInstaller) << {
-    def compression = 'default'
-    def kind = 'standard'
-    def basedir = project.projectDir.path
-    def input = '../installation/resource/installer/install.xml'
-    def compressionLevel = -1
-    def compilerData = new com.izforge.izpack.compiler.data.CompilerData(compression, kind, input, 
-            null, basedir, izPackJar, compressionLevel)
-    def compilerContainer = new com.izforge.izpack.compiler.container.CompilerContainer()
-    compilerContainer.initBindings()
-    compilerContainer.addConfig('installFile', input)
-    compilerContainer.addComponent(compilerData.class, compilerData)
-    def compilerConfig = compilerContainer.getComponent(com.izforge.izpack.compiler.CompilerConfig.class)
-    def propertyManager = compilerContainer.getComponent(com.izforge.izpack.compiler.data.PropertyManager.class)
-    propertyManager.addProperty('installer.dist.dir', '../installation/' + installerDistDir)
-    propertyManager.addProperty('version.number', versionNumber)
-    propertyManager.addProperty('revision.number', Integer.toString(revisionNumber))
-    compilerConfig.executeCompiler()
-    fixJarFile(izPackJar)
+task(compileInstaller) {
+    doLast {
+        def compression = 'default'
+        def kind = 'standard'
+        def basedir = project.projectDir.path
+        def input = '../installation/resource/installer/install.xml'
+        def compressionLevel = -1
+        def compilerData = new com.izforge.izpack.compiler.data.CompilerData(compression, kind, input,
+                null, basedir, izPackJar, compressionLevel)
+        def compilerContainer = new com.izforge.izpack.compiler.container.CompilerContainer()
+        compilerContainer.initBindings()
+        compilerContainer.addConfig('installFile', input)
+        compilerContainer.addComponent(compilerData.class, compilerData)
+        def compilerConfig = compilerContainer.getComponent(com.izforge.izpack.compiler.CompilerConfig.class)
+        def propertyManager = compilerContainer.getComponent(com.izforge.izpack.compiler.data.PropertyManager.class)
+        propertyManager.addProperty('installer.dist.dir', '../installation/' + installerDistDir)
+        propertyManager.addProperty('version.number', versionNumber)
+        propertyManager.addProperty('revision.number', Integer.toString(revisionNumber))
+        compilerConfig.executeCompiler()
+        fixJarFile(izPackJar)
+    }
 }
 compileInstaller.dependsOn copyResources
 

installation/gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

openbis_standard_technologies/build.gradle

 buildscript {
     apply from: '../gradle/repository.gradle'
-    
-    repositories repositoryConfig
-    
+
+	repositories repositoryConfig
+	// TODO: Remove after adding org.paleozogt:symzip-plugin:0.10.1 to the Ivy repository
+	repositories {
+		jcenter()
+	};
+
     dependencies {
         classpath 'apache:commons-codec:1.10',
                   'owasp:dependency-check-gradle:3.1.2',
-                  'paleozogt:symzip-plugin:0.9.7'
+                  'org.paleozogt:symzip-plugin:0.10.1'
     }
 }
 
@@ -130,7 +134,8 @@ task compileGwt (dependsOn: classes, type: JavaExec) {
      
 	// inputs.source
 	sourceSets.main.java.srcDirs
-	inputs.dir sourceSets.main.output.resourcesDir
+	// inputs.dir
+	sourceSets.main.output.resourcesDir
 	outputs.dir buildDir
      
 	doFirst {
@@ -144,7 +149,7 @@ task compileGwt (dependsOn: classes, type: JavaExec) {
 			sourceSets.main.java.srcDirs,		
 			project(":openbis").sourceSets.main.java.srcDirs,
 			project(":openbis").sourceSets.main.output.resourcesDir,
-			project(":openbis").sourceSets.main.output.classesDir,
+			project(":openbis").sourceSets.main.output.classesDirs,
 			project(":openbis").sourceSets.main.compileClasspath,
 			project(":common").sourceSets.main.java.srcDirs,
 			project(":openbis_api").sourceSets.main.java.srcDirs,

openbis_standard_technologies/clients.gradle

@@ -163,45 +163,47 @@ task dssClientZip(type: Zip, dependsOn: signWebStartJars) {
     }
 }
 
-task dssUploadGuiStandalone << {
-	ant.taskdef(name: 'bundle', classname: 'com.oracle.appbundler.AppBundlerTask', classpath: configurations.appbundler.asPath)
-    ant.bundle(outputdirectory: "${buildDir}", 
-    			name: 'DataSetUploader', 
-    			displayname: 'Data Set Uploader', 
-    			identifier: 'ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient', 
-    			mainclassname: 'ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient') {
-   		
-    	classpath(dir: "${signedJarsFolder}") {
-            include(name: "aopalliance.jar")
-        	include(name: "cglib-nodep.jar")
-        	include(name: "cisd-args4j.jar")
-        	include(name: "sis-base.jar")
-        	include(name: "commons-codec.jar")
-        	include(name: "httpclient.jar")
-            include(name: "httpcore.jar")
-        	include(name: "commons-io.jar")
-        	include(name: "commons-lang.jar")
-        	include(name: "commons-lang3.jar")
-        	include(name: "commons-text.jar")
-        	include(name: "commons-logging.jar")
-        	include(name: "dom4j-1.6.1.jar")
-        	include(name: "dss_upload_gui.jar")
-        	include(name: "geronimo-stax-api_1.0_spec-1.0.jar")
-        	include(name: "jython.jar")
-        	include(name: "log4j.jar")
-        	include(name: "poi-ooxml-schemas.jar")
-        	include(name: "poi-ooxml.jar")
-        	include(name: "poi.jar")
-            include(name: "spring-aop.jar")
-            include(name: "spring-beans.jar")
-            include(name: "spring-context.jar")
-            include(name: "spring-core.jar")
-            include(name: "spring-web.jar")
-            include(name: "spring-webmvc.jar")
-        	include(name: "spring-expression.jar")
-        	include(name: "stream-supporting-httpinvoker.jar")
-    	}
-    }	
+task dssUploadGuiStandalone {
+    doLast {
+        ant.taskdef(name: 'bundle', classname: 'com.oracle.appbundler.AppBundlerTask', classpath: configurations.appbundler.asPath)
+        ant.bundle(outputdirectory: "${buildDir}",
+                    name: 'DataSetUploader',
+                    displayname: 'Data Set Uploader',
+                    identifier: 'ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient',
+                    mainclassname: 'ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient') {
+
+            classpath(dir: "${signedJarsFolder}") {
+                include(name: "aopalliance.jar")
+                include(name: "cglib-nodep.jar")
+                include(name: "cisd-args4j.jar")
+                include(name: "sis-base.jar")
+                include(name: "commons-codec.jar")
+                include(name: "httpclient.jar")
+                include(name: "httpcore.jar")
+                include(name: "commons-io.jar")
+                include(name: "commons-lang.jar")
+                include(name: "commons-lang3.jar")
+                include(name: "commons-text.jar")
+                include(name: "commons-logging.jar")
+                include(name: "dom4j-1.6.1.jar")
+                include(name: "dss_upload_gui.jar")
+                include(name: "geronimo-stax-api_1.0_spec-1.0.jar")
+                include(name: "jython.jar")
+                include(name: "log4j.jar")
+                include(name: "poi-ooxml-schemas.jar")
+                include(name: "poi-ooxml.jar")
+                include(name: "poi.jar")
+                include(name: "spring-aop.jar")
+                include(name: "spring-beans.jar")
+                include(name: "spring-context.jar")
+                include(name: "spring-core.jar")
+                include(name: "spring-web.jar")
+                include(name: "spring-webmvc.jar")
+                include(name: "spring-expression.jar")
+                include(name: "stream-supporting-httpinvoker.jar")
+            }
+        }
+    }
 }
 dssUploadGuiStandalone.dependsOn signWebStartJars