[MWRAPPER-14] move groupId to org.apache.maven.wrapper

Author: hboutemy

maven-wrapper-distribution/pom.xml

@@ -22,7 +22,7 @@ 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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.wrapper</groupId>
     <artifactId>maven-wrapper-parent</artifactId>
     <version>3.0.3-SNAPSHOT</version>
   </parent>
@@ -88,7 +88,7 @@ under the License.
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.wrapper</groupId>
       <artifactId>maven-wrapper</artifactId>
       <version>${project.version}</version>
     </dependency>

maven-wrapper-distribution/src/assembly/bin.xml

@@ -31,7 +31,7 @@ under the License.
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
-        <include>org.apache.maven:maven-wrapper:jar:*</include>
+        <include>org.apache.maven.wrapper:maven-wrapper:jar:*</include>
       </includes>
       <outputDirectory>.mvn/wrapper</outputDirectory>
       <outputFileNameMapping>maven-wrapper.jar</outputFileNameMapping>

maven-wrapper-distribution/src/assembly/script/download

@@ -11,10 +11,10 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
 
-    jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
+    jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
 
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
     fi
 
     if [ "$MVNW_VERBOSE" = true ]; then

maven-wrapper-distribution/src/assembly/script/download.cmd

@@ -6,10 +6,10 @@ if "%MVNW_VERBOSE%" == "true" ECHO Found %LAUNCHER_JAR%
 goto endWrapper
 
 :downloadWrapper
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
 
 if not "%MVNW_REPOURL%" == "" (
-    SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
+    SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
 )
 if "%MVNW_VERBOSE%" == "true" (
     echo Couldn't find %LAUNCHER_JAR%, downloading it ...

maven-wrapper-plugin/pom.xml

@@ -23,7 +23,7 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
+    <groupId>org.apache.maven.wrapper</groupId>
     <artifactId>maven-wrapper-parent</artifactId>
     <version>3.0.3-SNAPSHOT</version>
   </parent>
@@ -81,15 +81,36 @@ under the License.
             <artifactId>maven-invoker-plugin</artifactId>
             <configuration>
               <goals>
-                <goal>wrapper</goal>
+                <goal>${project.groupId}:${project.artifactId}:${project.version}:wrapper</goal>
               </goals>
               <projectsDirectory>src/it/projects</projectsDirectory>
               <debug>false</debug>
-              <pomExcludes>
-                <!-- remove once Maven 4 is released -->
-                <pomExclude>wrapperversion/pom.xml</pomExclude>
-              </pomExcludes>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+              <preBuildHookScript>setup</preBuildHookScript>
+              <postBuildHookScript>verify</postBuildHookScript>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <pomIncludes>
+                <pomInclude>*/pom.xml</pomInclude>
+              </pomIncludes>
+              <properties>
+                <maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
+                <maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
+                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+                <https.protocols>${https.protocols}</https.protocols>
+              </properties>
+              <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
             </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>install</goal>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>

maven-wrapper-plugin/src/it/projects/default/invoker.properties

@@ -24,4 +24,4 @@ assert new File(basedir,'mvnwDebug').exists()
 assert new File(basedir,'mvnwDebug.cmd').exists()
 assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
 assert !(new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists())
-assert new File(basedir, 'build.log').text.contains('[INFO] Unpacked org.apache.maven:apache-maven-wrapper:zip:script:')
+assert new File(basedir, 'build.log').text.contains('[INFO] Unpacked org.apache.maven.wrapper:maven-wrapper-distribution:zip:script:')

maven-wrapper-plugin/src/it/projects/default/verify.groovy

@@ -15,4 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.maven.version = 4+
+# wrapper lifecycle available because maven-wrapper-plugin is put as extension
+invoker.goals = wrapper