commit a23737a7bbe0205a61c9df80385a8907e3e345a7
author Clement Escoffier <clement@apache.org> Sat Sep 25 06:22:29 2010 +0000
committer Clement Escoffier <clement@apache.org> Sat Sep 25 06:22:29 2010 +0000
tree 1eaa7c259c41f138b8c8bc099446ed9c25584859
parent 6779d90f2d2a104b1b26006b37b1423406a07418

fix osgi core dependency, reenable internal junit4osgi tests

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1001137 13f79535-47bb-0310-9956-ffa450edef68

ipojo/junit4osgi/junit4osgi/pom.xml

diff --git a/ipojo/junit4osgi/junit4osgi/pom.xml b/ipojo/junit4osgi/junit4osgi/pom.xml
index c469c62..b26ad25 100644
--- a/ipojo/junit4osgi/junit4osgi/pom.xml
+++ b/ipojo/junit4osgi/junit4osgi/pom.xml
@@ -43,6 +43,11 @@
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>4.2.0</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -77,12 +82,12 @@
               junit.*
             </Export-Package>
             <Import-Package>!javax.swing*, *</Import-Package>
-            <!-- <Test-Suite>
+            <Test-Suite>
               org.apache.felix.ipojo.junit4osgi.test.TestTestCase,
               org.apache.felix.ipojo.junit4osgi.test.TestOSGiTestCase,
               org.apache.felix.ipojo.junit4osgi.test.TestTestSuite,
               org.apache.felix.ipojo.junit4osgi.test.TestOSGiTestSuite,
-            </Test-Suite>  -->
+            </Test-Suite>
             <Include-Resource> 
               META-INF/LICENSE=LICENSE,
               META-INF/LICENSE.junit=LICENSE.junit,
@@ -94,7 +99,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml

diff --git a/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml b/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
index 1085686..689d34c 100644
--- a/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
+++ b/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
@@ -6,9 +6,9 @@
   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
@@ -36,7 +36,8 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>3.1.0-SNAPSHOT</version>
+      <!-- <version>3.1.0-SNAPSHOT</version>  -->
+      <version>3.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>