servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1089126 - in /servicemix/smx4/bundles/trunk: ./ ant-1.7.0/ commons-dbcp-1.2.2/ commons-jexl-1.1/ commons-jxpath-1.2/ fastinfoset-1.2.7/ flatpack-3.2.0/ isorelax-20050913/ javax-mail-1.4.1/ jaxb-impl-2.1.12/ jaxp-ri-1.4.2/ jcr-api-1.0/ jdom...
Date Tue, 05 Apr 2011 16:36:53 GMT
Author: gertv
Date: Tue Apr  5 16:36:52 2011
New Revision: 1089126

URL: http://svn.apache.org/viewvc?rev=1089126&view=rev
Log:
SMX4-796: Partial fix for broken bundles build

Modified:
    servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml
    servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
    servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml
    servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml
    servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml
    servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml
    servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml
    servicemix/smx4/bundles/trunk/jaxp-ri-1.4.2/pom.xml
    servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml
    servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml
    servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml
    servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml
    servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ant-1.7.0/pom.xml Tue Apr  5 16:36:52 2011
@@ -24,7 +24,7 @@
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
 	    <version>6-SNAPSHOT</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>
+	    <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-dbcp-1.2.2/pom.xml Tue Apr  5 16:36:52 2011
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.commons-dbcp</artifactId>
-    <version>1.4_1-SNAPSHOT</version>
+    <version>1.2.2_7-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>

Modified: servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml Tue Apr  5 16:36:52 2011
@@ -23,7 +23,8 @@
     <parent>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>bundles-pom</artifactId>
-      <version>4</version>
+      <version>6-SNAPSHOT</version>
+      <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml Tue Apr  5 16:36:52 2011
@@ -23,7 +23,8 @@
     <parent>
 	    <groupId>org.apache.servicemix.bundles</groupId>
 	    <artifactId>bundles-pom</artifactId>
-	    <version>4</version>
+	    <version>6-SNAPSHOT</version>
+	    <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/fastinfoset-1.2.7/pom.xml Tue Apr  5 16:36:52 2011
@@ -59,21 +59,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>

Modified: servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/flatpack-3.2.0/pom.xml Tue Apr  5 16:36:52 2011
@@ -60,6 +60,21 @@
         </dependency>
     </dependencies>
     
+    <repositories>
+         <!-- ServiceMix repo -->
+       <repository>
+           <id>servicemix</id>
+           <name>Apache ServiceMix Repository</name>
+           <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+           <releases>
+               <enabled>true</enabled>
+           </releases>
+           <snapshots>
+               <enabled>false</enabled>
+           </snapshots>
+       </repository>
+    </repositories>
+    
     <build>
         <plugins>
             <plugin>

Modified: servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml Tue Apr  5 16:36:52 2011
@@ -50,6 +50,21 @@
             jp.gr.xml.relax*
         </servicemix.osgi.export>
     </properties>
+    
+    <repositories>
+         <!-- ServiceMix repo -->
+       <repository>
+           <id>servicemix</id>
+           <name>Apache ServiceMix Repository</name>
+           <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+           <releases>
+               <enabled>true</enabled>
+           </releases>
+           <snapshots>
+               <enabled>false</enabled>
+           </snapshots>
+       </repository>
+    </repositories>    
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/javax-mail-1.4.1/pom.xml Tue Apr  5 16:36:52 2011
@@ -70,21 +70,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>

Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml Tue Apr  5 16:36:52 2011
@@ -77,22 +77,7 @@
             <version>1.0.0</version>
         </dependency>
     </dependencies>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
+    
     <build>
         <plugins>
             <plugin>

Modified: servicemix/smx4/bundles/trunk/jaxp-ri-1.4.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxp-ri-1.4.2/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxp-ri-1.4.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxp-ri-1.4.2/pom.xml Tue Apr  5 16:36:52 2011
@@ -67,21 +67,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>

Modified: servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml Tue Apr  5 16:36:52 2011
@@ -24,6 +24,7 @@
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>bundles-pom</artifactId>
       <version>6-SNAPSHOT</version>
+      <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml Tue Apr  5 16:36:52 2011
@@ -24,6 +24,7 @@
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>bundles-pom</artifactId>
       <version>6-SNAPSHOT</version>
+      <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml Tue Apr  5 16:36:52 2011
@@ -51,6 +51,21 @@
             org.eclipse.jdt*;version=${pkgVersion};-split-package:=merge-first,
         </servicemix.osgi.export>
     </properties>
+    
+    <repositories>
+         <!-- ServiceMix repo -->
+       <repository>
+           <id>servicemix</id>
+           <name>Apache ServiceMix Repository</name>
+           <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+           <releases>
+               <enabled>true</enabled>
+           </releases>
+           <snapshots>
+               <enabled>false</enabled>
+           </snapshots>
+       </repository>
+    </repositories>    
 
     <dependencies>
         <dependency>

Modified: servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jibx-1.1.3/pom.xml Tue Apr  5 16:36:52 2011
@@ -36,7 +36,7 @@
     <description>This OSGi bundle wraps jibx-bind, jibx-extras, and jibx-run ${pkgVersion}
jar files.</description>
     
     <properties>
-        <pkgGroupId>jibx</pkgGroupId>
+        <pkgGroupId>org.jibx</pkgGroupId>
         <pkgVersion>1.1.3</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.jibx
@@ -49,6 +49,20 @@
         </servicemix.osgi.import.pkg>
     </properties>
     
+    <repositories>
+      <repository>
+        <id>jibx.sf.net</id>
+        <name>JiBX repository</name>
+        <url>http://jibx.sf.net/maven2</url>
+        <releases>
+          <updatePolicy>never</updatePolicy>
+        </releases>
+        <snapshots>
+          <enabled>false</enabled>
+        </snapshots>
+      </repository>
+    </repositories>
+    
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml Tue Apr  5 16:36:52 2011
@@ -42,8 +42,7 @@
             de.odysseus.el
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !de.odysseus.el*,
-            *
+            !de.odysseus.el*,*
         </servicemix.osgi.import.pkg>
     </properties>
 

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1089126&r1=1089125&r2=1089126&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Tue Apr  5 16:36:52 2011
@@ -55,6 +55,7 @@
         <module>aspectj-1.6.8</module>
         <module>aws-java-sdk-1.1.1</module>
         <module>bcel-5.2</module>
+        <module>bundles-pom</module>
         <module>castor-0.9.6</module>
         <module>castor-1.3.1</module>
         <module>cglib-2.1_3</module>
@@ -154,8 +155,9 @@
         <module>jsmpp-2.0</module>
         <module>jsmpp-2.1.0</module>
         <module>jstl-1.1.2</module>
-        <module>juel-2.1.0</module>
-        <module>juel-2.1.2</module>
+        <!-- <module>juel-2.1.0</module>
+        <module>juel-2.1.2</module>  -->
+        
         <module>junit-3.8.2</module>
         <module>junit-4.7</module>
         <module>lucene-3.0.0</module>



Mime
View raw message