RAT-196: Apply minor refactoring to pom.xml
(thanks to Karl Heinz Marbaise)
git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1666840 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index e1994a3..c90b48d 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -18,6 +18,8 @@
Workaround for https://jira.codehaus.org/browse/MANIMALSNIFFER-45
(thanks to Mark Thomas)
Improvement
+ * [RAT-196] - Minor refactoring in pom.xml.
+ (thanks to Karl Heinz Marbaise)
* [RAT-194] - Upgrade to Doxia 1.6 if called directly, does not affect problems reported in RAT-158. Minor improvements.
(thanks to Hervé Boutemy)
* [RAT-61] - List files with unapproved licenses in Maven output
diff --git a/apache-rat-plugin/pom.xml b/apache-rat-plugin/pom.xml
index 31f60db..259e2cc 100644
--- a/apache-rat-plugin/pom.xml
+++ b/apache-rat-plugin/pom.xml
@@ -56,10 +56,27 @@
</resources>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <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>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ <!-- to generate help goal -->
+ <execution>
+ <id>help-goal</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -79,30 +96,7 @@
<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>
- <!-- to generate help goal -->
- <execution>
- <id>help-goal</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>${mavenInvokerPluginVersion}</version>
<configuration>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/invoker</cloneProjectsTo>
diff --git a/pom.xml b/pom.xml
index 919f6e0..0f1661a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,9 +75,7 @@
<rat.site.name>Apache Rat Website</rat.site.name>
<rat.site.id>org.apache.rat.site</rat.site.id>
<!-- maven plugin versions -->
- <mavenInvokerPluginVersion>1.9</mavenInvokerPluginVersion>
<mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
- <surefire.version>2.17</surefire.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -171,11 +169,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<tags>
@@ -292,11 +285,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<configuration>
