You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/04/26 19:34:16 UTC
[maven-release] branch MRELEASE-1086 created (now c1647a36)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MRELEASE-1086
in repository https://gitbox.apache.org/repos/asf/maven-release.git
at c1647a36 [MRELEASE-1086] Upgrade Parent to 36
This branch includes the following new commits:
new c1647a36 [MRELEASE-1086] Upgrade Parent to 36
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-release] 01/01: [MRELEASE-1086] Upgrade Parent to 36
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MRELEASE-1086
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit c1647a367aad0d66b52553288e1d8027cba19759
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Apr 26 21:33:58 2022 +0200
[MRELEASE-1086] Upgrade Parent to 36
---
maven-release-manager/pom.xml | 1 -
maven-release-plugin/pom.xml | 13 ++-----------
.../maven-release-oddeven-policy/pom.xml | 4 ++++
pom.xml | 18 ++++++++++--------
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 8cad7a84..19449fc2 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -203,7 +203,6 @@
<configuration>
<version>3.0.0</version>
<packageWithVersion>false</packageWithVersion>
- <useJava5>true</useJava5>
<models>
<model>src/main/mdo/release-descriptor.mdo</model>
</models>
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index 7d722ed5..c9692080 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -38,10 +38,6 @@
<maven>${mavenVersion}</maven>
</prerequisites>
- <properties>
- <mavenPluginPluginVersion>3.6.4</mavenPluginPluginVersion>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -130,10 +126,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
<executions>
<execution>
<id>mojo-descriptor</id>
@@ -182,7 +174,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginPluginVersion}</version>
</plugin>
</plugins>
</reporting>
@@ -198,13 +189,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.2</version>
<executions>
<execution>
<id>integration-test-prepare</id>
<goals>
<goal>install</goal>
- <goal>run</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
diff --git a/maven-release-policies/maven-release-oddeven-policy/pom.xml b/maven-release-policies/maven-release-oddeven-policy/pom.xml
index 896d8cb6..4e4df364 100644
--- a/maven-release-policies/maven-release-oddeven-policy/pom.xml
+++ b/maven-release-policies/maven-release-oddeven-policy/pom.xml
@@ -46,6 +46,10 @@
<artifactId>maven-release-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
diff --git a/pom.xml b/pom.xml
index f1fa18a0..1a6d09c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>36</version>
<relativePath />
</parent>
@@ -107,13 +107,9 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.1.2</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>2.1.1</version>
</plugin>
</plugins>
</pluginManagement>
@@ -125,11 +121,13 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -141,21 +139,25 @@
<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-repository-metadata</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>