servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1564979 - in /servicemix/smx4/bundles/trunk: junit-4.11/pom.xml pom.xml
Date Wed, 05 Feb 2014 22:57:05 GMT
Author: jbonofre
Date: Wed Feb  5 22:57:05 2014
New Revision: 1564979

URL: http://svn.apache.org/r1564979
Log:
[SMX4-1669] JUnit bundle should not refer hamcrest artifact

Modified:
    servicemix/smx4/bundles/trunk/junit-4.11/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/junit-4.11/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/junit-4.11/pom.xml?rev=1564979&r1=1564978&r2=1564979&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/junit-4.11/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/junit-4.11/pom.xml Wed Feb  5 22:57:05 2014
@@ -24,7 +24,7 @@
     <parent>
        <groupId>org.apache.servicemix.bundles</groupId>
        <artifactId>bundles-pom</artifactId>
-       <version>10</version>
+       <version>11</version>
        <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -54,7 +54,12 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- sources -->
@@ -63,7 +68,6 @@
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <classifier>sources</classifier>
-            <optional>true</optional>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1564979&r1=1564978&r2=1564979&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Feb  5 22:57:05 2014
@@ -100,6 +100,7 @@
         <module>avro-1.7.6</module>
         <module>avro-ipc-1.7.6</module>
         <module>ant-1.9.3</module>
+        <module>junit-4.11</module>
     </modules>
 
 </project>



Mime
View raw message