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 2014/09/24 14:23:38 UTC

svn commit: r1627293 - in /felix/sandbox/pderop/dependencymanager-prototype: org.apache.felix.dependencymanager.itest/ org.apache.felix.dependencymanager.runtime.itest/ org.apache.felix.dependencymanager.shell/ org.apache.felix.dependencymanager/

Author: pderop
Date: Wed Sep 24 12:23:37 2014
New Revision: 1627293

URL: http://svn.apache.org/r1627293
Log:
Use biz.aQute.junit instead of junit.osgi

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.classpath
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.classpath   (contents, props changed)
    felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1627293&r1=1627292&r2=1627293&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.itest/bnd.bnd Wed Sep 24 12:23:37 2014
@@ -1,7 +1,6 @@
 -runbundles:  \
 	org.apache.felix.metatype;version=1.0.4,\
 	org.mockito.mockito-all;version=1.9.0,\
-	junit.osgi,\
 	org.apache.felix.gogo.runtime;version=0.10.0,\
 	org.apache.felix.dependencymanager;version=latest,\
 	org.apache.felix.dependencymanager.shell;version=latest,\
@@ -13,11 +12,11 @@
 -buildpath:  \
 	osgi.core;version='[4.2,5)',\
 	org.mockito.mockito-all,\
-	junit.osgi;version=3.8,\
 	org.apache.felix.gogo.runtime;version=0.10,\
 	org.apache.felix.dependencymanager;version=latest,\
 	org.apache.felix.dependencymanager.shell;version=latest,\
-	osgi.cmpn;version=4.2
+	osgi.cmpn;version=4.2,\
+	biz.aQute.junit;version=999999999.0
 -runsystempackages: \
 	sun.reflect
 -sub: \

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd?rev=1627293&r1=1627292&r2=1627293&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd Wed Sep 24 12:23:37 2014
@@ -1,10 +1,10 @@
 -buildpath:  \
 	osgi.core;version='[4.2,5)',\
-	junit.osgi;version=3.8,\
 	org.apache.felix.dependencymanager;version=latest,\
 	org.apache.felix.dependencymanager.itest.api;version=latest,\
 	org.apache.felix.dependencymanager.annotation;version=latest,\
-	osgi.cmpn;version=4.2
+	osgi.cmpn;version=4.2,\
+	biz.aQute.junit;version=999999999.0
 -runbundles:  \
 	org.apache.felix.configadmin;version=1.8.0,\
 	org.apache.felix.dependencymanager;version=latest,\
@@ -14,7 +14,6 @@
 	org.apache.felix.dependencymanager.runtime;version=latest,\
 	org.apache.felix.metatype;version=1.0.4,\
 	org.apache.felix.gogo.runtime;version=0.10.0,\
-	junit.osgi;version=3.8.2,\
 	org.apache.felix.log;version=1.0.1
 -runee: JavaSE-1.7
 -runfw: org.apache.felix.framework;version='[4.4.0,4.4.0]'

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/.classpath?rev=1627293&r1=1627292&r2=1627293&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd?rev=1627293&r1=1627292&r2=1627293&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.shell/bnd.bnd Wed Sep 24 12:23:37 2014
@@ -3,7 +3,8 @@
 	org.apache.felix.gogo.runtime;version=0.10,\
 	org.mockito.mockito-all,\
 	osgi.cmpn,\
-	org.apache.felix.dependencymanager;version=latest
+	org.apache.felix.dependencymanager;version=latest,\
+	biz.aQute.junit;version=999999999.0
 Private-Package: \
 	org.apache.felix.dm.shell
 Bundle-Activator:org.apache.felix.dm.shell.Activator

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.classpath?rev=1627293&r1=1627292&r2=1627293&view=diff
==============================================================================
Binary files - no diff available.

Propchange: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/.classpath
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Wed Sep 24 12:23:37 2014
@@ -1 +1 @@
-application/xml
+text/plain

Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd?rev=1627293&r1=1627292&r2=1627293&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/bnd.bnd Wed Sep 24 12:23:37 2014
@@ -1,7 +1,8 @@
 -buildpath:  \
 	osgi.core;version=4.2,\
 	osgi.cmpn;version=4.2,\
-	org.mockito.mockito-all;version=1.9
+	org.mockito.mockito-all;version=1.9,\
+	biz.aQute.junit;version=999999999.0
 Private-Package: \
 	org.apache.felix.dm.impl,\
 	org.apache.felix.dm.impl.index,\