Author: pderop
Date: Sat Mar 26 19:24:32 2016
New Revision: 1736704
URL: http://svn.apache.org/viewvc?rev=1736704&view=rev
Log:
FELIX-5228: Upgrade DM With latest release of BndTools.
Added:
felix/trunk/dependencymanager/cnf/ext/libraries.bnd
felix/trunk/dependencymanager/cnf/nonosgi-repo/
felix/trunk/dependencymanager/cnf/nonosgi-repo/README.txt
felix/trunk/dependencymanager/cnf/nonosgi-repo/hamcrest-core/
felix/trunk/dependencymanager/cnf/nonosgi-repo/hamcrest-core/hamcrest-core-1.3.0.jar
(with props)
felix/trunk/dependencymanager/cnf/nonosgi-repo/junit/
felix/trunk/dependencymanager/cnf/nonosgi-repo/junit/junit-4.11.0.jar
(with props)
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.1.0.jar
(with props)
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.lambda/
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.lambda/org.apache.felix.dependencymanager.lambda-1.0.0.jar
(with props)
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.3.jar
(with props)
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.4.jar
(with props)
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.3.0.jar
(with props)
Removed:
felix/trunk/dependencymanager/cnf/buildrepo/hamcrest-core/
felix/trunk/dependencymanager/cnf/buildrepo/junit/
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.configadmin/
felix/trunk/dependencymanager/cnf/localrepo/org.apache.felix.eventadmin/
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.3.jar
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.2.jar
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.3.jar
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.2.0.jar
Modified:
felix/trunk/dependencymanager/cnf/build.bnd
felix/trunk/dependencymanager/cnf/ext/repositories.bnd
felix/trunk/dependencymanager/cnf/localrepo/index.xml
felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha
felix/trunk/dependencymanager/cnf/plugins/biz.aQute.repository/biz.aQute.repository.jar
felix/trunk/dependencymanager/cnf/releaserepo/index.xml
felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha
felix/trunk/dependencymanager/gradle.properties
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
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.lambda.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
felix/trunk/dependencymanager/release/bnd.bnd
felix/trunk/dependencymanager/settings.gradle
Modified: felix/trunk/dependencymanager/cnf/build.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/build.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/build.bnd (original)
+++ felix/trunk/dependencymanager/cnf/build.bnd Sat Mar 26 19:24:32 2016
@@ -67,7 +67,7 @@ javac.target: 1.8
## To enable baselining, uncomment the following lines:
-#-baseline: *
+-baseline: *
## If you use git, you might want to uncomment the following lines:
# Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
Added: felix/trunk/dependencymanager/cnf/ext/libraries.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/ext/libraries.bnd?rev=1736704&view=auto
==============================================================================
--- felix/trunk/dependencymanager/cnf/ext/libraries.bnd (added)
+++ felix/trunk/dependencymanager/cnf/ext/libraries.bnd Sat Mar 26 19:24:32 2016
@@ -0,0 +1,54 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+##
+# metatype service
+metatype=org.apache.felix.metatype;version=1.0.4
+
+##
+# log service
+log=org.apache.felix.log;version=1.0.1
+
+##
+# Gogo bundles
+gogo=\
+ org.apache.felix.gogo.command;version=0.14.0,\
+ org.apache.felix.gogo.runtime;version=0.12.0,\
+ org.apache.felix.gogo.shell;version=0.10.0
+
+##
+# Configuration Admin
+configadmin=org.apache.felix.configadmin;version=1.8.8
+
+##
+# Event Admin
+eventadmin=org.apache.felix.eventadmin;version=1.4.4
+
+##
+# Web Console
+webconsole=\
+ org.apache.felix.http.api;version=2.3.0,\
+ org.apache.felix.http.servlet-api;version=1.0.0,\
+ org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
+ org.apache.felix.webconsole;version=4.2.2
+
+##
+# bndlib
+bndlib=biz.aQute.bndlib;version=3.0.0
+
+
+
Modified: felix/trunk/dependencymanager/cnf/ext/repositories.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/ext/repositories.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/ext/repositories.bnd (original)
+++ felix/trunk/dependencymanager/cnf/ext/repositories.bnd Sat Mar 26 19:24:32
2016
@@ -14,10 +14,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
--plugin:\
- aQute.bnd.deployer.repository.LocalIndexedRepo; name=Release;
local=${workspace}/cnf/releaserepo;pretty=true,\
- aQute.bnd.deployer.repository.LocalIndexedRepo; name=Local;
local=${workspace}/cnf/localrepo;pretty=true,\
- aQute.bnd.deployer.repository.FixedIndexedRepo; name=Bndtools Hub;
locations=https://raw.githubusercontent.com/bndtools/bundle-hub/master/index.xml.gz,\
- aQute.lib.deployer.FileRepo; name=Build;
location=${workspace}/cnf/buildrepo;latest=false
+-plugin: \
+ aQute.bnd.deployer.repository.LocalIndexedRepo;\
+ name=Release; \
+ local=${workspace}/cnf/releaserepo; \
+ pretty=true; \
+ , \
+ aQute.bnd.deployer.repository.LocalIndexedRepo; \
+ name=Local; \
+ local=${workspace}/cnf/localrepo; \
+ pretty=true; \
+ , \
+ aQute.bnd.deployer.repository.FixedIndexedRepo; \
+ name=Bndtools Hub; \
+
locations=https://raw.githubusercontent.com/bndtools/bundle-hub/master/index.xml.gz;
\
+ , \
+ aQute.lib.deployer.FileRepo; \
+ name=Non OSGi; \
+ location=${workspace}/cnf/nonosgi-repo; \
+ latest=false;
-releaserepo: Release
Modified: felix/trunk/dependencymanager/cnf/localrepo/index.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/index.xml?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha (original)
+++ felix/trunk/dependencymanager/cnf/localrepo/index.xml.sha Sat Mar 26
19:24:32 2016
@@ -1 +1 @@
-b3c47a892ce160e2f4a53d85d8c2bf993cd469cc7859110e1970186eaaa253fc
\ No newline at end of file
+e6609c4263f8048f91643fb6bff9b13e87aef8514f01ad9518d6e59d8ad1b7a9
\ No newline at end of file
Added: felix/trunk/dependencymanager/cnf/nonosgi-repo/README.txt
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/nonosgi-repo/README.txt?rev=1736704&view=auto
==============================================================================
--- felix/trunk/dependencymanager/cnf/nonosgi-repo/README.txt (added)
+++ felix/trunk/dependencymanager/cnf/nonosgi-repo/README.txt Sat Mar 26
19:24:32 2016
@@ -0,0 +1,6 @@
+WARNING
+=======
+
+This directory contains JAR file dependencies that are intended ONLY FOR
BUILD-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.
Added:
felix/trunk/dependencymanager/cnf/nonosgi-repo/hamcrest-core/hamcrest-core-1.3.0.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/nonosgi-repo/hamcrest-core/hamcrest-core-1.3.0.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/nonosgi-repo/hamcrest-core/hamcrest-core-1.3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added: felix/trunk/dependencymanager/cnf/nonosgi-repo/junit/junit-4.11.0.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/nonosgi-repo/junit/junit-4.11.0.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/nonosgi-repo/junit/junit-4.11.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
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=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/releaserepo/index.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/index.xml?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
Binary files - no diff available.
Modified: felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha (original)
+++ felix/trunk/dependencymanager/cnf/releaserepo/index.xml.sha Sat Mar 26
19:24:32 2016
@@ -1 +1 @@
-877924d3a090ea7ed86bb01a4c571b3c33bba0209c86419d79fb42c6bc58f2a3
\ No newline at end of file
+6487494f043b4bc5f66e95a1fe88a48e7e984fbd214238fdf68f668be7bb049a
\ No newline at end of file
Added:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.1.0.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.1.0.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.lambda/org.apache.felix.dependencymanager.lambda-1.0.0.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.lambda/org.apache.felix.dependencymanager.lambda-1.0.0.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.lambda/org.apache.felix.dependencymanager.lambda-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.3.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.3.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.runtime/org.apache.felix.dependencymanager.runtime-4.0.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.4.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.4.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-4.0.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.3.0.jar
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.3.0.jar?rev=1736704&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/trunk/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Modified: felix/trunk/dependencymanager/gradle.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/gradle.properties?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/gradle.properties (original)
+++ felix/trunk/dependencymanager/gradle.properties Sat Mar 26 19:24:32 2016
@@ -34,7 +34,7 @@
bnd_cnf=cnf
# bnd_plugin is the dependency declaration for the bnd gradle plugin
-bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.0.0
+bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:3.1.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.annotation/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 4.1.0
+Bundle-Version: 4.1.1
-buildpath: \
osgi.core;version=4.2,\
de.twentyeleven.skysail.org.json-osgi;version=20080701.0,\
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=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun
Sat Mar 26 19:24:32 2016
@@ -22,7 +22,7 @@
org.apache.felix.gogo.command;version=0.12.0,\
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.configadmin;version=1.8.8,\
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,\
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=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun
Sat Mar 26 19:24:32 2016
@@ -22,7 +22,7 @@
org.apache.felix.gogo.command;version=0.12.0,\
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.configadmin;version=1.8.8,\
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,\
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=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -18,7 +18,7 @@
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.configadmin;version=1.8.8,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
biz.aQute.junit;version=3.0.0
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -28,7 +28,7 @@
org.apache.felix.log;version=1.0.1,\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
- org.apache.felix.configadmin;version=1.8.4,\
+ org.apache.felix.configadmin;version=1.8.8,\
org.apache.felix.dependencymanager.lambda;version=latest,\
biz.aQute.junit;version=1.3.0,\
org.apache.felix.gogo.shell;version=0.10.0,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,12 +21,10 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell,\
- org.apache.felix.gogo.command,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.configadmin;version=1.8.8,\
- org.apache.felix.metatype;version=1.1.2,\
+ ${gogo},\
+ ${log},\
+ ${configadmin},\
+ ${metatype},\
org.apache.felix.dependencymanager.lambda.samples.compositefactory;version=latest,\
org.apache.felix.dependencymanager;version=4.2.0,\
org.apache.felix.dependencymanager.shell;version=4.0.3,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,12 +21,10 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell,\
- org.apache.felix.gogo.command,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.configadmin;version=1.8.8,\
- org.apache.felix.metatype;version=1.1.2,\
+ ${gogo},\
+ ${log},\
+ ${configadmin},\
+ ${metatype},\
org.apache.felix.dependencymanager.lambda.samples.device;version=latest,\
org.apache.felix.dependencymanager;version=4.2.0,\
org.apache.felix.dependencymanager.shell;version=4.0.3,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,22 +21,17 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell,\
- org.apache.felix.gogo.command,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.configadmin;version=1.8.8,\
- org.apache.felix.metatype;version=1.1.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
+ ${webconsole},\
+ ${bndlib},\
org.apache.felix.dependencymanager.lambda.samples.dictionary;version=latest,\
- org.apache.felix.dependencymanager;version=4.2.0,\
- org.apache.felix.dependencymanager.shell;version=4.0.3,\
- org.apache.felix.dependencymanager.lambda;version=latest,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
- org.apache.felix.webconsole;version=4.2.2,\
- org.apache.felix.http.api;version=2.3.0,\
- org.apache.felix.http.servlet-api;version=1.0.0,\
- org.apache.felix.http.jetty;version='[2.3.0,2.3.0]'
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.lambda;version=latest
-runproperties: \
org.apache.felix.dependencymanager.loglevel=2,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,12 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell,\
- org.apache.felix.gogo.command,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.configadmin;version=1.8.8,\
- org.apache.felix.metatype;version=1.1.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager.lambda.samples.factory;version=latest,\
org.apache.felix.dependencymanager;version=4.2.0,\
org.apache.felix.dependencymanager.shell;version=4.0.3,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,15 +21,14 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell,\
- org.apache.felix.gogo.command,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.configadmin;version=1.8.8,\
- org.apache.felix.metatype;version=1.1.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${eventadmin},\
+ ${configadmin},\
org.apache.felix.dependencymanager.lambda.samples.future;version=latest,\
- org.apache.felix.dependencymanager;version=4.2.0,\
- org.apache.felix.dependencymanager.shell;version=4.0.3,\
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.lambda;version=latest
-runproperties: \
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,17 +21,15 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.gogo.runtime,\
- org.apache.felix.gogo.shell,\
- org.apache.felix.gogo.command,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.configadmin;version=1.8.8,\
- org.apache.felix.metatype;version=1.1.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${eventadmin},\
+ ${configadmin},\
org.apache.felix.dependencymanager.lambda.samples.hello;version=latest,\
- org.apache.felix.dependencymanager;version=4.2.0,\
- org.apache.felix.dependencymanager.shell;version=4.0.3,\
- org.apache.felix.dependencymanager.lambda;version=latest,\
- org.apache.felix.eventadmin;version=1.4.4
+ org.apache.felix.dependencymanager;version=latest,\
+ org.apache.felix.dependencymanager.shell;version=latest,\
+ org.apache.felix.dependencymanager.lambda;version=latest
-runproperties: \
org.apache.felix.dependencymanager.loglevel=2,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -16,7 +16,7 @@
#
javac.source: 1.8
javac.target: 1.8
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
-buildpath: \
org.apache.felix.dependencymanager;version=latest,\
osgi.core;version=6.0,\
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=1736704&r1=1736703&r2=1736704&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
Sat Mar 26 19:24:32 2016
@@ -23,7 +23,7 @@
org.apache.felix.dependencymanager.runtime;version=latest,\
org.apache.felix.dependencymanager.itest.api;version=latest
-runbundles: \
- org.apache.felix.configadmin;version=1.8.1.SNAPSHOT,\
+ org.apache.felix.configadmin;version=1.8.8,\
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,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 4.0.3
+Bundle-Version: 4.0.4
-buildpath: \
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,18 +21,13 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
- org.apache.felix.http.api;version=2.3.0,\
- org.apache.felix.http.servlet-api;version=1.0.0,\
- org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
- org.apache.felix.webconsole;version=4.2.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
+ ${webconsole},\
+ ${bndlib},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,18 +21,13 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
- org.apache.felix.http.api;version=2.3.0,\
- org.apache.felix.http.servlet-api;version=1.0.0,\
- org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
- org.apache.felix.webconsole;version=4.2.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
+ ${webconsole},\
+ ${bndlib},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,22 +21,17 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
- org.apache.felix.http.api;version=2.3.0,\
- org.apache.felix.http.servlet-api;version=1.0.0,\
- org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
- org.apache.felix.webconsole;version=4.2.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
+ ${webconsole},\
+ ${bndlib},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
-
org.apache.felix.dependencymanager.samples.dynamicdep.annot;version=latest
+ org.apache.felix.dependencymanager.samples.dynamicdep.annot;version=latest
-runproperties: \
org.apache.felix.dependencymanager.runtime.log=false,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,18 +21,13 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
- org.apache.felix.http.api;version=2.3.0,\
- org.apache.felix.http.servlet-api;version=1.0.0,\
- org.apache.felix.http.jetty;version="[2.3.0,2.3.0]",\
- org.apache.felix.webconsole;version=4.2.2,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
+ ${webconsole},\
+ ${bndlib},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun
Sat Mar 26 19:24:32 2016
@@ -21,14 +21,11 @@
-resolve.effective: active;skip:="osgi.service"
-runbundles: \
- org.apache.felix.metatype;version=1.0.4,\
- org.apache.felix.log;version=1.0.1,\
- org.apache.felix.gogo.command;version=0.14.0,\
- org.apache.felix.gogo.runtime;version=0.12.0,\
- org.apache.felix.gogo.shell;version=0.10.0,\
- org.apache.felix.configadmin;version=1.8.6,\
- org.apache.felix.eventadmin;version=1.4.3,\
- biz.aQute.bndlib;version=2.3.0,\
+ ${metatype},\
+ ${log},\
+ ${gogo},\
+ ${configadmin},\
+ ${eventadmin},\
org.apache.felix.dependencymanager;version=latest,\
org.apache.felix.dependencymanager.shell;version=latest,\
org.apache.felix.dependencymanager.runtime;version=latest,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -24,7 +24,7 @@
Private-Package: \
org.apache.felix.dm.shell
Bundle-Activator:org.apache.felix.dm.shell.Activator
-Bundle-Version: 4.0.4
+Bundle-Version: 4.0.5
Include-Resource: META-INF/=resources/LICENSE,\
META-INF/=resources/NOTICE,\
META-INF/=resources/DEPENDENCIES,\
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
(original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
Sat Mar 26 19:24:32 2016
@@ -36,7 +36,7 @@ Include-Resource: META-INF/=resources/LI
META-INF/=${workspace}/release/resources/changelog.txt
Import-Package: !org.junit,!org.mockito.*,*
Bundle-Activator: org.apache.felix.dm.impl.Activator
-Bundle-Version: 4.3.0
+Bundle-Version: 4.3.1
Bundle-Name: Apache Felix Dependency Manager
Bundle-Description: Provides dynamic service and component dependency
management
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Modified: felix/trunk/dependencymanager/release/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/release/bnd.bnd?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/release/bnd.bnd (original)
+++ felix/trunk/dependencymanager/release/bnd.bnd Sat Mar 26 19:24:32 2016
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
--nobundles
+-nobundles:
-dependson \
org.apache.felix.dependencymanager,\
org.apache.felix.dependencymanager.shell,\
Modified: felix/trunk/dependencymanager/settings.gradle
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/settings.gradle?rev=1736704&r1=1736703&r2=1736704&view=diff
==============================================================================
--- felix/trunk/dependencymanager/settings.gradle (original)
+++ felix/trunk/dependencymanager/settings.gradle Sat Mar 26 19:24:32 2016
@@ -90,13 +90,10 @@ if (projectNames.remove('')) {
/* Add each project and its dependencies to the graph */
projectNames.each { projectName ->
- // Don't build the org.apache.felix.dependencymanager.benchmark, which
requires java8 (build the benchmark bundle only makes sense within eclipse
- if (! projectName.equals("org.apache.felix.dependencymanager.benchmark")) {
- include projectName
- def project = getBndProject(workspace, projectName)
- project?.getDependson()*.getName().each {
- include it
- }
+ include projectName
+ def project = getBndProject(workspace, projectName)
+ project?.getDependson()*.getName().each {
+ include it
}
}
