| commit | 2a180614dbfa0e129e32517168c092b275ce43ad | [log] [tgz] |
|---|---|---|
| author | Clement Escoffier <clement@apache.org> | Mon Oct 31 15:44:12 2011 +0000 |
| committer | Clement Escoffier <clement@apache.org> | Mon Oct 31 15:44:12 2011 +0000 |
| tree | 5f88360b369fc761a5caad6ced57e128598ba6e5 | |
| parent | b6ff4a703de9f3c24e82d6f5781fdb906e88ed66 [diff] |
* Use iPOJO 1.9.0-SNAPSHOT for testing * Avoid resolving iPOJO twice git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1195528 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml b/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml index 83cee67..f5c0852 100644 --- a/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml +++ b/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
@@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.ipojo</artifactId> - <version>1.8.0</version> + <version>1.9.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.felix</groupId>
diff --git a/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java b/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java index 449fba4..26765ba 100644 --- a/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java +++ b/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java
@@ -428,7 +428,7 @@ File file = artifact.getFile(); try { if (file.exists()) { - if (file.getName().endsWith("jar")) { + if (file.getName().endsWith("jar") && ! file.getName().startsWith("org.apache.felix.ipojo-")) { JarFile jar = new JarFile(file); if (jar.getManifest().getMainAttributes().getValue("Bundle-ManifestVersion") != null) { toDeploy.add(file.toURI().toURL());