Skip to content

Commit

Permalink
Upgrade to Maven 4.0.0-alpha-9
Browse files Browse the repository at this point in the history
  • Loading branch information
@gnodet
gnodet committed Dec 6, 2023
1 parent 189d27b commit 7c95052
Show file tree
Hide file tree
Showing 41 changed files with 2,162 additions and 2,373 deletions.
101 changes: 64 additions & 37 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>

<?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
Expand All @@ -18,14 +17,13 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
<version>34</version>
<version>41</version>
<relativePath />
</parent>

Expand All @@ -37,15 +35,21 @@ under the License.
<description>The Compiler Plugin is used to compile the sources of your project.</description>
<inceptionYear>2001</inceptionYear>

<contributors>
<contributor>
<name>Jan Sievers</name>
</contributor>
</contributors>

<prerequisites>
<maven>${mavenVersion}</maven>
</prerequisites>

<scm>
<connection>scm:git:https://github.com/apache/maven-compiler-plugin.git</connection>
<developerConnection>scm:git:https://github.com/apache/maven-compiler-plugin.git</developerConnection>
<url>https://github.com/apache/maven-compiler-plugin/tree/${project.scm.tag}</url>
<tag>maven-compiler-plugin-3.10.0</tag>
<url>https://github.com/apache/maven-compiler-plugin/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
<system>JIRA</system>
Expand All @@ -63,7 +67,7 @@ under the License.
</distributionManagement>

<properties>
<mavenVersion>4.0.0-alpha-5</mavenVersion>
<mavenVersion>4.0.0-alpha-9-SNAPSHOT</mavenVersion>
<!--
! The following property is used in the integration tests MCOMPILER-157
-->
Expand All @@ -74,33 +78,16 @@ under the License.
<groovyEclipseCompilerVersion>3.7.0</groovyEclipseCompilerVersion>
<groovy-eclipse-batch>2.5.14-02</groovy-eclipse-batch>
<plexus-java.version>1.1.1</plexus-java.version>
<version.plexus-xml>4.0.1</version.plexus-xml>
<javaVersion>8</javaVersion>
<maven.it.failure.ignore>false</maven.it.failure.ignore>
<surefire.version>2.22.2</surefire.version>
<mavenPluginToolsVersion>3.8.1</mavenPluginToolsVersion>
<surefire.version>3.2.1</surefire.version>
<mavenPluginPluginVersion>3.10.3-SNAPSHOT</mavenPluginPluginVersion>
<mavenPluginTestingHarnessVersion>4.0.0-alpha-3-SNAPSHOT</mavenPluginTestingHarnessVersion>
<project.build.outputTimestamp>2022-03-08T01:04:02Z</project.build.outputTimestamp>
<invoker.junitPackageName>org.apache.maven.plugins.compiler.its</invoker.junitPackageName>
</properties>

<contributors>
<contributor>
<name>Jan Sievers</name>
</contributor>
</contributors>

<repositories>
<repository>
<id>plexus.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/plexus-snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -127,31 +114,34 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-incremental</artifactId>
<version>1.1</version>
<exclusions>
<exclusion>
<artifactId>maven-core</artifactId>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</exclusion>
<exclusion>
<artifactId>maven-plugin-api</artifactId>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</exclusion>
<exclusion>
<artifactId>maven-shared-utils</artifactId>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.3.4</version>
<version>3.4.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -204,7 +194,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>4.0.0-alpha-1</version>
<version>${mavenPluginTestingHarnessVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -219,8 +209,33 @@ under the License.
<version>5.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<scope>test</scope>
</dependency>
</dependencies>

<repositories>
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>plexus.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/plexus-snapshots</url>
</repository>
</repositories>

<build>
<pluginManagement>
<plugins>
Expand All @@ -235,7 +250,6 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-bytecode-version</id>
Expand All @@ -256,7 +270,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -267,18 +281,24 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<configuration> <!-- remove after MPOM-269 -->
<configuration>
<!-- remove after MPOM-269 -->
<tagletArtifacts combine.self="override" />
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>${mavenPluginPluginVersion}</version>
</plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
Expand All @@ -292,6 +312,13 @@ under the License.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>**/*$*, unit/**</excludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
59 changes: 2 additions & 57 deletions src/it/MCOMPILER-157/annotation-verify/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,73 +31,18 @@ under the License.

<artifactId>annotation-verify</artifactId>
<packaging>maven-plugin</packaging>

<dependencies>
<dependency>
<groupId>org.issue</groupId>
<artifactId>annotation-processor</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>@mavenVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>@mavenVersion@</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-api-core</artifactId>
<version>@mavenVersion@</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
</exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Expand Down
Loading

0 comments on commit 7c95052

Please sign in to comment.