You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2015/09/24 23:26:26 UTC
svn commit: r1705158 - in /felix/trunk/dependencymanager: ./
cnf/buildrepo/biz.aQute.junit/ cnf/buildrepo/biz.aQute.launcher/ cnf/ext/
cnf/gradle/ cnf/plugins/biz.aQute.repository/
org.apache.felix.dependencymanager.benchmark/ org.apache.felix.dependen...
Author: pderop
Date: Thu Sep 24 21:26:25 2015
New Revision: 1705158
URL: http://svn.apache.org/viewvc?rev=1705158&view=rev
Log:
FELIX-5055: Upgrade DM to BndTools 3.0.0
Removed:
felix/trunk/dependencymanager/cnf/gradle/
Modified:
felix/trunk/dependencymanager/build.gradle
felix/trunk/dependencymanager/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
felix/trunk/dependencymanager/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
felix/trunk/dependencymanager/cnf/ext/junit.bnd
felix/trunk/dependencymanager/cnf/ext/pluginpaths.bnd
felix/trunk/dependencymanager/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
felix/trunk/dependencymanager/gradle.properties
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
felix/trunk/dependencymanager/settings.gradle
Modified: felix/trunk/dependencymanager/build.gradle
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/build.gradle?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/build.gradle (original)
+++ felix/trunk/dependencymanager/build.gradle Thu Sep 24 21:26:25 2015
@@ -20,16 +20,30 @@
/*
* Master Gradle build script
*
- * Depends on bndWorkspace and bndURI properties set by settings.gradle.
+ * Depends on bndPlugin property set by settings.gradle.
+ * and bnd_* values from gradle.properties.
*/
-/* Add bnd as a script dependency */
+import aQute.bnd.build.Workspace
+import aQute.bnd.osgi.Constants
+
+/* Add bnd gradle plugin as a script dependency */
buildscript {
dependencies {
- classpath files(bndURI)
+ classpath bndPlugin
}
}
+/* Initialize the bnd workspace */
+Workspace.setDriver(Constants.BNDDRIVER_GRADLE)
+Workspace.addGestalt(Constants.GESTALT_BATCH, null)
+ext.bndWorkspace = new Workspace(rootDir, bnd_cnf)
+if (bndWorkspace == null) {
+ throw new GradleException("Unable to load workspace ${rootDir}/${bnd_cnf}")
+}
+
+ext.cnf = rootProject.project(bnd_cnf)
+
/* Configure the subprojects */
subprojects {
def bndProject = bndWorkspace.getProject(name)
@@ -37,4 +51,3 @@ subprojects {
plugins.apply 'biz.aQute.bnd'
}
}
-
Modified: felix/trunk/dependencymanager/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-latest.jar?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-latest.jar?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/ext/junit.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/ext/junit.bnd?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/ext/junit.bnd (original)
+++ felix/trunk/dependencymanager/cnf/ext/junit.bnd Thu Sep 24 21:26:25 2015
@@ -17,3 +17,5 @@
junit:\
junit;version=latest,\
hamcrest-core;version=latest
+
+test-reports: test-results
Modified: felix/trunk/dependencymanager/cnf/ext/pluginpaths.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/ext/pluginpaths.bnd?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/ext/pluginpaths.bnd (original)
+++ felix/trunk/dependencymanager/cnf/ext/pluginpaths.bnd Thu Sep 24 21:26:25 2015
@@ -13,6 +13,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
--pluginpath:\
- ${plugin-dir}/biz.aQute.repository/biz.aQute.repository.jar
\ No newline at end of file
+#
\ No newline at end of file
Modified: felix/trunk/dependencymanager/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/gradle.properties
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/gradle.properties?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/gradle.properties (original)
+++ felix/trunk/dependencymanager/gradle.properties Thu Sep 24 21:26:25 2015
@@ -33,8 +33,8 @@
# cnf project name
bnd_cnf=cnf
-# bnd_jar can also be a URL.
-bnd_jar=cnf/gradle/biz.aQute.bnd.gradle.jar
+# bnd_plugin is the dependency declaration for the bnd gradle plugin
+bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.0.0
# bnd_build can be set to the name of a "master" project whose dependencies will seed the set of projects to build.
bnd_build=
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun Thu Sep 24 21:26:25 2015
@@ -23,18 +23,18 @@
org.apache.felix.gogo.shell;version=0.10.0,\
org.apache.felix.gogo.runtime;version=0.10.0,\
org.apache.felix.configadmin;version=1.8.0,\
- org.apache.felix.dependencymanager.benchmark.scenario,\
- org.apache.felix.dependencymanager.benchmark.dependencymanager,\
- org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel,\
- org.apache.felix.dependencymanager.benchmark.controller
+ org.apache.felix.dependencymanager.benchmark.scenario;version=latest,\
+ org.apache.felix.dependencymanager.benchmark.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel;version=latest,\
+ org.apache.felix.dependencymanager.benchmark.controller;version=latest
--runfw: org.apache.felix.framework;version='[4.4.0,4.4.0]'
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runproperties: \
ds.loglevel=warn,\
org.osgi.framework.bootdelegation='sun.*,com.sun.*,org.netbeans.*',\
org.apache.felix.dependencymanager.filterindex='objectClass,id'
-runvm: -server -Xmx1024m -Xms1024m
--runee: JavaSE-1.8
+-runee: JavaSE/compact1-1.9
javac.source: 1.8
javac.target: 1.8
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun Thu Sep 24 21:26:25 2015
@@ -23,12 +23,12 @@
org.apache.felix.gogo.shell;version=0.10.0,\
org.apache.felix.gogo.runtime;version=0.10.0,\
org.apache.felix.configadmin;version=1.8.0,\
- org.apache.felix.dependencymanager.benchmark.scenario,\
- org.apache.felix.dependencymanager.benchmark.dependencymanager,\
- org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel,\
- org.apache.felix.dependencymanager.benchmark.controller
+ org.apache.felix.dependencymanager.benchmark.scenario;version=latest,\
+ org.apache.felix.dependencymanager.benchmark.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel;version=latest,\
+ org.apache.felix.dependencymanager.benchmark.controller;version=latest
--runfw: org.apache.felix.framework;version='[4.4.0,4.4.0]'
+-runfw: org.apache.felix.framework;version='[5.2.0,5.2.0]'
-runproperties: \
ds.loglevel=warn,\
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd Thu Sep 24 21:26:25 2015
@@ -14,13 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
--runbundles: \
+-runbundles: \
org.apache.felix.metatype;version=1.0.4,\
org.apache.felix.gogo.runtime;version=0.10.0,\
org.apache.felix.log;version=1.0.1,\
org.apache.felix.configadmin;version=1.8.6,\
org.apache.felix.dependencymanager;version=latest,\
- org.apache.felix.dependencymanager.shell;version=latest
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ biz.aQute.junit;version=3.0.0
-runee: JavaSE-1.7
-runvm: -ea
-runfw: org.apache.felix.framework
Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd (original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd Thu Sep 24 21:26:25 2015
@@ -29,7 +29,8 @@
org.apache.felix.log;version=1.0.1,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
- org.apache.felix.dependencymanager.shell;version=latest
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ biz.aQute.junit;version=3.0.0
-runee: JavaSE-1.7
-runfw: org.apache.felix.framework;version='[4.4.0,4.4.0]'
-runsystempackages: \
Modified: felix/trunk/dependencymanager/settings.gradle
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/settings.gradle?rev=1705158&r1=1705157&r2=1705158&view=diff
==============================================================================
--- felix/trunk/dependencymanager/settings.gradle (original)
+++ felix/trunk/dependencymanager/settings.gradle Thu Sep 24 21:26:25 2015
@@ -24,37 +24,27 @@
*/
import aQute.bnd.build.Workspace
+import aQute.bnd.osgi.Constants
-/* Add bnd as a script dependency */
+/* Add bnd gradle plugin as a script dependency */
buildscript {
+ repositories {
+ jcenter()
+ }
dependencies {
- def bndURI = rootDir.toURI().resolve(bnd_jar)
- if (bndURI.scheme != 'file') {
- /* If not a local file, copy to a local file in cnf/cache */
- def cnfCache = mkdir("${rootDir}/${bnd_cnf}/cache")
- def bndJarFile = new File(cnfCache, 'biz.aQute.bnd.gradle.jar')
- if (!bndJarFile.exists()) {
- println "Downloading ${bndURI} to ${bndJarFile} ..."
- bndURI.toURL().withInputStream { is ->
- bndJarFile.withOutputStream { os ->
- def bos = new BufferedOutputStream( os )
- bos << is
- }
- }
- }
- bndURI = bndJarFile.toURI()
- }
- classpath files(bndURI)
-
- /* After the rootProject is created, pass URI to projects */
- gradle.rootProject { rootProject ->
- rootProject.ext.bndURI = bndURI
- }
+ classpath bnd_plugin
+ }
+ /* Pass bnd gradle plugin classpath to rootProject once created */
+ def bndPlugin = files(configurations.classpath.files)
+ gradle.rootProject { rootProject ->
+ rootProject.ext.bndPlugin = bndPlugin
}
}
/* Initialize the bnd workspace */
-def workspace = Workspace.getWorkspace(rootDir, bnd_cnf)
+Workspace.setDriver(Constants.BNDDRIVER_GRADLE)
+Workspace.addGestalt(Constants.GESTALT_BATCH, null)
+def workspace = new Workspace(rootDir, bnd_cnf)
if (workspace == null) {
throw new GradleException("Unable to load workspace ${rootDir}/${bnd_cnf}")
}
@@ -104,8 +94,8 @@ projectNames.each { projectName ->
if (! projectName.equals("org.apache.felix.dependencymanager.benchmark")) {
include projectName
def project = getBndProject(workspace, projectName)
- project?.dependson.each {
- include it.name
+ project?.getDependson()*.getName().each {
+ include it
}
}
}
@@ -123,10 +113,10 @@ def getBndProject(Workspace workspace, S
project.getInfo(workspace, "${rootDir} :")
def errorCount = 0
- project.warnings.each {
+ project.getWarnings().each {
println "Warning: ${it}"
}
- project.errors.each {
+ project.getErrors().each {
println "Error : ${it}"
errorCount++
}
@@ -141,9 +131,3 @@ def getBndProject(Workspace workspace, S
}
throw new GradleException("Project ${rootDir}/${projectName} is not a valid bnd project")
}
-
-/* After the rootProject is created, set up some properties. */
-gradle.rootProject { rootProject ->
- rootProject.ext.bndWorkspace = workspace
- rootProject.ext.cnf = rootProject.project(bnd_cnf)
-}