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/03/12 22:39:06 UTC
[maven-jxr] 01/01: [JXR-168] poms cleanup - use dependencyManagment if defined - reorder dependencies - follow convention for poms tag order
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch JXR-168
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit cb1fd9f135f7df2d92d7b6783952e50018df4d4c
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Mar 12 23:33:27 2022 +0100
[JXR-168] poms cleanup
- use dependencyManagment if defined
- reorder dependencies
- follow convention for poms tag order
---
maven-jxr-plugin/pom.xml | 119 +++++++++------------
.../org/apache/maven/plugin/jxr/JxrReportTest.java | 2 +-
maven-jxr/pom.xml | 20 ++--
pom.xml | 50 ++++++---
4 files changed, 95 insertions(+), 96 deletions(-)
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 43179a2..3dfe257 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -43,47 +43,6 @@ under the License.
<maven>${mavenVersion}</maven>
</prerequisites>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <!--
- This file is in a format that doesn't support comments, so a
- license header can not be applied.
- -->
- <exclude>src/test/resources/unit/default-configuration/javadoc-files/apidocs/package-list</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -93,6 +52,11 @@ under the License.
<!-- maven -->
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
@@ -117,23 +81,9 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- shared -->
- <!-- overwrite from maven-reporting-impl -->
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>2.8</version><!-- like Maven 3.2.5 -->
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -146,11 +96,8 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>2.8</version><!-- like Maven 3.2.5 -->
- </dependency>
+
+ <!-- shared utils -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-java</artifactId>
@@ -160,12 +107,13 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
+ <!-- testing -->
<dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
@@ -183,8 +131,45 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generated-helpmojo</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!--
+ This file is in a format that doesn't support comments, so a
+ license header can not be applied.
+ -->
+ <exclude>src/test/resources/unit/default-configuration/javadoc-files/apidocs/package-list</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<plugins>
<plugin>
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
index 3fab3fa..023938b 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
@@ -19,8 +19,8 @@ package org.apache.maven.plugin.jxr;
* under the License.
*/
-import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
diff --git a/maven-jxr/pom.xml b/maven-jxr/pom.xml
index 0116229..f7119ff 100644
--- a/maven-jxr/pom.xml
+++ b/maven-jxr/pom.xml
@@ -69,20 +69,11 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- <version>0.3.5</version>
- <executions>
- <execution>
- <id>index-project</id>
- <goals>
- <goal>main-index</goal>
- <goal>test-index</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -91,22 +82,18 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
</dependency>
<dependency>
@@ -114,5 +101,10 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index d27aacc..0244ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <sitePluginVersion>3.9.1</sitePluginVersion>
+ <sitePluginVersion>3.11.0</sitePluginVersion>
<maven.site.path>jxr-archives/jxr-LATEST</maven.site.path>
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
<project.build.outputTimestamp>2021-04-18T19:03:41Z</project.build.outputTimestamp>
@@ -87,10 +87,14 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- <version>4.13.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -102,18 +106,36 @@ under the License.
<artifactId>plexus-utils</artifactId>
<version>3.4.1</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ </dependency>
+
+ <!-- override transitive dependency with security issues -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.32</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<pluginManagement>
<plugins>