maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject [6/7] git commit: o Removed unused dependency, fixed shading
Date Tue, 26 Mar 2013 16:04:02 GMT
o Removed unused dependency, fixed shading


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c1e06f8e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c1e06f8e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c1e06f8e

Branch: refs/heads/surfire97
Commit: c1e06f8edc6d2a546eafff0715481486aa6b9640
Parents: 15ad61f
Author: Kristian Rosenvold <krosenvold@apache.org>
Authored: Tue Mar 26 16:58:19 2013 +0100
Committer: Kristian Rosenvold <krosenvold@apache.org>
Committed: Tue Mar 26 16:58:19 2013 +0100

----------------------------------------------------------------------
 surefire-providers/surefire-junit47/pom.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c1e06f8e/surefire-providers/surefire-junit47/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml
index 00d69af..1dede4f 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -39,12 +39,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>common-junit4</artifactId>
       <version>${project.version}</version>
@@ -99,6 +93,16 @@
                   <include>org.apache.maven.surefire:common-java5</include>
                 </includes>
               </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>org.apache.maven.surefire.javax.annotation</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.apache.maven.shared</pattern>
+                  <shadedPattern>org.apache.maven.surefire.org.apache.maven.shared</shadedPattern>
+                </relocation>
+              </relocations>
             </configuration>
           </execution>
         </executions>


Mime
View raw message