diff --git a/big_data_link_server/build.gradle b/big_data_link_server/build.gradle
index e735387b4314b498655c518b0d62d09b2af518b8..9fa0d34b05915a959e0d7453cc8ee349f5ed7237 100644
--- a/big_data_link_server/build.gradle
+++ b/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'
}
diff --git a/deep_sequencing_unit/build.gradle b/deep_sequencing_unit/build.gradle
index 367d4379665504e8006d1bd99bbf7f5d2ff23a02..71aea8e281bd6d2a41f67018ecc03a003f11b76b 100644
--- a/deep_sequencing_unit/build.gradle
+++ b/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 '**/*'
}
diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index f53e4f03a6c0ac1ce12ad64a83b566ee3c6e5ab5..e3311ff49df1adc97607c8e4efe1123aa7f02fef 100644
--- a/gradle/javaproject.gradle
+++ b/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")
+ }
}
}
diff --git a/installation/build.gradle b/installation/build.gradle
index c7b9a8cb1ccf141109cb43838a9b98956714e830..c4a4b81f3053be015d7a500bde25e5a2c08dfd56 100644
--- a/installation/build.gradle
+++ b/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
diff --git a/installation/gradle/wrapper/gradle-wrapper.properties b/installation/gradle/wrapper/gradle-wrapper.properties
index 290541c738646a3212199241f726c707e47a459c..0ebb3108e207e83ce01a35b6003e642329222226 100644
--- a/installation/gradle/wrapper/gradle-wrapper.properties
+++ b/installation/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
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
diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle
index 7e022dc910e4734cc6f9f653b69c8fd4b36cc5ef..1e17064610837c06051faa4ad2edaebea657204d 100644
--- a/openbis_standard_technologies/build.gradle
+++ b/openbis_standard_technologies/build.gradle
@@ -1,12 +1,16 @@
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,
diff --git a/openbis_standard_technologies/clients.gradle b/openbis_standard_technologies/clients.gradle
index b3dae446aaa8ddf529cce1fa9ea974f64c4e5d36..8ed1dd56c0f8e6eaf7e5671df041e00b17db962e 100644
--- a/openbis_standard_technologies/clients.gradle
+++ b/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