diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java index d3fa10727..2b12dc7c2 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java @@ -79,7 +79,6 @@ import org.apache.maven.settings.Settings; import org.apache.maven.shared.invoker.MavenInvocationException; import org.codehaus.plexus.components.interactivity.InputHandler; -import org.codehaus.plexus.languages.java.version.JavaVersion; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; @@ -193,9 +192,9 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo { private static final String CLIRR_MAVEN_PLUGIN_ARTIFACTID = "clirr-maven-plugin"; /** - * The latest Clirr Maven plugin version 2.2.2 * + * The latest Clirr Maven plugin version 2.8 * */ - private static final String CLIRR_MAVEN_PLUGIN_VERSION = "2.2.2"; + private static final String CLIRR_MAVEN_PLUGIN_VERSION = "2.8"; /** * The Clirr Maven plugin goal check * @@ -223,7 +222,7 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo { /** * Version to compare the current code against using the - * Clirr Maven Plugin. + * Clirr Maven Plugin. *
* See defaultSince. */ @@ -623,17 +622,14 @@ private void executeClirr() throws MavenInvocationException { String clirrGoal = getFullClirrGoal(); - // http://mojo.codehaus.org/clirr-maven-plugin/check-mojo.html + // https://www.mojohaus.org/clirr-maven-plugin/check-mojo.html File clirrTextOutputFile = FileUtils.createTempFile( "clirr", ".txt", new File(project.getBuild().getDirectory())); Properties properties = new Properties(); properties.put("textOutputFile", clirrTextOutputFile.getAbsolutePath()); properties.put("comparisonVersion", comparisonVersion); properties.put("failOnError", "false"); - if (JavaVersion.JAVA_SPECIFICATION_VERSION.isBefore("8")) { - // ensure that Java7 picks up TLSv1.2 when connecting with Central - properties.put("https.protocols", "TLSv1.2"); - } + properties.put("minSeverity", "info"); File invokerDir = new File(project.getBuild().getDirectory(), "invoker"); invokerDir.mkdirs(); @@ -715,7 +711,7 @@ private void parseClirrTextOutputFile(File clirrTextOutputFile) throws IOExcepti continue; } - // http://clirr.sourceforge.net/clirr-core/exegesis.html + // https://clirr.sourceforge.net/clirr-core/exegesis.html // 7011 - Method Added // 7012 - Method Added to Interface // 8000 - Class Added diff --git a/src/site/apt/examples/fix-javadocs.apt.vm b/src/site/apt/examples/fix-javadocs.apt.vm index be45ef074..d049204b8 100644 --- a/src/site/apt/examples/fix-javadocs.apt.vm +++ b/src/site/apt/examples/fix-javadocs.apt.vm @@ -49,8 +49,8 @@ Fixing Javadoc Comments selective tags like author, version, etc. You specify default value for some tags, for example, {{{../fix-mojo.html#defaultAuthor}\}}. - The goal can use Clirr ({{{http://clirr.sourceforge.net}}} via the - {{{http://mojo.codehaus.org/clirr-maven-plugin/}clirr-maven-plugin}} to add + The goal can use Clirr ({{{https://clirr.sourceforge.net}}} via the + {{{https://www.mojohaus.org/clirr-maven-plugin/}clirr-maven-plugin}} to add <@since> tags will be dynamically added for the current project version. You need to add the parameter (see below). @@ -105,8 +105,8 @@ mvn javadoc:fix -DcomparisonVersion=1.0 ** Using another Clirr version - By default, the and goals use the {{{https://www.mojohaus.org/clirr-maven-plugin}clirr-maven-plugin}}, - version <<<2.2.2>>>. To use another version, you need to add a dependency in the Javadoc plugin as shown here: + By default, the and goals use the {{{https://www.mojohaus.org/clirr-maven-plugin/}clirr-maven-plugin}}, + version <<<2.8>>>. To use another version, you need to add a dependency in the Javadoc plugin as shown here: +-----+ @@ -124,7 +124,7 @@ mvn javadoc:fix -DcomparisonVersion=1.0 org.codehaus.mojo clirr-maven-plugin - 2.3-SNAPSHOT + 2.9-SNAPSHOT