info: java: upgrade workspace
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 27 Jul 2017 12:32:44 +0000 (14:32 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 27 Jul 2017 12:32:44 +0000 (14:32 +0200)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
12 files changed:
lib/info.java/.gradle-wrapper/gradle-wrapper.jar
lib/info.java/.gradle-wrapper/gradle-wrapper.properties
lib/info.java/cnf/build.bnd
lib/info.java/cnf/ext/maven-local.mvn
lib/info.java/cnf/ext/maven-workspace.mvn
lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar [deleted file]
lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.4.0.jar [new file with mode: 0644]
lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.4.0.jar [moved from lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.3.0.jar with 80% similarity]
lib/info.java/cnf/gradle/template/index.gradle
lib/info.java/cnf/gradle/template/jacoco.gradle
lib/info.java/cnf/gradle/template/master.gradle
lib/info.java/gradle.properties

index 2f9382d..9b80bb9 100644 (file)
Binary files a/lib/info.java/.gradle-wrapper/gradle-wrapper.jar and b/lib/info.java/.gradle-wrapper/gradle-wrapper.jar differ
index 7195f19..0227922 100644 (file)
@@ -1,6 +1,6 @@
-#Fri Jun 16 20:31:27 CEST 2017
+#Thu Jul 27 10:27:17 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-bin.zip
index 900de9b..574042d 100644 (file)
@@ -15,7 +15,7 @@
 #project.output:         ${p-output}
 #project.testpath:       ${p-testpath;:}
 
--verbose:                false
+#-verbose:               false
 #project:                ${basedir}
 #src:                    src
 #bin:                    bin
@@ -33,9 +33,9 @@
 ## Java Compiler Options
 #java:                   java
 #javac:                  javac
-javac.source:            1.7
-javac.target:            1.7
-javac.ee:                '[1.7,1.8)'
+#javac.source:           1.8
+#javac.target:           1.8
+#javac.ee:               '[1.8,1.9)'
 #javac.profile:
 #javac.debug:            on
 
@@ -87,6 +87,10 @@ osgi.annotation.version: 6.0.1
 # Customised Settings
 #
 
+javac.source:            1.7
+javac.target:            1.7
+javac.ee:                '[1.7,1.8)'
+
 product.name:           olsrdinfo
 Bundle-License:         http://www.gnu.org/licenses/gpl-2.0.txt
 Bundle-Category:        ${product.name}
index 45e3502..6e35939 100644 (file)
@@ -2,6 +2,6 @@
 # For the 'Local' repository
 #
 
-com.fasterxml.jackson.core:jackson-annotations:2.8.7
-com.fasterxml.jackson.core:jackson-core:2.8.7
-com.fasterxml.jackson.core:jackson-databind:2.8.7
+com.fasterxml.jackson.core:jackson-annotations:2.8.9
+com.fasterxml.jackson.core:jackson-core:2.8.9
+com.fasterxml.jackson.core:jackson-databind:2.8.9
index d6853b1..30e6453 100644 (file)
@@ -2,5 +2,5 @@
 # For the workspace
 #
 
-biz.aQute.bnd:biz.aQute.bnd.gradle:3.3.0
-biz.aQute.bnd:org.osgi.impl.bundle.repoindex.cli:3.3.0
+biz.aQute.bnd:biz.aQute.bnd.gradle:3.4.0
+biz.aQute.bnd:org.osgi.impl.bundle.repoindex.cli:3.4.0
diff --git a/lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar b/lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar
deleted file mode 100644 (file)
index f0f7362..0000000
Binary files a/lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar and /dev/null differ
diff --git a/lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.4.0.jar b/lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.4.0.jar
new file mode 100644 (file)
index 0000000..efcba81
Binary files /dev/null and b/lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.4.0.jar differ
similarity index 80%
rename from lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.3.0.jar
rename to lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.4.0.jar
index 69d0aa0..8831afe 100644 (file)
Binary files a/lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.3.0.jar and b/lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.4.0.jar differ
index 50f46d8..ad67e60 100644 (file)
@@ -33,7 +33,7 @@ if (!hasProperty('indexR5Compressed'   )) ext.indexR5Compressed    = true
 
 ext.indexBindexJar     = "${rootDir}/${bnd_cnf}/gradle/gradle/dependencies/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-3.0.0.jar"
 ext.indexBindexMain    = 'org.osgi.impl.bundle.bindex.cli.Index'
-ext.indexRepoindexJar  = "${rootDir}/${bnd_cnf}/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.3.0.jar"
+ext.indexRepoindexJar  = "${rootDir}/${bnd_cnf}/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.4.0.jar"
 ext.indexRepoindexMain = 'org.osgi.impl.bundle.bindex.cli.Index'
 
 
index 4244ee5..293feb7 100644 (file)
@@ -16,7 +16,7 @@ assert(hasProperty('sourceSets'))
 apply plugin: 'jacoco'
 
 
-if (!hasProperty('jacocoToolVersion')) ext.jacocoToolVersion = '0.7.6.201602180812'
+if (!hasProperty('jacocoToolVersion')) ext.jacocoToolVersion = '0.7.9'
 if (!hasProperty('jacocoXmlReport'  )) ext.jacocoXmlReport   = true
 if (!hasProperty('jacocoCsvReport'  )) ext.jacocoCsvReport   = false
 
index 59b0a18..9bcb12a 100644 (file)
@@ -35,6 +35,9 @@ assert(hasProperty('bndWorkspace'        ))
 /* Initialize the bnd workspace */
 Workspace.setDriver(Constants.BNDDRIVER_GRADLE)
 Workspace.addGestalt(Constants.GESTALT_BATCH, null)
+if (gradle.startParameter.offline) {
+  Workspace.addGestalt(Constants.GESTALT_OFFLINE, null)
+}
 ext.bndWorkspace = new Workspace(rootDir, bnd_cnf)
 if (bndWorkspace == null) {
   throw new GradleException("Unable to load workspace ${rootDir}/${bnd_cnf}")
index 6fd26c3..ea7b40d 100644 (file)
@@ -1,5 +1,5 @@
 # bnd_jar can also be a URL.
-bnd_jar=cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar
+bnd_jar=cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.4.0.jar
 
 # Default gradle tasks to build for the root project (comma-separated)
 root_defaultTask=build