This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new 2e63535 Replace CLIRR with JApiCmp.
2e63535 is described below
commit 2e6353579bfb648a8599dc348328cbb74d1e7a71
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Oct 3 15:18:05 2021 -0400
Replace CLIRR with JApiCmp.
- Remove old FindBugs report now that we have SpotBugs.
- Fix Javadoc JDK link.
---
pom.xml | 32 +++++++++++++++++++-------------
src/changes/changes.xml | 5 ++++-
src/site/site.xml | 4 ++--
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f0b89c..587a05e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,8 +195,11 @@
<maven.compiler.target>1.7</maven.compiler.target>
<commons.componentid>cli</commons.componentid>
<commons.module.name>org.apache.commons.cli</commons.module.name>
- <commons.release.version>1.4</commons.release.version>
+ <commons.release.version>1.5</commons.release.version>
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
+ <commons.release.isDistModule>true</commons.release.isDistModule>
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.bc.version>1.4</commons.bc.version>
<commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>
<commons.jira.id>CLI</commons.jira.id>
<commons.jira.pid>12310463</commons.jira.pid>
@@ -208,16 +211,21 @@
<commons.checkstyle-plugin.version>3.1.2</commons.checkstyle-plugin.version>
<commons.checkstyle.impl.version>9.0</commons.checkstyle.impl.version>
<commons.javadoc.version>3.3.1</commons.javadoc.version>
+
<commons.javadoc.java.link>${commons.javadoc7.java.link}</commons.javadoc.java.link>
<commons.jacoco.version>0.8.7</commons.jacoco.version>
<commons.surefire-report.version>3.0.0-M5</commons.surefire-report.version>
<commons.surefire.version>3.0.0-M5</commons.surefire.version>
<spotbugs.plugin.version>4.4.1</spotbugs.plugin.version>
<spotbugs.impl.version>4.4.1</spotbugs.impl.version>
<commons.animal-sniffer.version>1.20</commons.animal-sniffer.version>
+ <commons.japicmp.version>0.15.3</commons.japicmp.version>
+ <clirr.skip>true</clirr.skip>
+ <findbugs.skip>true</findbugs.skip>
+ <japicmp.skip>false</japicmp.skip>
</properties>
<build>
- <defaultGoal>clean package apache-rat:check clirr:check checkstyle:check
spotbugs:check javadoc:javadoc</defaultGoal>
+ <defaultGoal>clean package apache-rat:check japicmp:cmp checkstyle:check
spotbugs:check javadoc:javadoc</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
@@ -306,6 +314,10 @@
<source>7</source>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
@@ -317,7 +329,7 @@
<configuration>
<linksource>true</linksource>
<links>
- <link>http://download.oracle.com/javase/6/docs/api</link>
+ <link>${commons.javadoc.java.link}</link>
</links>
</configuration>
</plugin>
@@ -341,22 +353,16 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>${commons.findbugs.version}</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
-
<excludeFilterFile>${basedir}/src/conf/spotbugs-exclude-filter.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.15.0</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 655bf77..9fbeb90 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,7 @@
</properties>
<body>
- <release version="1.5" date="tba" description="tba">
+ <release version="1.5" date="tba" description="New features and bug fixes
(Java 7)">
<!-- FIX -->
<action type="fix" dev="ggregory" due-to="Gary Gregory">
Fix NPE in DefaultParser.isLongOption(String).
@@ -33,6 +33,9 @@
<action type="fix" dev="ggregory" due-to="Gary Gregory">
Replace deprecated FindBugs with SpotBugs.
</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Replace CLIRR with JApiCmp.
+ </action>
<action type="fix" dev="ggregory" due-to="Elliotte Rusty Harold">
Option Javadocs grammar nits #55.
</action>
diff --git a/src/site/site.xml b/src/site/site.xml
index 0728802..772d966 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,8 +36,8 @@
<item name="Getting started" href="/introduction.html"/>
<item name="Usage scenarios" href="/usage.html"/>
<item name="Option properties" href="/properties.html"/>
- <item name="Javadoc (Current ${project.version})"
href="/apidocs/index.html"/>
- <item name="Javadoc (1.4)"
href="/javadocs/api-release/index.html"/>
+ <item name="Javadoc" href="/apidocs/index.html"/>
+ <item name="Javadoc Archive"
href="https://javadoc.io/doc/commons-cli/commons-cli/latest/index.html"/>
</menu>
</body>
