maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r640486 - in /maven/plugins/trunk/maven-patch-plugin: ./ src/it/it-project-parent/ src/it/projects/apply/apply-single-patch/ src/it/projects/apply/apply-single-patch/src/main/patches/ src/it/projects/apply/apply-single-patch/src/patches/ sr...
Date Mon, 24 Mar 2008 18:03:52 GMT
Author: bentmann
Date: Mon Mar 24 11:03:47 2008
New Revision: 640486

URL: http://svn.apache.org/viewvc?rev=640486&view=rev
Log:
o Fixed ITs

Added:
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/src/main/patches/
      - copied from r640478, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/src/main/patches/first.patch
  (props changed)
      - copied unchanged from r640484, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/src/patches/first.patch
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/
      - copied from r640478, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/first.patch
  (props changed)
      - copied unchanged from r640484, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/patches/first.patch
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/second.patch
  (props changed)
      - copied unchanged from r640484, maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/patches/second.patch
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/
      - copied from r640478, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/first.patch
  (props changed)
      - copied unchanged from r640484, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/src/patches/first.patch
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/
      - copied from r640478, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/first.patch
  (props changed)
      - copied unchanged from r640484, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/first.patch
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/second.patch
  (props changed)
      - copied unchanged from r640484, maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/second.patch
Removed:
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/src/patches/
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/
Modified:
    maven/plugins/trunk/maven-patch-plugin/pom.xml
    maven/plugins/trunk/maven-patch-plugin/src/it/it-project-parent/pom.xml
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/pom.xml
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/pom.xml
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
    maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml

Modified: maven/plugins/trunk/maven-patch-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/pom.xml?rev=640486&r1=640485&r2=640486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/pom.xml Mon Mar 24 11:03:47 2008
@@ -150,7 +150,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.1</version>
             <executions>
               <execution>
                 <id>setup-integration-test-parent</id>
@@ -195,4 +195,4 @@
     </profile>
   </profiles>
   
-</project>
\ No newline at end of file
+</project>

Modified: maven/plugins/trunk/maven-patch-plugin/src/it/it-project-parent/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/it-project-parent/pom.xml?rev=640486&r1=640485&r2=640486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/it-project-parent/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/it-project-parent/pom.xml Mon Mar 24 11:03:47
2008
@@ -19,7 +19,7 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.codehaus.mojo.patch.it</groupId>
+  <groupId>org.apache.maven.plugins.patch.it</groupId>
   <artifactId>it-project-parent</artifactId>
   <packaging>pom</packaging>
   <version>1</version>
@@ -42,13 +42,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>patch-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-patch-plugin</artifactId>
         <version>testing</version>
-
-        <configuration>
-          <patchingEnabled>true</patchingEnabled>
-        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/pom.xml?rev=640486&r1=640485&r2=640486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/pom.xml
(original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/pom.xml
Mon Mar 24 11:03:47 2008
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.codehaus.mojo.patch.it</groupId>
+    <groupId>org.apache.maven.plugins.patch.it</groupId>
     <artifactId>it-project-parent</artifactId>
     <version>1</version>
   </parent>
@@ -41,11 +41,10 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>patch-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-patch-plugin</artifactId>
         
         <configuration>
-          <skipResolve>true</skipResolve>
           <targetDirectory>${basedir}</targetDirectory>
           <patches>
             <patch>first.patch</patch>
@@ -53,13 +52,6 @@
         </configuration>
 
         <executions>
-          <execution>
-            <id>resolve-patches</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>resolve-patches</goal>
-            </goals>
-          </execution>
           <execution>
             <id>apply-patches</id>
             

Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-single-patch/src/main/patches/first.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/pom.xml?rev=640486&r1=640485&r2=640486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/pom.xml
(original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/pom.xml
Mon Mar 24 11:03:47 2008
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.codehaus.mojo.patch.it</groupId>
+    <groupId>org.apache.maven.plugins.patch.it</groupId>
     <artifactId>it-project-parent</artifactId>
     <version>1</version>
   </parent>
@@ -41,11 +41,10 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>patch-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-patch-plugin</artifactId>
         
         <configuration>
-          <skipResolve>true</skipResolve>
           <targetDirectory>${basedir}</targetDirectory>
           <patches>
             <patch>first.patch</patch>
@@ -54,13 +53,6 @@
         </configuration>
 
         <executions>
-          <execution>
-            <id>resolve-patches</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>resolve-patches</goal>
-            </goals>
-          </execution>
           <execution>
             <id>apply-patches</id>
             

Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/first.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/second.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml?rev=640486&r1=640485&r2=640486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
(original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
Mon Mar 24 11:03:47 2008
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.codehaus.mojo.patch.it</groupId>
+    <groupId>org.apache.maven.plugins.patch.it</groupId>
     <artifactId>it-project-parent</artifactId>
     <version>1</version>
   </parent>
@@ -41,22 +41,14 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>patch-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-patch-plugin</artifactId>
         
         <configuration>
-          <skipResolve>true</skipResolve>
           <targetDirectory>${basedir}</targetDirectory>
         </configuration>
 
         <executions>
-          <execution>
-            <id>resolve-patches</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>resolve-patches</goal>
-            </goals>
-          </execution>
           <execution>
             <id>apply-patches</id>
             

Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/first.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml?rev=640486&r1=640485&r2=640486&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
(original)
+++ maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
Mon Mar 24 11:03:47 2008
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
-    <groupId>org.codehaus.mojo.patch.it</groupId>
+    <groupId>org.apache.maven.plugins.patch.it</groupId>
     <artifactId>it-project-parent</artifactId>
     <version>1</version>
   </parent>
@@ -41,11 +41,10 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>patch-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-patch-plugin</artifactId>
         
         <configuration>
-          <skipResolve>true</skipResolve>
           <patches>
             <patch>first.patch</patch>
             <patch>second.patch</patch>

Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/first.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-patch-plugin/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/second.patch
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message