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/05/15 21:24:20 UTC
[maven-plugin-tools] branch MPLUGIN-397 created (now e3886f08)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MPLUGIN-397
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
at e3886f08 [MPLUGIN-397] Upgrade Parent to 36
This branch includes the following new commits:
new e3886f08 [MPLUGIN-397] 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-plugin-tools] 01/01: [MPLUGIN-397] 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 MPLUGIN-397
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit e3886f080cda0153fcc0c15d82784c55e5eea2e9
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun May 15 23:23:04 2022 +0200
[MPLUGIN-397] Upgrade Parent to 36
- fix javadocs
- remove l10n-maven-plugin from reports
- use plugins version from parent
---
maven-plugin-plugin/pom.xml | 24 -------------
.../maven/tools/plugin/util/stubs/MojoStub.java | 2 --
maven-plugin-tools-generators/pom.xml | 20 -----------
.../plugin/generator/stubs/MavenReportStub.java | 2 --
pom.xml | 40 ++--------------------
5 files changed, 3 insertions(+), 85 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 5f8b7d77..47f849fc 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -270,21 +270,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version>
- <!-- will use previous maven-plugin-plugin release to build current maven-plugin-plugin as configured in parent -->
<executions>
- <execution>
- <id>default-descriptor</id>
- <phase>process-classes</phase>
- </execution>
<execution>
<id>generated-helpmojo</id>
<goals>
<goal>helpmojo</goal>
</goals>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
</execution>
</executions>
</plugin>
@@ -296,7 +287,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.6.0</version><!-- cannot use ${mavenPluginToolsVersion} property because release plugin would try to update -->
<reportSets>
<reportSet>
<reports>
@@ -316,19 +306,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${mavenInvokerPluginVersion}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>l10n-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <configuration>
- <locales>
- <locale>de</locale>
- <locale>fr</locale>
- <locale>sv</locale>
- </locales>
- </configuration>
</plugin>
</plugins>
</reporting>
@@ -340,7 +317,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${mavenInvokerPluginVersion}</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MojoStub.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MojoStub.java
index d652afa0..f271b009 100644
--- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MojoStub.java
+++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/stubs/MojoStub.java
@@ -28,8 +28,6 @@ import org.apache.maven.plugin.logging.Log;
/**
* Dummy Mojo.
- *
- * @goal dummy
*/
public class MojoStub
extends AbstractMojo
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index bf703813..bab7ca7f 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -111,24 +111,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>l10n-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <configuration>
- <locales>
- <locale>de</locale>
- <locale>fr</locale>
- </locales>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
</project>
diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/stubs/MavenReportStub.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/stubs/MavenReportStub.java
index 936c230e..3b664c59 100644
--- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/stubs/MavenReportStub.java
+++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/stubs/MavenReportStub.java
@@ -28,8 +28,6 @@ import org.apache.maven.reporting.MavenReportException;
/**
* Dummy report.
- *
- * @goal dummyReport
*/
public class MavenReportStub
extends AbstractMavenReport
diff --git a/pom.xml b/pom.xml
index d337a021..5119c698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>34</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
+ <version>36</version>
+ <relativePath/>
</parent>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -80,7 +80,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-plugin-tools/</url>
+ <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-plugin-tools/</url>
</ciManagement>
<distributionManagement>
<site>
@@ -95,8 +95,6 @@
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
<mavenVersion>3.2.5</mavenVersion>
<antVersion>1.9.16</antVersion>
- <sisuVersion>0.3.5</sisuVersion>
- <mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
<asmVersion>9.2</asmVersion>
<project.build.outputTimestamp>2022-01-10T23:05:38Z</project.build.outputTimestamp>
@@ -172,11 +170,6 @@
</dependency>
<!-- plexus -->
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>${sisuVersion}</version>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
@@ -256,19 +249,6 @@
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- modello generate java sources with errors so do not fail -->
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.11.0</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -292,19 +272,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
</build>
<profiles>
@@ -366,7 +333,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>3.1.1</version>
<reportSets>
<reportSet>
<id>non-aggregate</id>