Skip to content

Commit 2e63535

Browse files
garydgregorygarydgregory
committed
Replace CLIRR with JApiCmp.
- Remove old FindBugs report now that we have SpotBugs. - Fix Javadoc JDK link.
1 parent 9e801d9 commit 2e63535

3 files changed

Lines changed: 25 additions & 16 deletions

File tree

‎pom.xml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,11 @@
195195
<maven.compiler.target>1.7</maven.compiler.target>
196196
<commons.componentid>cli</commons.componentid>
197197
<commons.module.name>org.apache.commons.cli</commons.module.name>
198-
<commons.release.version>1.4</commons.release.version>
198+
<commons.release.version>1.5</commons.release.version>
199199
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
200+
<commons.release.isDistModule>true</commons.release.isDistModule>
201+
<commons.rc.version>RC1</commons.rc.version>
202+
<commons.bc.version>1.4</commons.bc.version>
200203
<commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>
201204
<commons.jira.id>CLI</commons.jira.id>
202205
<commons.jira.pid>12310463</commons.jira.pid>
@@ -208,16 +211,21 @@
208211
<commons.checkstyle-plugin.version>3.1.2</commons.checkstyle-plugin.version>
209212
<commons.checkstyle.impl.version>9.0</commons.checkstyle.impl.version>
210213
<commons.javadoc.version>3.3.1</commons.javadoc.version>
214+
<commons.javadoc.java.link>${commons.javadoc7.java.link}</commons.javadoc.java.link>
211215
<commons.jacoco.version>0.8.7</commons.jacoco.version>
212216
<commons.surefire-report.version>3.0.0-M5</commons.surefire-report.version>
213217
<commons.surefire.version>3.0.0-M5</commons.surefire.version>
214218
<spotbugs.plugin.version>4.4.1</spotbugs.plugin.version>
215219
<spotbugs.impl.version>4.4.1</spotbugs.impl.version>
216220
<commons.animal-sniffer.version>1.20</commons.animal-sniffer.version>
221+
<commons.japicmp.version>0.15.3</commons.japicmp.version>
222+
<clirr.skip>true</clirr.skip>
223+
<findbugs.skip>true</findbugs.skip>
224+
<japicmp.skip>false</japicmp.skip>
217225
</properties>
218226

219227
<build>
220-
<defaultGoal>clean package apache-rat:check clirr:check checkstyle:check spotbugs:check javadoc:javadoc</defaultGoal>
228+
<defaultGoal>clean package apache-rat:check japicmp:cmp checkstyle:check spotbugs:check javadoc:javadoc</defaultGoal>
221229
<pluginManagement>
222230
<plugins>
223231
<plugin>
@@ -306,6 +314,10 @@
306314
<source>7</source>
307315
</configuration>
308316
</plugin>
317+
<plugin>
318+
<groupId>com.github.siom79.japicmp</groupId>
319+
<artifactId>japicmp-maven-plugin</artifactId>
320+
</plugin>
309321
</plugins>
310322
</build>
311323

@@ -317,7 +329,7 @@
317329
<configuration>
318330
<linksource>true</linksource>
319331
<links>
320-
<link>http://download.oracle.com/javase/6/docs/api</link>
332+
<link>${commons.javadoc.java.link}</link>
321333
</links>
322334
</configuration>
323335
</plugin>
@@ -340,23 +352,17 @@
340352
</excludes>
341353
</configuration>
342354
</plugin>
343-
<plugin>
344-
<groupId>org.codehaus.mojo</groupId>
345-
<artifactId>findbugs-maven-plugin</artifactId>
346-
<version>${commons.findbugs.version}</version>
347-
<configuration>
348-
<threshold>Normal</threshold>
349-
<effort>Default</effort>
350-
<excludeFilterFile>${basedir}/src/conf/spotbugs-exclude-filter.xml</excludeFilterFile>
351-
</configuration>
352-
</plugin>
353355
<plugin>
354356
<artifactId>maven-pmd-plugin</artifactId>
355357
<version>3.15.0</version>
356358
<configuration>
357359
<targetJdk>${maven.compiler.target}</targetJdk>
358360
</configuration>
359361
</plugin>
362+
<plugin>
363+
<groupId>com.github.siom79.japicmp</groupId>
364+
<artifactId>japicmp-maven-plugin</artifactId>
365+
</plugin>
360366
</plugins>
361367
</reporting>
362368

‎src/changes/changes.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</properties>
2323
<body>
2424

25-
<release version="1.5" date="tba" description="tba">
25+
<release version="1.5" date="tba" description="New features and bug fixes (Java 7)">
2626
<!-- FIX -->
2727
<action type="fix" dev="ggregory" due-to="Gary Gregory">
2828
Fix NPE in DefaultParser.isLongOption(String).
@@ -33,6 +33,9 @@
3333
<action type="fix" dev="ggregory" due-to="Gary Gregory">
3434
Replace deprecated FindBugs with SpotBugs.
3535
</action>
36+
<action type="fix" dev="ggregory" due-to="Gary Gregory">
37+
Replace CLIRR with JApiCmp.
38+
</action>
3639
<action type="fix" dev="ggregory" due-to="Elliotte Rusty Harold">
3740
Option Javadocs grammar nits #55.
3841
</action>

‎src/site/site.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<item name="Getting started" href="/introduction.html"/>
3737
<item name="Usage scenarios" href="/usage.html"/>
3838
<item name="Option properties" href="/properties.html"/>
39-
<item name="Javadoc (Current ${project.version})" href="/apidocs/index.html"/>
40-
<item name="Javadoc (1.4)" href="/javadocs/api-release/index.html"/>
39+
<item name="Javadoc" href="/apidocs/index.html"/>
40+
<item name="Javadoc Archive" href="https://javadoc.io/doc/commons-cli/commons-cli/latest/index.html"/>
4141
</menu>
4242

4343
</body>

0 commit comments

Comments
 (0)