Skip to content

Commit d810ad8

Browse files
committed
[MJAVADOC-801] Upgrade to Clirr Maven Plugin 2.8 in fix goals
This closes #296
1 parent 7e5dea4 commit d810ad8

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
193193
private static final String CLIRR_MAVEN_PLUGIN_ARTIFACTID = "clirr-maven-plugin";
194194

195195
/**
196-
* The latest Clirr Maven plugin version <code>2.2.2</code> *
196+
* The latest Clirr Maven plugin version <code>2.8</code> *
197197
*/
198-
private static final String CLIRR_MAVEN_PLUGIN_VERSION = "2.2.2";
198+
private static final String CLIRR_MAVEN_PLUGIN_VERSION = "2.8";
199199

200200
/**
201201
* The Clirr Maven plugin goal <code>check</code> *
@@ -228,7 +228,7 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
228228

229229
/**
230230
* Version to compare the current code against using the
231-
* <a href="http://mojo.codehaus.org/clirr-maven-plugin/">Clirr Maven Plugin</a>.
231+
* <a href="https://www.mojohaus.org/clirr-maven-plugin/">Clirr Maven Plugin</a>.
232232
* <br/>
233233
* See <a href="#defaultSince">defaultSince</a>.
234234
*/
@@ -632,17 +632,13 @@ private void executeClirr() throws MavenInvocationException {
632632

633633
String clirrGoal = getFullClirrGoal();
634634

635-
// http://mojo.codehaus.org/clirr-maven-plugin/check-mojo.html
635+
// https://www.mojohaus.org/clirr-maven-plugin/check-mojo.html
636636
File clirrTextOutputFile = FileUtils.createTempFile(
637637
"clirr", ".txt", new File(project.getBuild().getDirectory()));
638638
Properties properties = new Properties();
639639
properties.put("textOutputFile", clirrTextOutputFile.getAbsolutePath());
640640
properties.put("comparisonVersion", comparisonVersion);
641641
properties.put("failOnError", "false");
642-
if (JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("8")) {
643-
// ensure that Java7 picks up TLSv1.2 when connecting with Central
644-
properties.put("https.protocols", "TLSv1.2");
645-
}
646642

647643
File invokerDir = new File(project.getBuild().getDirectory(), "invoker");
648644
invokerDir.mkdirs();
@@ -724,7 +720,7 @@ private void parseClirrTextOutputFile(File clirrTextOutputFile) throws IOExcepti
724720
continue;
725721
}
726722

727-
// http://clirr.sourceforge.net/clirr-core/exegesis.html
723+
// https://clirr.sourceforge.net/clirr-core/exegesis.html
728724
// 7011 - Method Added
729725
// 7012 - Method Added to Interface
730726
// 8000 - Class Added

src/site/apt/examples/fix-javadocs.apt.vm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Fixing Javadoc Comments
4949
selective tags like author, version, etc.
5050
You specify default value for some tags, for example, {{{../fix-mojo.html#defaultAuthor}\<defaultAuthor/\>}}.
5151

52-
The <javadoc:fix> goal can use Clirr ({{{http://clirr.sourceforge.net}}} via the
53-
{{{http://mojo.codehaus.org/clirr-maven-plugin/}clirr-maven-plugin}} to add
52+
The <javadoc:fix> goal can use Clirr ({{{https://clirr.sourceforge.net}}} via the
53+
{{{https://www.mojohaus.org/clirr-maven-plugin/}clirr-maven-plugin}} to add
5454
<@since> tags will be dynamically added for the current
5555
project version. You need to add the <comparisonVersion> parameter (see below).
5656

@@ -105,8 +105,8 @@ mvn javadoc:fix -DcomparisonVersion=1.0
105105

106106
** Using another Clirr version
107107

108-
By default, the <fix> and <test-fix> goals use the {{{https://www.mojohaus.org/clirr-maven-plugin}clirr-maven-plugin}},
109-
version <<<2.2.2>>>. To use another version, you need to add a dependency in the Javadoc plugin as shown here:
108+
By default, the <fix> and <test-fix> goals use the {{{https://www.mojohaus.org/clirr-maven-plugin/}clirr-maven-plugin}},
109+
version <<<2.8>>>. To use another version, you need to add a dependency in the Javadoc plugin as shown here:
110110

111111
+-----+
112112
<project>
@@ -124,7 +124,7 @@ mvn javadoc:fix -DcomparisonVersion=1.0
124124
<dependency>
125125
<groupId>org.codehaus.mojo</groupId>
126126
<artifactId>clirr-maven-plugin</artifactId>
127-
<version>2.3-SNAPSHOT</version>
127+
<version>2.9-SNAPSHOT</version>
128128
</dependency>
129129
</dependencies>
130130
</plugin>

0 commit comments

Comments
 (0)