You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/12/01 14:31:12 UTC
[maven-studies] 02/05: [MWRAPPER-14] switch from provisio to maven-assembly-plugin
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MWRAPPER-14
in repository https://gitbox.apache.org/repos/asf/maven-studies.git
commit 9bfc8d27bc995652aaf6c37c3c9e1ab8b30891e9
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Fri Nov 26 19:16:37 2021 +0100
[MWRAPPER-14] switch from provisio to maven-assembly-plugin
---
.gitignore | 2 +-
.mvn/wrapper/maven-wrapper.jar | Bin 47774 -> 0 bytes
maven-wrapper-distribution/pom.xml | 65 ++++++++++++++++
.../src/assembly/distribution.xml | 59 ++++++++++++++
.../mvn}/wrapper/MavenWrapperDownloader.java | 0
.../mvn}/wrapper/maven-wrapper.properties | 3 +-
.../src/resources/mvnw | 0
.../src/resources/mvnw.cmd | 0
pom.xml => maven-wrapper/pom.xml | 21 ++---
.../apache/maven/wrapper/BootstrapMainStarter.java | 0
.../apache/maven/wrapper/DefaultDownloader.java | 0
.../java/org/apache/maven/wrapper/Downloader.java | 0
.../java/org/apache/maven/wrapper/Installer.java | 0
.../main/java/org/apache/maven/wrapper/Logger.java | 0
.../org/apache/maven/wrapper/MavenWrapperMain.java | 0
.../org/apache/maven/wrapper/PathAssembler.java | 0
.../maven/wrapper/SystemPropertiesHandler.java | 0
.../apache/maven/wrapper/WrapperConfiguration.java | 0
.../org/apache/maven/wrapper/WrapperExecutor.java | 0
.../wrapper/cli/AbstractCommandLineConverter.java | 0
.../AbstractPropertiesCommandLineConverter.java | 0
.../wrapper/cli/CommandLineArgumentException.java | 0
.../maven/wrapper/cli/CommandLineConverter.java | 0
.../maven/wrapper/cli/CommandLineOption.java | 0
.../maven/wrapper/cli/CommandLineParser.java | 0
.../maven/wrapper/cli/ParsedCommandLine.java | 0
.../maven/wrapper/cli/ParsedCommandLineOption.java | 0
.../cli/ProjectPropertiesCommandLineConverter.java | 0
.../cli/SystemPropertiesCommandLineConverter.java | 0
.../org/apache/maven/wrapper/DownloaderTest.java | 0
.../org/apache/maven/wrapper/InstallerTest.java | 0
.../apache/maven/wrapper/PathAssemblerTest.java | 0
.../maven/wrapper/SystemPropertiesHandlerTest.java | 0
.../apache/maven/wrapper/WrapperExecutorTest.java | 0
.../org/apache/maven/wrapper/wrapper.properties | 0
pom.xml | 85 ++-------------------
src/main/provisio/wrapper.xml | 37 ---------
37 files changed, 139 insertions(+), 133 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3a6c9d9..690b25d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
.classpath
.project
.settings
-/target/
+target/
.DS_Store
.idea/
*.iml
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 41c70a7..0000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/maven-wrapper-distribution/pom.xml b/maven-wrapper-distribution/pom.xml
new file mode 100644
index 0000000..b8ae22c
--- /dev/null
+++ b/maven-wrapper-distribution/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.wrapper</groupId>
+ <artifactId>maven-wrapper-parent</artifactId>
+ <version>3.0.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-wrapper-distribution</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Maven Wrapper Distribution</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wrapper</groupId>
+ <artifactId>maven-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/maven-wrapper-distribution/src/assembly/distribution.xml b/maven-wrapper-distribution/src/assembly/distribution.xml
new file mode 100644
index 0000000..2df7db1
--- /dev/null
+++ b/maven-wrapper-distribution/src/assembly/distribution.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+ <id>distribution</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.maven.wrapper:maven-wrapper:jar:*</include>
+ </includes>
+ <outputDirectory>.mvn/wrapper</outputDirectory>
+ <outputFileNameMapping>maven-wrapper.jar</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ <files>
+ <file>
+ <source>src/resources/mvnw.cmd</source>
+ <outputDirectory>.</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>src/resources/mvnw</source>
+ <outputDirectory>.</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </file>
+ </files>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/mvn</directory>
+ <outputDirectory>.mvn</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/maven-wrapper-distribution/src/resources/mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from .mvn/wrapper/MavenWrapperDownloader.java
rename to maven-wrapper-distribution/src/resources/mvn/wrapper/MavenWrapperDownloader.java
diff --git a/.mvn/wrapper/maven-wrapper.properties b/maven-wrapper-distribution/src/resources/mvn/wrapper/maven-wrapper.properties
similarity index 86%
rename from .mvn/wrapper/maven-wrapper.properties
rename to maven-wrapper-distribution/src/resources/mvn/wrapper/maven-wrapper.properties
index 4a173c3..43a290b 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/maven-wrapper-distribution/src/resources/mvn/wrapper/maven-wrapper.properties
@@ -16,5 +16,4 @@
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar
diff --git a/mvnw b/maven-wrapper-distribution/src/resources/mvnw
similarity index 100%
rename from mvnw
rename to maven-wrapper-distribution/src/resources/mvnw
diff --git a/mvnw.cmd b/maven-wrapper-distribution/src/resources/mvnw.cmd
similarity index 100%
rename from mvnw.cmd
rename to maven-wrapper-distribution/src/resources/mvnw.cmd
diff --git a/pom.xml b/maven-wrapper/pom.xml
similarity index 80%
copy from pom.xml
copy to maven-wrapper/pom.xml
index f60d52d..2b7b5e8 100644
--- a/pom.xml
+++ b/maven-wrapper/pom.xml
@@ -23,21 +23,18 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>34</version>
+ <groupId>org.apache.maven.wrapper</groupId>
+ <artifactId>maven-wrapper-parent</artifactId>
+ <version>3.0.3-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.wrapper</groupId>
<artifactId>maven-wrapper</artifactId>
- <version>3.0.3-SNAPSHOT</version>
- <packaging>provisio</packaging>
- <name>Maven Wrapper</name>
+ <name>Maven Wrapper Jar</name>
+ <description>Maven Wrapper Jar download, installs and launches installed target Maven distribution as part of Maven Wrapper scripts run.</description>
<properties>
<javaVersion>5</javaVersion>
- <project.build.outputTimestamp>2021-11-26T10:03:59Z</project.build.outputTimestamp>
</properties>
<dependencies>
@@ -83,14 +80,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>io.takari.maven.plugins</groupId>
- <artifactId>provisio-maven-plugin</artifactId>
- <!-- careful - upgrade to 0.1.50 causes problem with extraction of tar.gz
- instead of into .mvn/wrapper it looses the .mvn path and extracts to wrapper -->
- <version>0.1.46</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
diff --git a/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
diff --git a/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
diff --git a/src/main/java/org/apache/maven/wrapper/Downloader.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/Downloader.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/Downloader.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/Downloader.java
diff --git a/src/main/java/org/apache/maven/wrapper/Installer.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/Installer.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
diff --git a/src/main/java/org/apache/maven/wrapper/Logger.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/Logger.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java
diff --git a/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
diff --git a/src/main/java/org/apache/maven/wrapper/PathAssembler.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/PathAssembler.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/PathAssembler.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/PathAssembler.java
diff --git a/src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java
diff --git a/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
diff --git a/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractCommandLineConverter.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/AbstractPropertiesCommandLineConverter.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/CommandLineArgumentException.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineArgumentException.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/CommandLineArgumentException.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineArgumentException.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/CommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineConverter.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/CommandLineConverter.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineConverter.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/CommandLineOption.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineOption.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/CommandLineOption.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineOption.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/CommandLineParser.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLine.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLine.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLine.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLine.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLineOption.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLineOption.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLineOption.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/ParsedCommandLineOption.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/ProjectPropertiesCommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/ProjectPropertiesCommandLineConverter.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/ProjectPropertiesCommandLineConverter.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/ProjectPropertiesCommandLineConverter.java
diff --git a/src/main/java/org/apache/maven/wrapper/cli/SystemPropertiesCommandLineConverter.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/SystemPropertiesCommandLineConverter.java
similarity index 100%
rename from src/main/java/org/apache/maven/wrapper/cli/SystemPropertiesCommandLineConverter.java
rename to maven-wrapper/src/main/java/org/apache/maven/wrapper/cli/SystemPropertiesCommandLineConverter.java
diff --git a/src/test/java/org/apache/maven/wrapper/DownloaderTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
similarity index 100%
rename from src/test/java/org/apache/maven/wrapper/DownloaderTest.java
rename to maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
diff --git a/src/test/java/org/apache/maven/wrapper/InstallerTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
similarity index 100%
rename from src/test/java/org/apache/maven/wrapper/InstallerTest.java
rename to maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
diff --git a/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
similarity index 100%
rename from src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
rename to maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
diff --git a/src/test/java/org/apache/maven/wrapper/SystemPropertiesHandlerTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/SystemPropertiesHandlerTest.java
similarity index 100%
rename from src/test/java/org/apache/maven/wrapper/SystemPropertiesHandlerTest.java
rename to maven-wrapper/src/test/java/org/apache/maven/wrapper/SystemPropertiesHandlerTest.java
diff --git a/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java b/maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
similarity index 100%
rename from src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
rename to maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
diff --git a/src/test/resources/org/apache/maven/wrapper/wrapper.properties b/maven-wrapper/src/test/resources/org/apache/maven/wrapper/wrapper.properties
similarity index 100%
rename from src/test/resources/org/apache/maven/wrapper/wrapper.properties
rename to maven-wrapper/src/test/resources/org/apache/maven/wrapper/wrapper.properties
diff --git a/pom.xml b/pom.xml
index f60d52d..125d62c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,88 +29,19 @@ under the License.
</parent>
<groupId>org.apache.maven.wrapper</groupId>
- <artifactId>maven-wrapper</artifactId>
+ <artifactId>maven-wrapper-parent</artifactId>
<version>3.0.3-SNAPSHOT</version>
- <packaging>provisio</packaging>
+ <packaging>pom</packaging>
- <name>Maven Wrapper</name>
+ <name>Apache Maven Wrapper</name>
<properties>
- <javaVersion>5</javaVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2021-11-26T10:03:59Z</project.build.outputTimestamp>
</properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.8.47</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
- <!-- Using zip util class, should be replaced with a zip lib -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.10.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.takari.maven.plugins</groupId>
- <artifactId>provisio-maven-plugin</artifactId>
- <!-- careful - upgrade to 0.1.50 causes problem with extraction of tar.gz
- instead of into .mvn/wrapper it looses the .mvn path and extracts to wrapper -->
- <version>0.1.46</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
- <ignoredScopes>test</ignoredScopes>
- </enforceBytecodeVersion>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>maven-wrapper</module>
+ <module>maven-wrapper-distribution</module>
+ </modules>
</project>
diff --git a/src/main/provisio/wrapper.xml b/src/main/provisio/wrapper.xml
deleted file mode 100644
index 94cad12..0000000
--- a/src/main/provisio/wrapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<runtime>
- <archive name="${project.artifactId}-${project.version}.tar.gz" />
-
- <artifactSet to="/.mvn/wrapper">
- <artifact ref="projectArtifact" as="maven-wrapper.jar"/>
- </artifactSet>
-
- <fileSet to="/">
- <directory path="${basedir}">
- <include>mvnw</include>
- <include>mvnw.cmd</include>
- <include>.mvn/**</include>
- <exclude>**/*.jar</exclude>
- </directory>
- </fileSet>
-</runtime>