This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit ec2ede3a9888a7cc80a315b9c21d99a4666d4906 Author: Slawomir Jaranowski <[email protected]> AuthorDate: Sat Jun 22 21:10:27 2024 +0200 Cleanups with new parent --- maven-archetype-plugin/pom.xml | 96 -------------------------- maven-archetype-plugin/src/it/mrm/settings.xml | 12 +--- pom.xml | 7 +- 3 files changed, 4 insertions(+), 111 deletions(-) diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml index ff14be41..88360ed5 100644 --- a/maven-archetype-plugin/pom.xml +++ b/maven-archetype-plugin/pom.xml @@ -172,64 +172,6 @@ </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-report-plugin</artifactId> - <configuration> - <requirementsHistories> - <requirementsHistory> - <version>3.3.0</version> - <maven>3.0</maven> - <jdk>8</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.2.1</version> - <maven>3.0</maven> - <jdk>7</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.2.0</version> - <maven>3.0</maven> - <jdk>7</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.1.2</version> - <maven>3.0</maven> - <jdk>7</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.1.1</version> - <maven>3.0</maven> - <jdk>7</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.1.1_vote-1</version> - <maven>3.0</maven> - <jdk>7</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.1.0</version> - <maven>3.0</maven> - <jdk>7</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.0.1</version> - <maven>3.0</maven> - <jdk>1.6</jdk> - </requirementsHistory> - <requirementsHistory> - <version>3.0.0</version> - <maven>3.0</maven> - <jdk>1.6</jdk> - </requirementsHistory> - </requirementsHistories> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin> <groupId>org.apache.rat</groupId> @@ -248,10 +190,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> <executions> - <execution> - <id>default-descriptor</id> - <phase>process-classes</phase> - </execution> <execution> <id>generate-helpmojo</id> <goals> @@ -322,7 +260,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>3.6.0</version> <configuration> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> </configuration> @@ -351,15 +288,9 @@ <postBuildHookScript>verify</postBuildHookScript> <settingsFile>src/it/mrm/settings.xml</settingsFile> <logDirectory>target/it/logs</logDirectory> - <filterProperties> - <repository.proxy.url>${mrm.repository.url}</repository.proxy.url> - <archetype-repo.proxy.url>${archetype-repo.proxy.url}</archetype-repo.proxy.url> - </filterProperties> <properties> <maven.compiler.source>${maven.compiler.source}</maven.compiler.source> <maven.compiler.target>${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> </configuration> </execution> @@ -368,33 +299,6 @@ <goals> <goal>verify</goal> </goals> - <configuration> - <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>ciProfile</id> - <activation> - <property> - <name>enableCiProfile</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-docck-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> </execution> </executions> </plugin> diff --git a/maven-archetype-plugin/src/it/mrm/settings.xml b/maven-archetype-plugin/src/it/mrm/settings.xml index bcae17c6..c0a7c9b5 100644 --- a/maven-archetype-plugin/src/it/mrm/settings.xml +++ b/maven-archetype-plugin/src/it/mrm/settings.xml @@ -23,7 +23,7 @@ under the License. <mirror> <id>mrm-maven-plugin</id> <name>Mock Repository Manager</name> - <url>@repository.proxy.url@</url> + <url>@mrm.repository.url@</url> <mirrorOf>*,!archetype</mirrorOf> </mirror> </mirrors> @@ -36,32 +36,28 @@ under the License. <repositories> <repository> <id>snapshots</id> - <url>@repository.proxy.url@</url> + <url>@mrm.repository.url@</url> <releases> <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> - <updatePolicy>never</updatePolicy> </releases> <snapshots> <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> - <updatePolicy>always</updatePolicy> </snapshots> </repository> </repositories> <pluginRepositories> <pluginRepository> <id>snapshots</id> - <url>@repository.proxy.url@</url> + <url>@mrm.repository.url@</url> <releases> <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> - <updatePolicy>never</updatePolicy> </releases> <snapshots> <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> - <updatePolicy>always</updatePolicy> </snapshots> </pluginRepository> </pluginRepositories> @@ -76,12 +72,10 @@ under the License. <releases> <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> - <updatePolicy>never</updatePolicy> </releases> <snapshots> <enabled>true</enabled> <checksumPolicy>ignore</checksumPolicy> - <updatePolicy>always</updatePolicy> </snapshots> </repository> </repositories> diff --git a/pom.xml b/pom.xml index 0f19365a..22b1772e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ <scm> <connection>${maven.archetype.scm.devConnection}</connection> <developerConnection>${maven.archetype.scm.devConnection}</developerConnection> - <tag>maven-archetype-3.2.1</tag> + <tag>HEAD</tag> <url>https://github.com/apache/maven-archetype/tree/${project.scm.tag}</url> </scm> <issueManagement> @@ -286,11 +286,6 @@ <topSiteURL>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</topSiteURL> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.modello</groupId> - <artifactId>modello-maven-plugin</artifactId> - <version>2.3.0</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId>
