Skip to content

[MPLUGINTESTING-73] Upgrade maven-parent pom to 36 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slachiewicz merged 1 commit into from
Jun 18, 2022
Merged

[MPLUGINTESTING-73] Upgrade maven-parent pom to 36 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions maven-plugin-testing-harness/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,56 +37,54 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>

<!-- plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.2.5</version>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
164 changes: 3 additions & 161 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
<version>34</version>
<version>36</version>
<relativePath/>
</parent>

Expand All @@ -39,68 +39,6 @@ under the License.
<url>https://maven.apache.org/plugin-testing/</url>
<inceptionYear>2008</inceptionYear>

<mailingLists>
<mailingList>
<name>Maven User List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>https://mail-archives.apache.org/mod_mbox/maven-users</archive>
<otherArchives>
<otherArchive>https://www.mail-archive.com/[email protected]/</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Maven Developer List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>https://mail-archives.apache.org/mod_mbox/maven-dev</archive>
<otherArchives>
<otherArchive>https://www.mail-archive.com/[email protected]/</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Maven Issues List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>https://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
<otherArchives>
<otherArchive>https://www.mail-archive.com/[email protected]</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Maven Commits List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>https://mail-archives.apache.org/mod_mbox/maven-commits</archive>
<otherArchives>
<otherArchive>https://www.mail-archive.com/[email protected]</otherArchive>
</otherArchives>
</mailingList>

<!-- duplication from parent pom - temporary until they inherit properly -->
<mailingList>
<name>Maven Announcements List</name>
<post>[email protected]</post>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>https://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
<otherArchives>
<otherArchive>https://www.mail-archive.com/[email protected]</otherArchive>
</otherArchives>
</mailingList>
<mailingList>
<name>Maven Notifications List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>https://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
<otherArchives>
<otherArchive>https://www.mail-archive.com/[email protected]</otherArchive>
</otherArchives>
</mailingList>
</mailingLists>

<!-- this project used to be a multimodule project. For easy of history comparison structure is kept -->
<modules>
<module>maven-plugin-testing-harness</module>
Expand All @@ -118,7 +56,7 @@ under the License.
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-plugin-testing/</url>
<url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-plugin-testing/</url>
</ciManagement>
<distributionManagement>
<site>
Expand All @@ -128,107 +66,11 @@ under the License.
</distributionManagement>

<properties>
<surefire.version>2.22.2</surefire.version>
<surefire.version>3.0.0-M7</surefire.version>
<mavenVersion>3.2.5</mavenVersion>
<maven.site.path>plugin-testing-archives/LATEST</maven.site.path>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
<dependencies>

<!-- maven -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.3.0</version> <!-- 3.4.x is Java8 -->
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
<property>
<name>java.io.tmpdir</name>
<value>${java.io.tmpdir}</value>
</property>
</systemProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<topSiteURL>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</topSiteURL>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>attach-descriptor</id>
<goals>
<goal>attach-descriptor</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>