maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From handya...@apache.org
Subject svn commit: r482819 - in /maven/sandbox/surefire-plugin-merge: maven-surefire-plugin/ maven-surefire-plugin/pom.xml maven-surefire-plugin/src/ maven-surefire-report-plugin/ maven-surefire-report-plugin/pom.xml maven-surefire-report-plugin/src/ pom.xml
Date Tue, 05 Dec 2006 22:59:19 GMT
Author: handyande
Date: Tue Dec  5 14:59:16 2006
New Revision: 482819

URL: http://svn.apache.org/viewvc?view=rev&rev=482819
Log:
merge in the maven-surefire-plugin and maven-surefire-remote-plugin, some pom modification
along the way
surefire plugin is disabled for now, this is the topic of discussion

Added:
    maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/
      - copied from r481093, maven/plugins/trunk/maven-surefire-plugin/
    maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/pom.xml
      - copied, changed from r482818, maven/plugins/trunk/maven-surefire-plugin/pom.xml
    maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/src/
      - copied from r482818, maven/plugins/trunk/maven-surefire-plugin/src/
    maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/
      - copied from r481093, maven/plugins/trunk/maven-surefire-report-plugin/
    maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/pom.xml
      - copied, changed from r482818, maven/plugins/trunk/maven-surefire-report-plugin/pom.xml
    maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/src/
      - copied from r482818, maven/plugins/trunk/maven-surefire-report-plugin/src/
Modified:
    maven/sandbox/surefire-plugin-merge/pom.xml

Copied: maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/pom.xml (from r482818, maven/plugins/trunk/maven-surefire-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/pom.xml?view=diff&rev=482819&p1=maven/plugins/trunk/maven-surefire-plugin/pom.xml&r1=482818&p2=maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/pom.xml&r2=482819
==============================================================================
--- maven/plugins/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/sandbox/surefire-plugin-merge/maven-surefire-plugin/pom.xml Tue Dec  5 14:59:16
2006
@@ -20,12 +20,13 @@
 
 <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/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>maven-plugins</artifactId>
-    <groupId>org.apache.maven.plugins</groupId>
-    <version>4-SNAPSHOT</version>
+    <artifactId>surefire</artifactId>
+    <groupId>org.apache.maven.surefire</groupId>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-plugin</artifactId>
+  <groupId>org.apache.maven.plugins</groupId>
   <packaging>maven-plugin</packaging>
   <name>Maven Surefire Plugin</name>
   <version>2.3-SNAPSHOT</version>

Copied: maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/pom.xml (from r482818,
maven/plugins/trunk/maven-surefire-report-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/pom.xml?view=diff&rev=482819&p1=maven/plugins/trunk/maven-surefire-report-plugin/pom.xml&r1=482818&p2=maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/pom.xml&r2=482819
==============================================================================
--- maven/plugins/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/sandbox/surefire-plugin-merge/maven-surefire-report-plugin/pom.xml Tue Dec  5 14:59:16
2006
@@ -2,12 +2,13 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>maven-plugins</artifactId>
-    <groupId>org.apache.maven.plugins</groupId>
-    <version>4-SNAPSHOT</version>
+    <artifactId>surefire</artifactId>
+    <groupId>org.apache.maven.surefire</groupId>
+    <version>2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-surefire-report-plugin</artifactId>
+  <groupId>org.apache.maven.plugins</groupId>
   <packaging>maven-plugin</packaging>
   <name>Maven Surefire Report Plugin</name>
   <version>2.1-SNAPSHOT</version>

Modified: maven/sandbox/surefire-plugin-merge/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/surefire-plugin-merge/pom.xml?view=diff&rev=482819&r1=482818&r2=482819
==============================================================================
--- maven/sandbox/surefire-plugin-merge/pom.xml (original)
+++ maven/sandbox/surefire-plugin-merge/pom.xml Tue Dec  5 14:59:16 2006
@@ -58,13 +58,15 @@
   </scm>
   <build>
     <plugins>
+<!-- Here we have disabled the surefire plugin as maven detects this as a cycle
+     We need to find a solution!
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.2</version>
         <configuration>
           <childDelegation>true</childDelegation>
         </configuration>
-      </plugin>
+      </plugin>-->
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
@@ -88,6 +90,8 @@
     <module>surefire-api</module>
     <module>surefire-booter</module>
     <module>surefire-providers</module>
+    <module>maven-surefire-plugin</module>
+    <module>maven-surefire-report-plugin</module>
   </modules>
 
   <profiles>



Mime
View raw message