maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1078909 - in /maven/surefire/trunk: surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ surefire-providers/surefire-junit4/ surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/ surefire-provide...
Date Mon, 07 Mar 2011 19:55:34 GMT
Author: krosenvold
Date: Mon Mar  7 19:55:34 2011
New Revision: 1078909

URL: http://svn.apache.org/viewvc?rev=1078909&view=rev
Log:
o Changed back to plexus.utils.SelectorUtils because it was only being used in jdk1.5+ modules

Removed:
    maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/SelectorUtils.java
Modified:
    maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
    maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
    maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=1078909&r1=1078908&r2=1078909&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Mon Mar  7 19:55:34 2011
@@ -17,7 +17,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -43,6 +44,10 @@
       <artifactId>common-junit4</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -78,12 +83,20 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <minimizeJar>true</minimizeJar>
               <artifactSet>
                 <includes>
                   <include>org.apache.maven.surefire:common-junit3</include>
                   <include>org.apache.maven.surefire:common-junit4</include>
+                  <include>org.codehaus.plexus:plexus-utils</include>
                 </includes>
               </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.codehaus.plexus.util</pattern>
+                  <shadedPattern>org.apache.maven.surefire.shade.org.codehaus.plexus.util</shadedPattern>
+                </relocation>
+              </relocations>
             </configuration>
           </execution>
         </executions>

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java?rev=1078909&r1=1078908&r2=1078909&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
Mon Mar  7 19:55:34 2011
@@ -22,8 +22,8 @@ package org.apache.maven.surefire.junit4
 import java.lang.reflect.Method;
 
 import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.util.internal.SelectorUtils;
 import org.apache.maven.surefire.util.internal.StringUtils;
+import org.codehaus.plexus.util.SelectorUtils;
 import org.junit.runner.Request;
 import org.junit.runner.Runner;
 import org.junit.runner.notification.RunNotifier;
@@ -39,7 +39,7 @@ public class JUnit4TestSet
             Method[] methods = testClass.getMethods();
             for (int i = 0,size = methods.length;i<size;i++)
             {
-                if (SelectorUtils.match( testMethod, methods[i].getName() ) )
+                if ( SelectorUtils.match( testMethod, methods[i].getName() ) )
                 {
                     Runner junitTestRunner = Request.method( testClass, methods[i].getName()
).getRunner();
                     junitTestRunner.run( fNotifier );

Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml?rev=1078909&r1=1078908&r2=1078909&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml Mon Mar  7 19:55:34
2011
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
@@ -10,7 +11,7 @@
   </parent>
 
   <artifactId>surefire-testng-utils</artifactId>
-  
+
   <name>SureFire TestNG Utils</name>
 
   <dependencies>
@@ -20,8 +21,12 @@
       <version>3.8.2</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
   </dependencies>
-  
+
   <!-- TODO: do we include both? Or just 1.5? No need for profile -->
   <profiles>
     <profile>
@@ -52,6 +57,36 @@
         </dependency>
       </dependencies>
     </profile>
-  </profiles>  
-  
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+              <artifactSet>
+                <includes>
+                  <include>org.codehaus.plexus:plexus-utils</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.codehaus.plexus.util</pattern>
+                  <shadedPattern>org.apache.maven.surefire.shade.org.codehaus.plexus.util</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java?rev=1078909&r1=1078908&r2=1078909&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
Mon Mar  7 19:55:34 2011
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.testng
 
 import java.util.List;
 
-import org.apache.maven.surefire.util.internal.SelectorUtils;
+import org.codehaus.plexus.util.SelectorUtils;
 import org.testng.IMethodSelector;
 import org.testng.IMethodSelectorContext;
 import org.testng.ITestNGMethod;
@@ -31,6 +31,7 @@ import org.testng.ITestNGMethod;
  * @author Olivier Lamy
  * @since 2.7.3
  *
+ * @noinspection UnusedDeclaration
  */
 public class MethodSelector implements IMethodSelector 
 {



Mime
View raw message