diff --git a/pom.xml b/pom.xml
index 3689456..7dd62c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml
index a9fd69b..00a05a5 100644
--- a/src/it/it-project-parent/pom.xml
+++ b/src/it/it-project-parent/pom.xml
@@ -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>
diff --git a/src/it/projects/apply/apply-single-patch/pom.xml b/src/it/projects/apply/apply-single-patch/pom.xml
index d186070..ccefa1f 100644
--- a/src/it/projects/apply/apply-single-patch/pom.xml
+++ b/src/it/projects/apply/apply-single-patch/pom.xml
@@ -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 @@
 
         <executions>
           <execution>
-            <id>resolve-patches</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>resolve-patches</goal>
-            </goals>
-          </execution>
-          <execution>
             <id>apply-patches</id>
             
             <!--  putting it ahead of generate-sources, since this should patch any model files, etc. -->
diff --git a/src/it/projects/apply/apply-single-patch/src/patches/first.patch b/src/it/projects/apply/apply-single-patch/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/apply/apply-single-patch/src/patches/first.patch
rename to src/it/projects/apply/apply-single-patch/src/main/patches/first.patch
diff --git a/src/it/projects/apply/apply-two-patches-in-order/pom.xml b/src/it/projects/apply/apply-two-patches-in-order/pom.xml
index d3aff8e..ef1f144 100644
--- a/src/it/projects/apply/apply-two-patches-in-order/pom.xml
+++ b/src/it/projects/apply/apply-two-patches-in-order/pom.xml
@@ -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>
@@ -55,13 +54,6 @@
 
         <executions>
           <execution>
-            <id>resolve-patches</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>resolve-patches</goal>
-            </goals>
-          </execution>
-          <execution>
             <id>apply-patches</id>
             
             <!--  putting it ahead of generate-sources, since this should patch any model files, etc. -->
diff --git a/src/it/projects/apply/apply-two-patches-in-order/src/patches/first.patch b/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/apply/apply-two-patches-in-order/src/patches/first.patch
rename to src/it/projects/apply/apply-two-patches-in-order/src/main/patches/first.patch
diff --git a/src/it/projects/apply/apply-two-patches-in-order/src/patches/second.patch b/src/it/projects/apply/apply-two-patches-in-order/src/main/patches/second.patch
similarity index 100%
rename from src/it/projects/apply/apply-two-patches-in-order/src/patches/second.patch
rename to src/it/projects/apply/apply-two-patches-in-order/src/main/patches/second.patch
diff --git a/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml b/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
index b45b872..2ee04f3 100644
--- a/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
+++ b/src/it/projects/autoskip/skip-when-patch-enum-missing/pom.xml
@@ -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,23 +41,15 @@
   <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>
             
             <!--  putting it ahead of generate-sources, since this should patch any model files, etc. -->
diff --git a/src/it/projects/autoskip/skip-when-patch-enum-missing/src/patches/first.patch b/src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-enum-missing/src/patches/first.patch
rename to src/it/projects/autoskip/skip-when-patch-enum-missing/src/main/patches/first.patch
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml b/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
index 8f35ea5..7db5b4e 100644
--- a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
+++ b/src/it/projects/autoskip/skip-when-patch-tracking-file-present/pom.xml
@@ -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>
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/first.patch b/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/first.patch
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/first.patch
rename to src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/first.patch
diff --git a/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/second.patch b/src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/second.patch
similarity index 100%
rename from src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/patches/second.patch
rename to src/it/projects/autoskip/skip-when-patch-tracking-file-present/src/main/patches/second.patch