You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2021/08/13 19:32:02 UTC
[commons-rng] 02/12: Move Java 8 profile plugins to the main pom
This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git
commit 54bf1607ded7e5c8696bce516f0fe6921056951b
Author: Alex Herbert <ah...@apache.org>
AuthorDate: Fri Aug 13 19:08:07 2021 +0100
Move Java 8 profile plugins to the main pom
---
pom.xml | 206 ++++++++++++++++++++++++++--------------------------------------
1 file changed, 84 insertions(+), 122 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd2b217..9ebd193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,10 +89,10 @@
Temporary workaround?
-->
<commons.release.name>commons-rng-${project.version}</commons.release.name>
- <!-- Java8+ requires additional Javadoc qualifier for MathJax (default to empty). -->
- <allowscript.javadoc.qualifier />
- <!-- Invalid flag for old javadoc versions (default to empty). -->
- <doclint.javadoc.qualifier />
+ <!-- MathJax script inclusion requires additional Javadoc qualifier for Java8 as of 8u121 -->
+ <allowscript.javadoc.qualifier>--allow-script-in-comments</allowscript.javadoc.qualifier>
+ <!-- Check for all javadoc errors -->
+ <doclint.javadoc.qualifier>-Xdoclint:all</doclint.javadoc.qualifier>
<!-- Workaround to avoid the SVN site checkout in all modules.
This flag should be deactivated by child modules. -->
@@ -213,8 +213,56 @@
</ignorePathsToDelete>
</configuration>
</plugin>
- <!-- spotbugs-maven-plugin runs in JDK 8+ profile so not included here -->
- <!-- maven-checkstyle-plugin runs in JDK 8+ profile so not included here -->
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${commons.spotbugs.version}</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <excludeFilterFile>${rng.parent.dir}/src/main/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${rng.checkstyle.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${rng.checkstyle.dep.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <configLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${rng.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
+ <suppressionsLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <logViolationsToConsole>false</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ <resourceExcludes>NOTICE.txt,LICENSE.txt,**/pom.properties,**/resolver-status.properties,**/sha512.properties</resourceExcludes>
+ <excludes>**/jmh_generated/**.java</excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>${rng.pmd.version}</version>
@@ -333,8 +381,36 @@
<component>${rng.jira.component}</component>
</configuration>
</plugin>
- <!-- spotbugs-maven-plugin runs in JDK 8+ profile so not included here -->
- <!-- maven-checkstyle-plugin runs in JDK 8+ profile so not included here -->
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${commons.spotbugs.version}</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <excludeFilterFile>${rng.parent.dir}/src/main/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${rng.checkstyle.version}</version>
+ <configuration>
+ <configLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
+ <headerLocation>${rng.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
+ <suppressionsLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <includeResources>false</includeResources>
+ <excludes>**/jmh_generated/**.java</excludes>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>checkstyle</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>${rng.pmd.version}</version>
@@ -578,120 +654,6 @@ This is avoided by creating an empty directory when svn is not available.
</plugins>
</build>
</profile>
- <!-- Profile for pre-Java 8 builds. -->
- <profile>
- <id>pre-jdk8</id>
- <activation>
- <jdk>[1.7,1.8)</jdk>
- </activation>
- <build>
- <!-- Alter default goal to avoid javadoc generation.
- The inclusion of MathJax may require the 'allow-script-in-comments' flag
- depending on the JDK 7 release version. -->
- <defaultGoal>clean verify</defaultGoal>
- </build>
- </profile>
- <!-- Profile to allow the use of plugin versions that require Java 8+ -->
- <profile>
- <id>jdk8-plugins</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <properties>
- <!-- MathJax script inclusion requires additional Javadoc qualifier for Java8 as of 8u121 -->
- <allowscript.javadoc.qualifier>--allow-script-in-comments</allowscript.javadoc.qualifier>
- <!-- Check for all javadoc errors -->
- <doclint.javadoc.qualifier>-Xdoclint:all</doclint.javadoc.qualifier>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>${commons.spotbugs.version}</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <excludeFilterFile>${rng.parent.dir}/src/main/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${rng.checkstyle.version}</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>${rng.checkstyle.dep.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <configLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
- <headerLocation>${rng.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
- <suppressionsLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
- <enableRulesSummary>false</enableRulesSummary>
- <logViolationsToConsole>false</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- <resourceExcludes>NOTICE.txt,LICENSE.txt,**/pom.properties,**/resolver-status.properties,**/sha512.properties</resourceExcludes>
- <excludes>**/jmh_generated/**.java</excludes>
- </configuration>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <version>${commons.spotbugs.version}</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <excludeFilterFile>${rng.parent.dir}/src/main/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>${rng.checkstyle.version}</version>
- <configuration>
- <configLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
- <headerLocation>${rng.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
- <suppressionsLocation>${rng.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
- <enableRulesSummary>false</enableRulesSummary>
- <includeResources>false</includeResources>
- <excludes>**/jmh_generated/**.java</excludes>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>checkstyle</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
- </profile>
<profile>
<id>clirr-check</id>
<activation>