tidy up junit dependencies
- use package imports vs ivy module dependencies
- setup defaut package versions
set junit bundle activator
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@906458 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bldcommon/ivysettings.xml b/sigil/bldcommon/ivysettings.xml
index 760115c..7704355 100644
--- a/sigil/bldcommon/ivysettings.xml
+++ b/sigil/bldcommon/ivysettings.xml
@@ -91,7 +91,6 @@
<module organisation="org.eclipse2" resolver="eclipse2"/>
<module organisation="org.apache" name="felix\.sigil.*" matcher="regexp" resolver="default"/>
<module organisation="org.apache" resolver="apache"/>
- <module organisation="org.apache.ant" resolver="apache"/>
<module organisation="biz.aQute" resolver="aQute"/>
<module organisation="org.codehaus.groovy" resolver="apache" />
</modules>
diff --git a/sigil/gogo/junit/.classpath b/sigil/gogo/junit/.classpath
index 0b3e710..c9ffd60 100644
--- a/sigil/gogo/junit/.classpath
+++ b/sigil/gogo/junit/.classpath
@@ -3,6 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.apache.felix.sigil.classpathContainer"/>
- <classpathentry kind="lib" path="lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/sigil/gogo/junit/build.xml b/sigil/gogo/junit/build.xml
index 1abba77..974b0f3 100644
--- a/sigil/gogo/junit/build.xml
+++ b/sigil/gogo/junit/build.xml
@@ -20,7 +20,4 @@
<project name="gogo.junit" default="build"
xmlns:ivy="antlib:org.apache.ivy.ant">
<import file="../build.xml"/>
- <target name="init">
- <ivy:retrieve inline="true" organisation="org.apache.ant" module="ant-junit" revision="1.7.1" transitive="false" />
- </target>
</project>
diff --git a/sigil/gogo/junit/ivy.xml b/sigil/gogo/junit/ivy.xml
index 1dfa96b..e216d68 100644
--- a/sigil/gogo/junit/ivy.xml
+++ b/sigil/gogo/junit/ivy.xml
@@ -24,11 +24,5 @@
status="integration"/>
<publications>
<artifact name="org.apache.felix.sigil.gogo.junit" />
- </publications>
-
- <dependencies>
- <dependency org="org.apache" name="ant" rev="1.7.1">
- <artifact name="ant-junit" type="jar" />
- </dependency>
- </dependencies>
+ </publications>
</ivy-module>
diff --git a/sigil/gogo/junit/sigil.properties b/sigil/gogo/junit/sigil.properties
index b569438..6f30c0a 100644
--- a/sigil/gogo/junit/sigil.properties
+++ b/sigil/gogo/junit/sigil.properties
@@ -1,7 +1,7 @@
# sigil project file, saved by plugin.
-version: 0.0.0
+-activator: org.apache.felix.sigil.gogo.junit.Activator
-bundles: \
org.apache.felix.sigil.gogo.junit, \
@@ -10,12 +10,13 @@
src, \
-imports: \
- junit.framework;version=4.4.0, \
- org.apache.commons.cli;version=1.2.0, \
- org.apache.felix.sigil.junit.server;version=0.9.0, \
- org.apache.tools.ant;version=1.7.0, \
- org.osgi.framework;version=1.5.0, \
- org.osgi.service.command;version=0.2.0, \
- org.osgi.util.tracker;version=1.3.2, \
+ junit.framework, \
+ org.apache.commons.cli, \
+ org.apache.felix.sigil.junit.server, \
+ org.apache.tools.ant, \
+ org.apache.tools.ant.taskdefs.optional.junit, \
+ org.osgi.framework, \
+ org.osgi.service.command, \
+ org.osgi.util.tracker, \
# end
diff --git a/sigil/sigil-defaults.properties b/sigil/sigil-defaults.properties
index 883c158..ce655b3 100644
--- a/sigil/sigil-defaults.properties
+++ b/sigil/sigil-defaults.properties
@@ -22,6 +22,10 @@
# apache commons
package;org.apache.commons.lang: 2.4.0
package;org.apache.commons.lang.text: 2.4.0
+package;org.apache.commons.cli: 1.2.0
+
+# apache ant
+package;org.apache.tools.ant: 1.7.0
package;org.apache.ivy*: [2.0.0,2.0.0]
package;org.apache.tools.ant*: 1.7.1
@@ -105,4 +109,8 @@
package;org.osgi.framework: 1.4.0
package;org.osgi.framework.launch: 1.0.0
package;org.osgi.service.prefs: 1.1.0
+package;org.osgi.service.packageadmin 1.2.0
package;org.osgi.util.tracker: 1.3.3
+
+# Gogo
+package;org.osgi.service.command: 0.2.0