build: Fix -buildpath

Dependencies MUST not be in .classpath. They must be in bnd.bnd. Signed-off-by: BJ Hargrave <[email protected]>
osgi · May 9, 2016 · f9b4fc9 · f9b4fc9
1 parent dd41c61
commit f9b4fc9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/org.osgi.security.sysatt110.test/.classpath b/org.osgi.security.sysatt110.test/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="src" path="/org.osgi.security.util.api"/>
 	<classpathentry kind="output" path="test_bin"/>
 </classpath>
diff --git a/org.osgi.security.sysatt110.test/bnd.bnd b/org.osgi.security.sysatt110.test/bnd.bnd
@@ -13,6 +13,7 @@ Test-Cases: org.osgi.security.sysatt110.test.Activator
 -buildpath: \
 	osgi.enroute.base.api;version=1.0,\
 	osgi.enroute.junit.wrapper;version=4.12,\
+	org.osgi.security.util.api;version=project
 
 -runbundles: \
 	org.apache.felix.configadmin;version='[1.8.6,1.8.7)',\
@@ -41,4 +42,4 @@ Private-Package: org.osgi.security.sysatt110.test
 
 -dsannotations: *
 
-Bundle-Name: SYS-ATT-110: Log files hijacking
+Bundle-Name: SYS-ATT-110: Log files hijacking
diff --git a/org.osgi.security.sysatt175.bundle1.test/.classpath b/org.osgi.security.sysatt175.bundle1.test/.classpath
@@ -3,7 +3,5 @@
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="src" path="/org.osgi.security.sysatt175.common.api"/>
-	<classpathentry kind="src" path="/org.osgi.security.util.api"/>
 	<classpathentry kind="output" path="test_bin"/>
 </classpath>
diff --git a/org.osgi.security.sysatt175.bundle1.test/bnd.bnd b/org.osgi.security.sysatt175.bundle1.test/bnd.bnd
@@ -15,7 +15,9 @@ Test-Cases: org.osgi.security.sysatt175.bundle1.test.Activator
 
 -buildpath: \
 	osgi.enroute.base.api;version=1.0,\
-	osgi.enroute.junit.wrapper;version=4.12
+	osgi.enroute.junit.wrapper;version=4.12,\
+	org.osgi.security.sysatt175.common.api;version=project,\
+	org.osgi.security.util.api;version=project
 
 -runbundles: \
 	org.apache.felix.configadmin;version='[1.8.6,1.8.7)',\
@@ -45,4 +47,4 @@ Private-Package: org.osgi.security.sysatt175.bundle1.test
 
 -dsannotations: *
 
-Bundle-Name: SYS-ATT-175: Infinite loop: mutually dependant services
+Bundle-Name: SYS-ATT-175: Infinite loop: mutually dependant services
diff --git a/org.osgi.security.sysatt175.bundle2.test/.classpath b/org.osgi.security.sysatt175.bundle2.test/.classpath
@@ -3,7 +3,5 @@
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="src" path="/org.osgi.security.sysatt175.common.api"/>
-	<classpathentry kind="src" path="/org.osgi.security.util.api"/>
 	<classpathentry kind="output" path="test_bin"/>
 </classpath>
diff --git a/org.osgi.security.sysatt175.bundle2.test/bnd.bnd b/org.osgi.security.sysatt175.bundle2.test/bnd.bnd
@@ -14,7 +14,10 @@ Bundle-Description: Resource exhaustion by mutually dependant service subscripti
 
 -buildpath: \
 	osgi.enroute.base.api;version=1.0,\
-	osgi.enroute.junit.wrapper;version=4.12
+	osgi.enroute.junit.wrapper;version=4.12,\
+	org.osgi.security.sysatt175.common.api;version=project,\
+	org.osgi.security.util.api;version=project
+
 
 -runbundles: \
 	org.apache.felix.log;version='[1.0.1,1.0.2)',\