servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1577446 - in /servicemix/smx5/trunk: activiti/pom.xml assembly/pom.xml assembly/src/main/resources/common-bin.xml examples/activiti/activiti-camel/pom.xml pom.xml
Date Fri, 14 Mar 2014 08:34:27 GMT
Author: gertv
Date: Fri Mar 14 08:34:26 2014
New Revision: 1577446

URL: http://svn.apache.org/r1577446
Log:
SM-2265: Remove unnecessary external repositories

Modified:
    servicemix/smx5/trunk/activiti/pom.xml
    servicemix/smx5/trunk/assembly/pom.xml
    servicemix/smx5/trunk/assembly/src/main/resources/common-bin.xml
    servicemix/smx5/trunk/examples/activiti/activiti-camel/pom.xml
    servicemix/smx5/trunk/pom.xml

Modified: servicemix/smx5/trunk/activiti/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/activiti/pom.xml?rev=1577446&r1=1577445&r2=1577446&view=diff
==============================================================================
--- servicemix/smx5/trunk/activiti/pom.xml (original)
+++ servicemix/smx5/trunk/activiti/pom.xml Fri Mar 14 08:34:26 2014
@@ -36,5 +36,20 @@
     <modules>
         <module>activiti-config</module>
     </modules>
+        
+    <repositories>
+        <!-- Alfresco repository contains Activiti artifacts -->
+        <repository>
+            <id>alfresco.public</id>
+            <name>Alfresco Public Repository</name>
+            <url>https://maven.alfresco.com/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
 </project>

Modified: servicemix/smx5/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/pom.xml?rev=1577446&r1=1577445&r2=1577446&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/pom.xml (original)
+++ servicemix/smx5/trunk/assembly/pom.xml Fri Mar 14 08:34:26 2014
@@ -77,11 +77,7 @@
 
         <!--Xerces jar to be included in lib/endorsed -->
         <dependency>
-            <groupId>org.apache.xerces</groupId>
-            <artifactId>xml-apis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xerces</groupId>
+            <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
 
@@ -102,7 +98,22 @@
         </dependency>
 
     </dependencies>
- 
+            
+    <repositories>
+        <!-- Alfresco repository contains Activiti and some Spring artifacts -->
+        <repository>
+            <id>alfresco.public</id>
+            <name>Alfresco Public Repository</name>
+            <url>https://maven.alfresco.com/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+                
     <build>
         <resources>
             <resource>

Modified: servicemix/smx5/trunk/assembly/src/main/resources/common-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assembly/src/main/resources/common-bin.xml?rev=1577446&r1=1577445&r2=1577446&view=diff
==============================================================================
--- servicemix/smx5/trunk/assembly/src/main/resources/common-bin.xml (original)
+++ servicemix/smx5/trunk/assembly/src/main/resources/common-bin.xml Fri Mar 14 08:34:26 2014
@@ -45,7 +45,6 @@
             <outputDirectory>/lib/endorsed</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
-                <include>org.apache.xerces:xercesImpl</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
@@ -54,7 +53,7 @@
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
                 <include>xalan:xalan</include>
                 <include>xalan:serializer</include>
-                <include>org.apache.xerces:xercesImpl</include>
+                <include>xerces:xercesImpl</include>
             </includes>
         </dependencySet>
     </dependencySets>

Modified: servicemix/smx5/trunk/examples/activiti/activiti-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/activiti/activiti-camel/pom.xml?rev=1577446&r1=1577445&r2=1577446&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/activiti/activiti-camel/pom.xml (original)
+++ servicemix/smx5/trunk/examples/activiti/activiti-camel/pom.xml Fri Mar 14 08:34:26 2014
@@ -40,6 +40,21 @@
             <artifactId>activiti-camel</artifactId>
         </dependency>
     </dependencies>
+        
+    <repositories>
+        <!-- Alfresco repository contains Activiti artifacts -->
+        <repository>
+            <id>alfresco.public</id>
+            <name>Alfresco Public Repository</name>
+            <url>https://maven.alfresco.com/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
     <build>
         <plugins>

Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1577446&r1=1577445&r2=1577446&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Fri Mar 14 08:34:26 2014
@@ -62,69 +62,6 @@
         <maven>3.0.0</maven>
     </prerequisites>
 
-    <repositories>
-        <!-- JBoss Maven Repository, required by Drools -->
-        <repository>
-            <id>jboss</id>
-            <name>JBoss Maven2 Repository</name>
-            <url>http://repository.jboss.com/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- Scriptengines Google Maven Repository, required by scriptengines -->
-        <repository>
-            <id>scriptengines</id>
-            <name>Scriptengines Google Code Maven Repository</name>
-            <url>http://scriptengines.googlecode.com/svn/m2-repo</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- ServiceMix Maven 2 repository: jsmpp 2.0 is not in central repo -->
-        <repository>
-            <id>servicemix.m2-repo</id>
-            <name>ServiceMix Maven 2 repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- Alfresco repository contains Activiti artifacts -->
-        <repository>
-            <id>alfresco.public</id>
-            <name>Alfresco Public Repository</name>
-            <url>https://maven.alfresco.com/nexus/content/groups/public</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <!-- OPS4J SNAPSHOT repository -->
-        <repository>
-            <id>ops4j.sonatype.snapshots.deploy</id>
-            <name>OPS4J snapshot repository</name>
-            <url>https://oss.sonatype.org/content/repositories/ops4j-snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <properties>
         <!-- CXF -->
         <cxf.codegen-plugin.version>2.4.4</cxf.codegen-plugin.version>
@@ -219,16 +156,11 @@
            
            <!-- Other Dependencies -->
            <dependency>
-               <groupId>org.apache.xerces</groupId>
+               <groupId>xerces</groupId>
                <artifactId>xercesImpl</artifactId>
                <version>${xerces.version}</version>
            </dependency>
            <dependency>
-               <groupId>org.apache.xerces</groupId>
-               <artifactId>xml-apis</artifactId>
-               <version>${xml.api.version}</version>
-           </dependency>
-           <dependency>
                <groupId>xalan</groupId>
                <artifactId>xalan</artifactId>
                <version>${xalan.version}</version>



Mime
View raw message