servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r671164 - in /servicemix/smx4/nmr/trunk: ./ assembly/ assembly/src/main/filtered-resources/ bundle/ bundles/ document/ jbi/deployer/ jbi/itests/ jbi/itests/src/test/java/org/apache/servicemix/jbi/ jbi/runtime/ nmr/api/ nmr/core/ nmr/managem...
Date Tue, 24 Jun 2008 13:05:13 GMT
Author: gnodet
Date: Tue Jun 24 06:05:13 2008
New Revision: 671164

URL: http://svn.apache.org/viewvc?rev=671164&view=rev
Log:
SMX4NMR-32: extract bundles from the svn tree

Removed:
    servicemix/smx4/nmr/trunk/bundles/
Modified:
    servicemix/smx4/nmr/trunk/assembly/pom.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/nmr/trunk/bundle/pom.xml
    servicemix/smx4/nmr/trunk/document/pom.xml
    servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
    servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
    servicemix/smx4/nmr/trunk/nmr/api/pom.xml
    servicemix/smx4/nmr/trunk/nmr/core/pom.xml
    servicemix/smx4/nmr/trunk/nmr/management/pom.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
    servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
    servicemix/smx4/nmr/trunk/pom.xml

Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Tue Jun 24 06:05:13 2008
@@ -106,8 +106,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+            <version>${woodstox.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Tue Jun 24
06:05:13 2008
@@ -33,7 +33,7 @@
         <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
         <bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox-3.2.3/${pom.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox.version}</bundle>
         <bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.api/${pom.version}</bundle>
         <bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.runtime/${pom.version}</bundle>
         <bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.osgi/${pom.version}</bundle>

Modified: servicemix/smx4/nmr/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundle/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundle/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundle/pom.xml Tue Jun 24 06:05:13 2008
@@ -101,8 +101,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+            <version>${woodstox.version}</version>
         </dependency>
     </dependencies>
     <build>

Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Tue Jun 24 06:05:13 2008
@@ -54,11 +54,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Tue Jun 24 06:05:13 2008
@@ -71,11 +71,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Tue Jun 24 06:05:13 2008
@@ -70,8 +70,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
-            <version>${servicemix.kernel.version}</version>
+            <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+            <version>${ant.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
Tue Jun 24 06:05:13 2008
@@ -71,7 +71,7 @@
             getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"),
             getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"),
             getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.filemonitor"),
-            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant-1.7.0"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"),
 		};
 	}
 

Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Tue Jun 24 06:05:13 2008
@@ -89,11 +89,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>

Modified: servicemix/smx4/nmr/trunk/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/pom.xml Tue Jun 24 06:05:13 2008
@@ -33,8 +33,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Tue Jun 24 06:05:13 2008
@@ -43,8 +43,8 @@
             <version>${commons.logging.version}</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
             <scope>test</scope>
             <version>${junit.version}</version>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/management/pom.xml Tue Jun 24 06:05:13 2008
@@ -59,8 +59,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Tue Jun 24 06:05:13 2008
@@ -59,8 +59,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Tue Jun 24 06:05:13 2008
@@ -49,8 +49,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=671164&r1=671163&r2=671164&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Jun 24 06:05:13 2008
@@ -21,9 +21,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>4</version>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>servicemix-pom</artifactId>
+    <version>1.0</version>
   </parent>
 
   <groupId>org.apache.servicemix.nmr</groupId>
@@ -33,7 +33,6 @@
   <name>Apache ServiceMix NMR</name>
 
   <modules>
-      <module>bundles</module>
       <module>nmr</module>
       <module>document</module>
       <module>jbi</module>
@@ -57,12 +56,12 @@
   </prerequisites>
 
   <properties>
-      <ant.version>1.7.0</ant.version>
-      <aopalliance.version>1.0</aopalliance.version>
-      <asm.version>2.2.3</asm.version>
-      <cglib.version>2.1_3</cglib.version>
+      <ant.version>1.7.0_1-SNAPSHOT</ant.version>
+      <aopalliance.version>1.0_1-SNAPSHOT</aopalliance.version>
+      <asm.version>2.2.3_1-SNAPSHOT</asm.version>
+      <cglib.version>2.1_3_1-SNAPSHOT</cglib.version>
       <camel.version>1.4-SNAPSHOT</camel.version>
-      <commons.io.version>1.3.2</commons.io.version>
+      <commons.io.version>1.3.2_1-SNAPSHOT</commons.io.version>
       <commons.logging.version>1.1.1</commons.logging.version>
       <felix.configadmin.version>1.0.0</felix.configadmin.version>
       <felix.main.version>1.0.3</felix.main.version>
@@ -76,21 +75,19 @@
       <geronimo.javamail.version>1.2</geronimo.javamail.version>
       <geronimo.jta.version>1.1.1</geronimo.jta.version>
       <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
-      <gshell.version>1.0-alpha-1</gshell.version>
-      <junit.version>4.4</junit.version>
-      <jline.version>0.9.93</jline.version>
+      <jline.version>0.9.94</jline.version>
+      <junit.version>4.4_1-SNAPSHOT</junit.version>
       <log4j.version>1.2.14</log4j.version>
-      <mina.version>1.1.6</mina.version>
+      <mina.version>1.1.6_1-SNAPSHOT</mina.version>
       <pax.logging.version>1.1.1</pax.logging.version>
       <servicemix3.version>3.2.1</servicemix3.version>
-      <servicemix.kernel.version>1.0.0-rc1</servicemix.kernel.version>
+      <servicemix.kernel.version>1.0.0-SNAPSHOT</servicemix.kernel.version>
       <servicemix.legal.version>1.0</servicemix.legal.version>
-      <servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
+      <servicemix.specs.version>1.0.0</servicemix.specs.version>
       <spring.osgi.version>1.1.0-m2</spring.osgi.version>
       <spring.version>2.5.4</spring.version>
-      <woodstox.version>3.2.3</woodstox.version>
-      <xbean.version>3.4.1</xbean.version>
-      <xstream.version>1.2.2</xstream.version>
+      <woodstox.version>3.2.6_1-SNAPSHOT</woodstox.version>
+      <xbean.version>3.4.2</xbean.version>
   </properties>
 
    <repositories>
@@ -120,6 +117,15 @@
        </repository>
    </repositories>
 
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.4</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
   <pluginRepositories>
       <!-- Apache snapshot -->
       <pluginRepository>
@@ -179,11 +185,6 @@
           <version>${mina.version}</version>
       </dependency>
       <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>${junit.version}</version>
-      </dependency>
-      <dependency>
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
           <version>${log4j.version}</version>



Mime
View raw message