You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/03/27 20:53:27 UTC

svn commit: r641962 - in /servicemix/smx4/kernel/trunk: assembly/pom.xml filemonitor/pom.xml gshell/gshell-features/pom.xml pom.xml testing/features-maven-plugin/ testing/support/pom.xml

Author: gnodet
Date: Thu Mar 27 12:53:25 2008
New Revision: 641962

URL: http://svn.apache.org/viewvc?rev=641962&view=rev
Log:
Add compendium to the dependency management section

Modified:
    servicemix/smx4/kernel/trunk/assembly/pom.xml
    servicemix/smx4/kernel/trunk/filemonitor/pom.xml
    servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
    servicemix/smx4/kernel/trunk/pom.xml
    servicemix/smx4/kernel/trunk/testing/features-maven-plugin/   (props changed)
    servicemix/smx4/kernel/trunk/testing/support/pom.xml

Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=641962&r1=641961&r2=641962&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Thu Mar 27 12:53:25 2008
@@ -143,16 +143,6 @@
           <groupId>org.apache.felix</groupId>
           <artifactId>org.osgi.compendium</artifactId>
           <version>${felix.compendium.version}</version>
-          <exclusions>
-	         <exclusion>
-	              <groupId>org.apache.felix</groupId>
-    	          <artifactId>javax.servlet</artifactId>
-             </exclusion>
-	         <exclusion>
-	              <groupId>org.apache.felix</groupId>
-    	          <artifactId>org.osgi.foundation</artifactId>
-             </exclusion>
-	      </exclusions>
       </dependency>
       <dependency>
           <groupId>org.apache.felix</groupId>

Modified: servicemix/smx4/kernel/trunk/filemonitor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/pom.xml?rev=641962&r1=641961&r2=641962&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/pom.xml Thu Mar 27 12:53:25 2008
@@ -55,20 +55,6 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>${felix.compendium.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.foundation</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- testing -->

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml?rev=641962&r1=641961&r2=641962&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml Thu Mar 27 12:53:25 2008
@@ -50,16 +50,6 @@
           <artifactId>org.osgi.compendium</artifactId>
           <version>${felix.compendium.version}</version>
           <scope>provided</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>org.osgi.foundation</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>javax.servlet</artifactId>
-            </exclusion>
-          </exclusions>
         </dependency>
 
         <dependency>

Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=641962&r1=641961&r2=641962&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Thu Mar 27 12:53:25 2008
@@ -120,6 +120,21 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>org.osgi.compendium</artifactId>
+          <version>${felix.compendium.version}</version>
+          <exclusions>
+            <exclusion>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>org.osgi.foundation</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>javax.servlet</artifactId>
+            </exclusion>
+          </exclusions>
+      </dependency>
+	  <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-aop</artifactId>
           <version>${spring.version}</version>

Propchange: servicemix/smx4/kernel/trunk/testing/features-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 27 12:53:25 2008
@@ -0,0 +1,7 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings

Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=641962&r1=641961&r2=641962&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Thu Mar 27 12:53:25 2008
@@ -43,16 +43,6 @@
           <groupId>org.apache.felix</groupId>
           <artifactId>org.osgi.compendium</artifactId>
           <version>${felix.compendium.version}</version>
-          <exclusions>
-	         <exclusion>
-	              <groupId>org.apache.felix</groupId>
-    	          <artifactId>javax.servlet</artifactId>
-             </exclusion>
-	         <exclusion>
-	              <groupId>org.apache.felix</groupId>
-    	          <artifactId>org.osgi.foundation</artifactId>
-             </exclusion>
-	      </exclusions>
       </dependency>
       <dependency>
           <groupId>org.apache.felix</groupId>