info: java: update workspace
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 23 Feb 2017 17:58:15 +0000 (18:58 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 23 Feb 2017 17:58:15 +0000 (18:58 +0100)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
31 files changed:
lib/info.java/.gradle-wrapper/gradle-wrapper.jar
lib/info.java/.gradle-wrapper/gradle-wrapper.properties
lib/info.java/BUILDING-GRADLE.md
lib/info.java/LICENSE.txt
lib/info.java/build.gradle
lib/info.java/cnf/build.bnd
lib/info.java/cnf/buildrepo/README [new file with mode: 0644]
lib/info.java/cnf/ext/junit.bnd
lib/info.java/cnf/ext/maven-build.mvn [new file with mode: 0644]
lib/info.java/cnf/ext/maven-local.mvn [new file with mode: 0644]
lib/info.java/cnf/ext/maven-workspace.mvn [new file with mode: 0644]
lib/info.java/cnf/ext/pluginpaths.bnd
lib/info.java/cnf/ext/repositories.bnd
lib/info.java/cnf/findbugs/findbugs.include.xml
lib/info.java/cnf/gradle/dependencies/README [new file with mode: 0644]
lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar [moved from lib/info.java/cnf/gradle/dependencies/biz.aQute.bnd.gradle.jar with 100% similarity]
lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-3.0.0.jar [moved from lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.bindex.jar with 100% similarity]
lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.3.0.jar [moved from lib/info.java/cnf/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli.jar with 100% similarity]
lib/info.java/cnf/gradle/doc/BUILDING-GRADLE.md
lib/info.java/cnf/gradle/doc/CHANGELOG.md
lib/info.java/cnf/gradle/template/index.gradle
lib/info.java/cnf/localrepo/.gitignore [new file with mode: 0644]
lib/info.java/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar [deleted file]
lib/info.java/cnf/releaserepo/.gitignore [new file with mode: 0644]
lib/info.java/cnf/releaserepoCI/.gitignore [new file with mode: 0644]
lib/info.java/cnf/scripts/mavenpages [new file with mode: 0755]
lib/info.java/eclipse.settings/bndtools.core.prefs
lib/info.java/eclipse.settings/org.eclipse.jdt.core.prefs
lib/info.java/eclipse.settings/org.eclipse.jdt.ui.prefs
lib/info.java/gradle.properties
lib/info.java/settings.gradle

index 01d23d6..5c94a26 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 73f6b36..eae291b 100644 (file)
@@ -1,4 +1,4 @@
-#Mon Feb 20 22:53:04 CET 2017
+#Wed Feb 22 11:26:26 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
index 0e70322..ba8126e 100644 (file)
@@ -1 +1,2 @@
 Please read the document cnf/gradle/doc/BUILDING-GRADLE.md
+
index d159169..1f963da 100644 (file)
@@ -337,3 +337,4 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
+
index 50aeb5f..8b326ba 100644 (file)
@@ -16,3 +16,4 @@ buildscript {
 
 
 apply from: new File(rootDir, "${bnd_cnf}/gradle/template/master.gradle")
+
index 460f527..900de9b 100644 (file)
@@ -2,86 +2,92 @@
 ## BND BUILD SETTINGS ##
 ########################
 
-
 ## Global defaults are loaded from the bnd library (as shown below), place your
 ## specific settings here. Additional settings are inherited from ext/*.bnd and
 ## they will be overridden by anything you specify in this file.
 
 ## General Options
-#project.dependson:     ${p-dependson;:}
-#project.bootclasspath: ${p-bootclasspath;:}
-#project.buildpath:     ${p-buildpath;:}
-#project.sourcepath:    ${p-sourcepath;:}
-#project.allsourcepath: ${p-allsourcepath;:}
-#project.output:        ${p-output}
-#project.testpath:      ${p-testpath;:}
-
-#-verbose:              false
-#project:               ${basedir}
-#src:                   src
-#bin:                   bin
-#testsrc:               test
-#testbin:               bin_test
-#test-reports:          test-reports
-#target-dir:            generated
-#target:                ${project}/${target-dir}
-#build:                 ${workspace}/cnf
-#p:                     ${basename;${project}}
-#project.name:          ${p}
-#plugin-dir:            ${build}/plugins
+#project.dependson:      ${p-dependson;:}
+#project.bootclasspath:  ${p-bootclasspath;:}
+#project.buildpath:      ${p-buildpath;:}
+#project.sourcepath:     ${p-sourcepath;:}
+#project.allsourcepath:  ${p-allsourcepath;:}
+#project.output:         ${p-output}
+#project.testpath:       ${p-testpath;:}
+
+-verbose:                false
+#project:                ${basedir}
+#src:                    src
+#bin:                    bin
+#testsrc:                test
+#testbin:                bin_test
+#test-reports:           test-reports
+#target-dir:             generated
+#target:                 ${project}/${target-dir}
+#build:                  ${workspace}/cnf
+#p:                      ${basename;${project}}
+#project.name:           ${p}
+#plugin-dir:             ${build}/plugins
+
 
 ## Java Compiler Options
-#java:                  java
-#javac:                 javac
-#javac.source:          1.5
-#javac.target:          1.5
-#javac.debug:           on
+#java:                   java
+#javac:                  javac
+javac.source:            1.7
+javac.target:            1.7
+javac.ee:                '[1.7,1.8)'
+#javac.profile:
+#javac.debug:            on
+
 
 ## Bnd Options
-#-sources:              true
-#-sourcepath:           ${project}/src
+#-sources:               true
+#-sourcepath:            ${project}/src
 
 
 ## Properties from ext/*.bnd can be referenced in order to extend them. For
 ## example, to add one additional plugin to the list defined in
 ## ext/repositories.bnd:
-# -plugin: ${ext.repositories.-plugin}, org.example.MyPlugin
+#-plugin:                ${ext.repositories.-plugin}, org.example.MyPlugin
 
 
-## To enable baselining, uncomment the following lines:
--baseline: *
+# To include source and debug information in the Eclipse build but NOT in the
+# gradle build, uncomment the following lines:
+-sources:                ${if;${gestalt;batch};false;true}
+javac.debug:             ${if;${gestalt;batch};off;on}
 
 
-## If you use git, you might want to uncomment the following lines:
-Git-Descriptor:       ${system-allow-fail;git describe --dirty --always}
-Git-SHA:              ${system-allow-fail;git rev-list -1 HEAD}
--diffignore:          Git-Descriptor,Git-SHA
+# If you use git, you might want to uncomment the following lines:
+Git-Descriptor:          ${system-allow-fail;git describe --dirty --always}
+Git-SHA:                 ${system-allow-fail;git rev-list -1 HEAD}
 
 
-#
-# Customised Settings
-#
+# To enable baselining, uncomment the following lines:
+-baseline:               *
+-diffignore:             Git-Descriptor,Git-SHA
 
 
-product.name:           olsrdinfo
+# Remove some manifest headers that aren't relevant
+-removeheaders: \
+  Bnd-LastModified, \
+  Conditional-Package, \
+  Created-By, \
+  Include-Resource, \
+  Private-Package, \
+  Tool
 
--verbose:               false
-javac.source:           1.7
-javac.target:           1.7
-javac.ee:               '[1.7,1.8)'
 
-osgi.annotation.version: 6.0.1
+# Some buildrepo versions
 osgi.core.version:       6.0.0
 osgi.cmpn.version:       6.0.0
+osgi.annotation.version: 6.0.1
+
 
+#
+# Customised Settings
+#
+
+product.name:           olsrdinfo
 Bundle-License:         http://www.gnu.org/licenses/gpl-2.0.txt
 Bundle-Category:        ${product.name}
 
--removeheaders: \
-       Bnd-LastModified,\
-       Created-By,\
-       Tool,\
-       Private-Package,\
-       Conditional-Package
-
--sources: ${if;${gestalt;batch};false;true}
diff --git a/lib/info.java/cnf/buildrepo/README b/lib/info.java/cnf/buildrepo/README
new file mode 100644 (file)
index 0000000..12464a2
--- /dev/null
@@ -0,0 +1,9 @@
+===========
+= WARNING =
+===========
+
+This directory contains JAR file dependencies that are intended
+ONLY FOR BUILT-TIME usage.
+
+None are intended to be deployed as bundles into a running OSGi Framework, and
+indeed they may cause unexpected errors if they are used at runtime.
index f94a00c..53ae88c 100644 (file)
@@ -1,5 +1,6 @@
-junit:\
-       junit;version=latest,\
-       hamcrest-core;version=latest
+junit: \
+  junit;version=latest, \
+  hamcrest-core;version=latest
 
-test-reports: test-results
+test-reports: \
+  test-results
diff --git a/lib/info.java/cnf/ext/maven-build.mvn b/lib/info.java/cnf/ext/maven-build.mvn
new file mode 100644 (file)
index 0000000..113c134
--- /dev/null
@@ -0,0 +1,9 @@
+#
+# For the 'Build' repository
+#
+
+junit:junit:4.12
+org.hamcrest:hamcrest-core:1.3
+org.osgi:osgi.annotation:6.0.1
+org.osgi:osgi.cmpn:6.0.0
+org.osgi:osgi.core:6.0.0
diff --git a/lib/info.java/cnf/ext/maven-local.mvn b/lib/info.java/cnf/ext/maven-local.mvn
new file mode 100644 (file)
index 0000000..45e3502
--- /dev/null
@@ -0,0 +1,7 @@
+#
+# 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
diff --git a/lib/info.java/cnf/ext/maven-workspace.mvn b/lib/info.java/cnf/ext/maven-workspace.mvn
new file mode 100644 (file)
index 0000000..d6853b1
--- /dev/null
@@ -0,0 +1,6 @@
+#
+# 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
index 00e1482..c36b00d 100644 (file)
@@ -1,2 +1 @@
--pluginpath:\
-       ${plugin-dir}/biz.aQute.repository/biz.aQute.repository.jar
\ No newline at end of file
+#-pluginpath:
index 902fbdd..9505bd3 100644 (file)
@@ -1,22 +1,46 @@
 -plugin: \
-       aQute.bnd.deployer.repository.LocalIndexedRepo; \
-               name=Local; \
-               local=${workspace}/cnf/localrepo; \
-               pretty=true; \
-       , \
-       aQute.bnd.deployer.repository.LocalIndexedRepo;\
-               name=Release; \
-               local=${workspace}/cnf/releaserepo; \
-               pretty=true; \
-       , \
-       aQute.bnd.deployer.repository.LocalIndexedRepo;\
-               name=ReleaseCI; \
-               local=${workspace}/cnf/releaserepoCI; \
-               pretty=true; \
-       , \
-       aQute.lib.deployer.FileRepo;\
-               name=Build; \
-               location=${workspace}/cnf/buildrepo; \
-               latest=false
+  aQute.bnd.deployer.repository.LocalIndexedRepo; \
+    name=Local; \
+    local=${workspace}/cnf/localrepo; \
+    pretty=true, \
+  \
+  aQute.bnd.deployer.repository.LocalIndexedRepo; \
+    name=Release; \
+    local=${workspace}/cnf/releaserepo; \
+    pretty=true, \
+  \
+  aQute.bnd.deployer.repository.LocalIndexedRepo; \
+    name=ReleaseCI; \
+    local=${workspace}/cnf/releaserepoCI; \
+    pretty=true, \
+  \
+  aQute.lib.deployer.FileRepo; \
+    name=Build; \
+    location=${workspace}/cnf/buildrepo; \
+    latest=false, \
+  \
+  aQute.bnd.repository.maven.provider.MavenBndRepository; \
+    releaseUrl="https://repo1.maven.org/maven2"; \
+    index=${.}/maven-local.mvn; \
+    name='Maven Central - Local'; \
+    readOnly=true, \
+  \
+  aQute.bnd.repository.maven.provider.MavenBndRepository; \
+    releaseUrl="https://repo1.maven.org/maven2"; \
+    index=${.}/maven-build.mvn; \
+    name='Maven Central - Build'; \
+    readOnly=true, \
+  \
+  aQute.lib.deployer.FileRepo; \
+    name=Build - Workspace; \
+    location=${workspace}/cnf/gradle/dependencies; \
+    latest=false, \
+  \
+  aQute.bnd.repository.maven.provider.MavenBndRepository; \
+    releaseUrl="https://repo1.maven.org/maven2"; \
+    index=${.}/maven-workspace.mvn; \
+    name='Maven Central - Workspace'; \
+    readOnly=true
 
--releaserepo: ${if;${gestalt;batch};ReleaseCI;Release}
+-releaserepo: \
+  ${if;${gestalt;batch};ReleaseCI;Release}
diff --git a/lib/info.java/cnf/gradle/dependencies/README b/lib/info.java/cnf/gradle/dependencies/README
new file mode 100644 (file)
index 0000000..3bd1817
--- /dev/null
@@ -0,0 +1,8 @@
+===========
+= WARNING =
+===========
+
+This directory contains JAR file dependencies that are intended
+ONLY FOR BUILT-TIME usage by the Gradle build.
+
+None are intended to be used as bundles in any project.
index 49a502b..bc731fb 100644 (file)
@@ -331,7 +331,8 @@ It contains:
 
     * &nbsp;```dependencies```
 
-      This directory contains libraries that are used by the build.
+      This directory contains libraries that are used by the build in the form
+      of a file repository.
 
     * &nbsp;```doc```
 
index 5738e5f..a7c5f5a 100644 (file)
@@ -3,12 +3,11 @@ Version 1.3, 3 November 2008
 
 # Compatibility
 
-This plugin is compatible with all bndtools versions since 3.1.0.REL.
+This workspace is compatible with all bndtools versions since 3.3.0.REL.
 
 # Update Log
 
-* this: 6f9720f
-* bnd:  575c12f
+* this: -
 
 # Changes since bndtools 3.1.1 release
 
index c3a073a..50f46d8 100644 (file)
@@ -31,9 +31,9 @@ if (!hasProperty('indexR5Uncompressed' )) ext.indexR5Uncompressed  = false
 if (!hasProperty('indexR5Compressed'   )) ext.indexR5Compressed    = true
 
 
-ext.indexBindexJar     = "${rootDir}/${bnd_cnf}/gradle/dependencies/org.osgi.impl.bundle.bindex.jar"
+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.jar"
+ext.indexRepoindexJar  = "${rootDir}/${bnd_cnf}/gradle/dependencies/org.osgi.impl.bundle.repoindex.cli/org.osgi.impl.bundle.repoindex.cli-3.3.0.jar"
 ext.indexRepoindexMain = 'org.osgi.impl.bundle.bindex.cli.Index'
 
 
diff --git a/lib/info.java/cnf/localrepo/.gitignore b/lib/info.java/cnf/localrepo/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/lib/info.java/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar b/lib/info.java/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
deleted file mode 100644 (file)
index 0eb4085..0000000
Binary files a/lib/info.java/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar and /dev/null differ
diff --git a/lib/info.java/cnf/releaserepo/.gitignore b/lib/info.java/cnf/releaserepo/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/lib/info.java/cnf/releaserepoCI/.gitignore b/lib/info.java/cnf/releaserepoCI/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/lib/info.java/cnf/scripts/mavenpages b/lib/info.java/cnf/scripts/mavenpages
new file mode 100755 (executable)
index 0000000..774cc5e
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+script="$0"
+scriptdir="$(dirname "$script")"
+pushd "$scriptdir" &> /dev/null
+scriptdir="$(pwd)"
+popd &> /dev/null
+repoconfigdir="$(dirname "$scriptdir")/ext"
+mavencentralconfigs=( $(ls -1 "$repoconfigdir/"*.mvn|sort) )
+mavensearchurl="http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22___GROUPID___%22%20AND%20a%3A%22___ARTIFACTID___%22"
+
+
+ifsold="$IFS"
+
+ffmode="-new-window"
+ffsleep=5
+for mavencentralconfig in "${mavencentralconfigs[@]}"; do
+  echo ""
+  echo "#"
+  echo "# $mavencentralconfig"
+  echo "#"
+  firefox $ffmode "$mavencentralconfig"
+  ffmode="-new-tab"
+  sleep $ffsleep
+  ffsleep=0.5
+
+  IFS=$'\n'
+  lines=( $(grep -Ev '^[[:space:]]*(#.*)?$' "$mavencentralconfig") )
+  IFS=':'
+  for line in "${lines[@]}"; do
+    echo "$line"
+    linefields=( $line )
+    url="${mavensearchurl/___GROUPID___/${linefields[0]}}"
+    url="${url/___ARTIFACTID___/${linefields[1]}}"
+    firefox $ffmode "$url"
+  done
+done
+
+IFS="$ifsold"
index 633ab8b..b8db96e 100644 (file)
@@ -406,3 +406,4 @@ org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
+
index 57b506e..4eee172 100644 (file)
@@ -127,3 +127,4 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false
 sp_cleanup.use_this_for_non_static_method_access=true
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false
 sp_cleanup.use_type_arguments=false
+
index 3284a84..6fd26c3 100644 (file)
@@ -1,5 +1,5 @@
 # bnd_jar can also be a URL.
-bnd_jar=cnf/gradle/dependencies/biz.aQute.bnd.gradle.jar
+bnd_jar=cnf/gradle/dependencies/biz.aQute.bnd.gradle/biz.aQute.bnd.gradle-3.3.0.jar
 
 # Default gradle tasks to build for the root project (comma-separated)
 root_defaultTask=build
@@ -8,7 +8,8 @@ root_defaultTask=build
 bnd_defaultTask=build
 
 # Default gradle tasks to build for other projects (comma-separated)
-others_defaultTask=
+others_defaultTask=build
 
 # This should be false. It only needs to be true in rare cases.
 bnd_preCompileRefresh=false
+
index fa09f9d..04c3644 100644 (file)
@@ -23,3 +23,4 @@ if (cnfs.size() > 1) {
 }
 
 apply from: new File(rootDir, "${bnd_cnf}/gradle/template/init.gradle")
+