This is an automated email from the ASF dual-hosted git repository. pottlinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git
commit 20c06486c00830fa7574276118bfef9673a152ca Author: P. Ottlinger <[email protected]> AuthorDate: Fri Dec 24 00:18:12 2021 +0100 WHISKER-1: Temporarily deactivate pmd-plugin and fix maven reporting warning --- apache-whisker-maven-plugin/pom.xml | 40 +------ pom.xml | 211 ++++++++++++++++++------------------ 2 files changed, 107 insertions(+), 144 deletions(-) diff --git a/apache-whisker-maven-plugin/pom.xml b/apache-whisker-maven-plugin/pom.xml index 94956fe..d48ece1 100644 --- a/apache-whisker-maven-plugin/pom.xml +++ b/apache-whisker-maven-plugin/pom.xml @@ -176,53 +176,15 @@ <outputEncoding>${project.build.sourceEncoding}</outputEncoding> <inputEncoding>${project.build.sourceEncoding}</inputEncoding> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <!-- reporting plugins are configured according to new mvn3 standard --> - <reportPlugins> - <!-- Until Maven finds a way to allow inheritance... --> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.17</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkJavadoc>true</linkJavadoc> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>${mavenPluginPluginVersion}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> - </plugin> - </reportPlugins> </configuration> </plugin> </plugins> </build> <!-- - - ================================ Project information --> <name>Apache Whisker::Maven Plugin</name> <description>Apache Whisker Maven Plugin.</description> - <url>http://creadur.apache.org/whisker/apache-whisker-maven-plugin</url> + <url>https://creadur.apache.org/whisker/apache-whisker-maven-plugin</url> </project> diff --git a/pom.xml b/pom.xml index b74ffd1..555ad6d 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,109 @@ <!-- Cannot upgrade to 3.0.0 because it requires Java 7 --> <findbugsPluginVersion>2.5.5</findbugsPluginVersion> </properties> + <!-- reporting plugins are configured according to new mvn3 standard --> + <!-- Until Maven finds a way to allow inheritance, duplicated in plugin4maven --> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.12.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.4</version> + <configuration> + <aggregate>true</aggregate> + <linkJavadoc>true</linkJavadoc> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.17</version> + </plugin> + <!-- plugin> TODO fix https://stackoverflow.com/questions/61417986/pmd-plugin-fails-with-java-14-unsupported-targetjdk + <artifactId>maven-pmd-plugin</artifactId> + <version>3.1</version> + <configuration> + <linkXRef>true</linkXRef> + <sourceEncoding>utf-8</sourceEncoding> + <minimumTokens>100</minimumTokens> + <targetJdk>${target.jdk}</targetJdk> + <excludes> + <exclude>**/generated/**/*.java</exclude> + <exclude>**/target/clover/**/*.java</exclude> + </excludes> + </configuration> + </plugin --> + <!-- read changes.xml --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <version>2.10</version> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <!-- jdepend plugin --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + <version>2.0</version> + </plugin> + <!-- cobertura plugin not working as newer JDKs do not have tools.jar + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.7</version> + </plugin --> + <!-- catch code tags --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.4</version> + <configuration> + <tags> + <tag>TODO</tag> + <tag>todo</tag> + <tag>FIXME</tag> + <tag>fixme</tag> + <tag>REFACTOR</tag> + <tag>refactor</tag> + <tag>REVIEW</tag> + <tag>review</tag> + <tag>@todo</tag> + <tag>@deprecated</tag> + </tags> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugsPluginVersion}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.7</version> + </plugin> + </plugins> + </reporting> <!-- ================================ Build information --> <build> <defaultGoal>clean install</defaultGoal> @@ -146,108 +249,6 @@ <outputEncoding>${project.build.sourceEncoding}</outputEncoding> <inputEncoding>${project.build.sourceEncoding}</inputEncoding> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <!-- reporting plugins are configured according to new mvn3 standard --> - <!-- Until Maven finds a way to allow inheritance, duplicated in plugin4maven --> - <reportPlugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.4</version> - <configuration> - <aggregate>true</aggregate> - <linkJavadoc>true</linkJavadoc> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.17</version> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <!-- Later versions require Java 1.6+ --> - <version>3.1</version> - <configuration> - <linkXRef>true</linkXRef> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - <targetJdk>${target.jdk}</targetJdk> - <excludes> - <exclude>**/generated/**/*.java</exclude> - <exclude>**/target/clover/**/*.java</exclude> - </excludes> - </configuration> - </plugin> - <!-- read changes.xml --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>2.10</version> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <!-- jdepend plugin --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <!-- cobertura plugin not working as newer JDKs do not have tools.jar - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.7</version> - </plugin --> - <!-- catch code tags --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> - <configuration> - <tags> - <tag>TODO</tag> - <tag>todo</tag> - <tag>FIXME</tag> - <tag>fixme</tag> - <tag>REFACTOR</tag> - <tag>refactor</tag> - <tag>REVIEW</tag> - <tag>review</tag> - <tag>@todo</tag> - <tag>@deprecated</tag> - </tags> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugsPluginVersion}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> - </plugin> - </reportPlugins> </configuration> </plugin> <plugin> @@ -377,19 +378,19 @@ <!-- ================================ Project information --> <name>Apache Whisker</name> <description>Apache Whisker wrangles legal documentation for composed applications.</description> - <url>http://creadur.apache.org/whisker/</url> + <url>https://creadur.apache.org/whisker/</url> <inceptionYear>2011</inceptionYear> <licenses> <license> <name>Apache License, Version 2</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> <comments>An OSI approved open source license.</comments> </license> </licenses> <organization> <name>Apache Software Foundation</name> - <url>http://www.apache.org</url> + <url>https://www.apache.org</url> </organization> <!-- ================================ Environment --> <prerequisites>
