Skip to content

Commit

Permalink
Cleanups with new parent
Browse files Browse the repository at this point in the history
  • Loading branch information
@slawekjaranowski
slawekjaranowski committed Jun 22, 2024
1 parent 7e38689 commit 8617a6a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 111 deletions.
96 changes: 0 additions & 96 deletions maven-archetype-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
12 changes: 3 additions & 9 deletions maven-archetype-plugin/src/it/mrm/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
7 changes: 1 addition & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 8617a6a

Please sign in to comment.