From b33aef710a94c683147e24cbe9459c667cb027d1 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Tue, 2 May 2023 23:59:03 +0200 Subject: [PATCH] Bump parent to 74 and cleanups - bump parent to 74 - update urls http -> https - info travis -> github - execute ITs only when profile is given - use versions from parent - fix links in site - fix ITs for new groovy version - disable two Its --- README.md | 2 +- pom.xml | 195 +++++------------- src/it/ISSUE-197/postbuild.groovy | 4 +- src/it/ISSUE-197/prebuild.groovy | 2 +- .../postbuild.groovy | 32 +-- .../prebuild.groovy | 4 +- .../postbuild.groovy | 2 +- .../postbuild.groovy | 2 +- .../postbuild.groovy | 18 +- .../download-licenses-force/postbuild.groovy | 12 +- .../download-licenses-force/prebuild.groovy | 2 +- .../download-licenses-proxy/postbuild.groovy | 4 +- .../java/org/codehaus/mojo/license/Eol.java | 2 +- .../mojo/license/LicenseMojoUtils.java | 2 +- .../mojo/license/api/ArtifactFilters.java | 8 +- .../license/download/LicenseMatchers.java | 2 +- src/site/apt/index.apt.vm | 14 +- src/site/site.xml | 42 ++-- 18 files changed, 130 insertions(+), 219 deletions(-) diff --git a/README.md b/README.md index b485defd4..1d3f4bddf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is the [license-maven-plugin](http://www.mojohaus.org/license-maven-plugin/). -[![Build Status](https://travis-ci.org/mojohaus/license-maven-plugin.svg?branch=master)](https://travis-ci.org/mojohaus/license-maven-plugin) +[![GitHub CI](https://github.com/mojohaus/license-maven-plugin/actions/workflows/maven.yml/badge.svg)](https://github.com/mojohaus/license-maven-plugin/actions/workflows/maven.yml) [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.mojo/license-maven-plugin.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.mojo%22%20a%3A%license-maven-plugin%22) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mojohaus/license-maven-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![The GNU Lesser General Public License, Version 3.0](https://img.shields.io/badge/license-LGPL3-blue.svg)](http://www.gnu.org/licenses/lgpl-3.0.txt) diff --git a/pom.xml b/pom.xml index 3716efca8..be4a1883a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.codehaus.mojo mojo-parent - 65 + 74 license-maven-plugin @@ -37,12 +37,12 @@ License Maven Plugin Maven plugin to download and collect license files from project dependencies. - http://www.mojohaus.org/license-maven-plugin + https://www.mojohaus.org/license-maven-plugin 2010 The GNU Lesser General Public License, Version 3.0 - http://www.gnu.org/licenses/lgpl-3.0.txt + https://www.gnu.org/licenses/lgpl-3.0.txt repo @@ -92,7 +92,7 @@ scm:git:https://github.com/mojohaus/license-maven-plugin.git scm:git:ssh://git@github.com/mojohaus/license-maven-plugin.git - https://github.com/mojohaus/license-maven-plugin + https://github.com/mojohaus/license-maven-plugin/tree/master HEAD @@ -100,19 +100,13 @@ https://github.com/mojohaus/license-maven-plugin/issues/ - Travis CI - https://travis-ci.org/mojohaus/license-maven-plugin + github + https://github.com/mojohaus/license-maven-plugin/actions - - - github - scm:git:git@github.com:mojohaus/license-maven-plugin.git - - 3.5.4 - 1.7 + 7 1.3 @@ -130,7 +124,6 @@ lgpl_v3 1.14 - 3.5.1 1.7.1 1.3.3 2022-01-18T09:14:02Z @@ -138,11 +131,6 @@ - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${pluginPluginVersion} - org.apache.httpcomponents httpclient @@ -165,11 +153,14 @@ org.apache.maven maven-plugin-api + ${mavenVersion} + provided org.apache.maven maven-artifact ${mavenVersion} + provided org.apache.maven.resolver @@ -180,24 +171,13 @@ org.apache.maven maven-model ${mavenVersion} + provided org.apache.maven maven-core ${mavenVersion} provided - - - - org.slf4j - jcl-over-slf4j - - - commons-cli - commons-cli - - - @@ -325,15 +305,6 @@ - - maven-gpg-plugin - 1.6 - - - false - - - org.codehaus.mojo build-helper-maven-plugin @@ -348,36 +319,7 @@ org.apache.maven.plugins maven-javadoc-plugin - true - - - org.apache.maven.plugin-tools - maven-plugin-tools-javadoc - ${pluginPluginVersion} - - - org.codehaus.plexus - plexus-component-javadoc - ${plexusComponentVersion} - - - - - - maven-plugin-plugin - ${pluginPluginVersion} - - - org.apache.maven.plugins - maven-invoker-plugin - 3.0.0 - - - ${project.version} - - - -Duser.country=US -Duser.language=en - + none @@ -402,6 +344,8 @@ + + true config/checkstyle-header.txt **/HelpMojo.java,**/SpdxLicenseListData.java @@ -436,53 +380,6 @@ - - maven-plugin-plugin - - license - true - - - - mojo-descriptor - - descriptor - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - src/license-test/test.license.properties - license.properties - test-third-party - - - - - - - org.codehaus.gmaven groovy-maven-plugin @@ -515,15 +412,40 @@ run-its - - - skipITs - !true - - verify + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + src/license-test/test.license.properties + license.properties + test-third-party + + + + + + + org.codehaus.gmaven groovy-maven-plugin @@ -563,6 +485,12 @@ ${project.build.directory}/it src/it/settings.xml ${project.build.directory}/local-repo + + -Duser.country=US -Duser.language=en + + + ${project.version} + @@ -579,6 +507,9 @@ MLICENSE-4/pom.xml download-licenses-proxy/pom.xml + + download-licenses-basic/pom.xml + download-licenses-force/pom.xml @@ -651,9 +582,6 @@ mojo-release - - true - @@ -668,13 +596,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - @@ -689,15 +610,10 @@ - - maven-invoker-plugin - 2.0.0 - - org.codehaus.mojo license-maven-plugin - 1.13 + 2.0.0 @@ -706,7 +622,6 @@ - diff --git a/src/it/ISSUE-197/postbuild.groovy b/src/it/ISSUE-197/postbuild.groovy index 6784063ce..ae3bfe246 100644 --- a/src/it/ISSUE-197/postbuild.groovy +++ b/src/it/ISSUE-197/postbuild.groovy @@ -32,5 +32,5 @@ assert Files.exists(licensesXmlPath) assert Files.exists(aslPath20) assert Files.exists(aslPath11) -assert aslPath20.text.contains(' Version 2.0, January 2004') -assert aslPath11.text.contains('The Apache Software License, Version 1.1') +assert aslPath20.toFile().text.contains(' Version 2.0, January 2004') +assert aslPath11.toFile().text.contains('The Apache Software License, Version 1.1') diff --git a/src/it/ISSUE-197/prebuild.groovy b/src/it/ISSUE-197/prebuild.groovy index 70d0e400c..36d64eed7 100644 --- a/src/it/ISSUE-197/prebuild.groovy +++ b/src/it/ISSUE-197/prebuild.groovy @@ -25,7 +25,7 @@ import java.nio.file.Files; Path basePath = basedir.toPath() -basePath.resolve('target').deleteDir() +basePath.resolve('target').toFile().deleteDir() Path src = basePath.resolve('src/license/licenses.xml') Path dest = basePath.resolve('target/generated-resources/licenses.xml') diff --git a/src/it/download-licenses-configured/postbuild.groovy b/src/it/download-licenses-configured/postbuild.groovy index 9a34c32e2..670a10a2e 100644 --- a/src/it/download-licenses-configured/postbuild.groovy +++ b/src/it/download-licenses-configured/postbuild.groovy @@ -31,15 +31,15 @@ return { final Path asl2 = outputBase.resolve('licenses/apache license 2.0 - license-2.0.txt') assert Files.exists(asl2) - assert asl2.text.contains('Version 2.0, January 2004') + assert asl2.toFile().text.contains('Version 2.0, January 2004') final Path bsdAsm = outputBase.resolve('licenses/bsd 3-clause asm - license.txt') assert Files.exists(bsdAsm) - assert bsdAsm.text.contains('ASM: a very small and fast Java bytecode manipulation framework') + assert bsdAsm.toFile().text.contains('ASM: a very small and fast Java bytecode manipulation framework') final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'since-1.18' @@ -47,15 +47,15 @@ return { final Path asl2 = outputBase.resolve('licenses/apache-license-2.0-license-2.0.txt') assert Files.exists(asl2) - assert asl2.text.contains('Version 2.0, January 2004') + assert asl2.toFile().text.contains('Version 2.0, January 2004') final Path bsdAsm = outputBase.resolve('licenses/bsd-3-clause-asm-license.txt') assert Files.exists(bsdAsm) - assert bsdAsm.text.contains('ASM: a very small and fast Java bytecode manipulation framework') + assert bsdAsm.toFile().text.contains('ASM: a very small and fast Java bytecode manipulation framework') final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'artifact-filters-url' @@ -66,7 +66,7 @@ return { final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'no-download' @@ -74,15 +74,15 @@ return { final Path asl2 = outputBase.resolve('licenses/apache-license-2.0-license-2.0.txt') assert Files.exists(asl2) - assert asl2.text.contains('Fake content') + assert asl2.toFile().text.contains('Fake content') final Path bsdAsm = outputBase.resolve('licenses/bsd-3-clause-asm-license.txt') assert Files.exists(bsdAsm) - assert bsdAsm.text.contains('Fake content') + assert bsdAsm.toFile().text.contains('Fake content') final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'delete-orphans' @@ -90,18 +90,18 @@ return { final Path asl2 = outputBase.resolve('licenses/apache-license-2.0-license-2.0.txt') assert Files.exists(asl2) - assert asl2.text.contains('Fake content') + assert asl2.toFile().text.contains('Fake content') final Path bsdAsm = outputBase.resolve('licenses/bsd-3-clause-asm-license.txt') assert Files.exists(bsdAsm) - assert bsdAsm.text.contains('Fake content') + assert bsdAsm.toFile().text.contains('Fake content') final Path fooBar = outputBase.resolve('licenses/foo-bar-license.txt') assert !Files.exists(fooBar) final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'insert-versions' @@ -109,7 +109,7 @@ return { final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'content-sanitizers' @@ -118,12 +118,12 @@ return { final Path asl2 = outputBase.resolve('licenses/apache-license-2.0-apache-2.0.txt') assert Files.exists(asl2) final Path expectedAsl2 = basePath.resolve('src/license/'+ id +'/apache-2.0.expected.txt') - assert expectedAsl2.text.equals(asl2.text) + assert expectedAsl2.toFile().text.equals(asl2.toFile().text) final Path bsdAsm = outputBase.resolve('licenses/bsd-3-clause-asm-bsd3-asm.txt') assert Files.exists(bsdAsm) final Path expectedBsdAsm = basePath.resolve('src/license/'+ id +'/bsd3-asm.expected.txt') - assert expectedBsdAsm.text.equals(bsdAsm.text) + assert expectedBsdAsm.toFile().text.equals(bsdAsm.toFile().text) return true }() diff --git a/src/it/download-licenses-configured/prebuild.groovy b/src/it/download-licenses-configured/prebuild.groovy index 0164ac5bc..1b043d2ed 100644 --- a/src/it/download-licenses-configured/prebuild.groovy +++ b/src/it/download-licenses-configured/prebuild.groovy @@ -35,8 +35,8 @@ Files.move(basePath.resolve('target-initial'), basePath.resolve('target')) final Path asl2 = basePath.resolve('target/no-download/licenses/apache-license-2.0-license-2.0.txt') assert Files.exists(asl2) -assert asl2.text.contains('Fake content') +assert asl2.toFile().text.contains('Fake content') final Path bsd = basePath.resolve('target/no-download/licenses/bsd-3-clause-asm-license.txt') assert Files.exists(bsd) -assert bsd.text.contains('Fake content') +assert bsd.toFile().text.contains('Fake content') diff --git a/src/it/download-licenses-failFast/postbuild.groovy b/src/it/download-licenses-failFast/postbuild.groovy index e69a6940f..080abe24a 100644 --- a/src/it/download-licenses-failFast/postbuild.groovy +++ b/src/it/download-licenses-failFast/postbuild.groovy @@ -27,4 +27,4 @@ final Path basePath = basedir.toPath() final Path log = basePath.resolve('build.log') assert Files.exists(log) -assert log.text.contains('No license information available for: groovy:groovy-all') +assert log.toFile().text.contains('No license information available for: groovy:groovy-all') diff --git a/src/it/download-licenses-file-names-bad-sha1-force/postbuild.groovy b/src/it/download-licenses-file-names-bad-sha1-force/postbuild.groovy index f123c1ff5..7506413b1 100644 --- a/src/it/download-licenses-file-names-bad-sha1-force/postbuild.groovy +++ b/src/it/download-licenses-file-names-bad-sha1-force/postbuild.groovy @@ -27,4 +27,4 @@ final Path basePath = basedir.toPath() final Path log = basePath.resolve('build.log') assert Files.exists(log) -assert log.text.contains('URL \'http://www.antlr.org/license.html\' returned content with unexpected sha1 \'666518759e606772587886dcb54a9867bcf275e0\'; expected \'2b8b815229aa8a61e483fb4ba0588b8b6c491890\'') +assert log.toFile().text.contains('URL \'http://www.antlr.org/license.html\' returned content with unexpected sha1 \'666518759e606772587886dcb54a9867bcf275e0\'; expected \'2b8b815229aa8a61e483fb4ba0588b8b6c491890\'') diff --git a/src/it/download-licenses-file-names/postbuild.groovy b/src/it/download-licenses-file-names/postbuild.groovy index fc70ca6ef..79d92ac96 100644 --- a/src/it/download-licenses-file-names/postbuild.groovy +++ b/src/it/download-licenses-file-names/postbuild.groovy @@ -35,11 +35,11 @@ return { final Path asl2 = outputBase.resolve('licenses/asl2.txt') assert Files.exists(asl2) - assert asl2.text.contains('Version 2.0, January 2004') + assert asl2.toFile().text.contains('Version 2.0, January 2004') final Path bsdAntlr = outputBase.resolve('licenses/bsd-antlr.html') assert Files.exists(bsdAntlr) - assert bsdAntlr.text.contains('Copyright (c) 2012 Terence Parr and Sam Harwell') + assert bsdAntlr.toFile().text.contains('Copyright (c) 2012 Terence Parr and Sam Harwell') final Path cddl = outputBase.resolve('licenses/cddl-gplv2-ce.txt') assert Files.exists(cddl) @@ -47,7 +47,7 @@ return { final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { final String id = 'spdx' @@ -55,11 +55,11 @@ return { final Path asl2 = outputBase.resolve('licenses/Apache-2.0.txt') assert Files.exists(asl2) - assert asl2.text.contains('Version 2.0, January 2004') + assert asl2.toFile().text.contains('Version 2.0, January 2004') final Path bsdAntlr = outputBase.resolve('licenses/bsd-antlr.html') assert Files.exists(bsdAntlr) - assert bsdAntlr.text.contains('Copyright (c) 2012 Terence Parr and Sam Harwell') + assert bsdAntlr.toFile().text.contains('Copyright (c) 2012 Terence Parr and Sam Harwell') final Path cddl = outputBase.resolve('licenses/cddl-gplv2-ce.txt') assert Files.exists(cddl) @@ -67,7 +67,7 @@ return { final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) return true }() && { @@ -77,11 +77,11 @@ return { final Path asl2 = outputBase.resolve('licenses/Apache-2.0.txt') assert Files.exists(asl2) - assert asl2.text.contains('Version 2.0, January 2004') + assert asl2.toFile().text.contains('Version 2.0, January 2004') final Path bsdAntlr = outputBase.resolve('licenses/bsd-license-from-config.html') assert Files.exists(bsdAntlr) - assert bsdAntlr.text.contains('Copyright (c) 2012 Terence Parr and Sam Harwell') + assert bsdAntlr.toFile().text.contains('Copyright (c) 2012 Terence Parr and Sam Harwell') final Path cddl = outputBase.resolve('licenses/cddl-gplv2-ce.txt') assert Files.exists(cddl) @@ -89,7 +89,7 @@ return { final Path expectedLicensesXml = basePath.resolve('licenses-'+ id +'.expected.xml') final Path licensesXml = outputBase.resolve('licenses.xml') - assert expectedLicensesXml.text.equals(licensesXml.text) + assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) final Path foo = basePath.resolve('target/cleanLicDir/licenses/foo.txt') assert !Files.exists(foo) diff --git a/src/it/download-licenses-force/postbuild.groovy b/src/it/download-licenses-force/postbuild.groovy index 7294695c5..1efd46a37 100644 --- a/src/it/download-licenses-force/postbuild.groovy +++ b/src/it/download-licenses-force/postbuild.groovy @@ -27,21 +27,21 @@ final Path basePath = basedir.toPath() final Path asl2 = basePath.resolve('target/generated-resources/licenses/apache license 2.0 - license-2.0.txt') assert Files.exists(asl2) -assert !asl2.text.contains('This content is fake.') -assert asl2.text.contains('Version 2.0, January 2004') +assert !asl2.toFile().text.contains('This content is fake.') +assert asl2.toFile().text.contains('Version 2.0, January 2004') final Path lgpl21 = basePath.resolve('target/generated-resources/licenses/gnu lesser general public license v2.1 or later - lgpl-2.1.html') assert Files.exists(lgpl21) -assert lgpl21.text.contains('Version 2.1, February 1999') +assert lgpl21.toFile().text.contains('Version 2.1, February 1999') final Path expectedLicensesXml = basePath.resolve('licenses.expected.xml') final Path licensesXml = basePath.resolve('target/generated-resources/licenses.xml') -assert expectedLicensesXml.text.equals(licensesXml.text) +assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) final Path expectedLicensesErrorsXml = basePath.resolve('licenses-errors.expected.xml') final Path licensesErrorsXml = basePath.resolve('target/generated-resources/licenses-errors.xml') -assert expectedLicensesErrorsXml.text.equals(licensesErrorsXml.text) +assert expectedLicensesErrorsXml.toFile().text.equals(licensesErrorsXml.toFile().text) final Path log = basePath.resolve('build.log') assert Files.exists(log) -assert log.text.contains('There were 2 download errors - check ') +assert log.toFile().text.contains('There were 2 download errors - check ') diff --git a/src/it/download-licenses-force/prebuild.groovy b/src/it/download-licenses-force/prebuild.groovy index 21ea1a3c4..ded3b1678 100644 --- a/src/it/download-licenses-force/prebuild.groovy +++ b/src/it/download-licenses-force/prebuild.groovy @@ -29,4 +29,4 @@ Files.move(basePath.resolve('target-initial'), basePath.resolve('target')) Path asl2 = basePath.resolve('target/generated-resources/licenses/apache license 2.0 - license-2.0.txt') assert Files.exists(asl2) -assert asl2.text.contains('This content is fake.') \ No newline at end of file +assert asl2.toFile().text.contains('This content is fake.') \ No newline at end of file diff --git a/src/it/download-licenses-proxy/postbuild.groovy b/src/it/download-licenses-proxy/postbuild.groovy index 04a6e8896..bd84bdfb1 100644 --- a/src/it/download-licenses-proxy/postbuild.groovy +++ b/src/it/download-licenses-proxy/postbuild.groovy @@ -27,8 +27,8 @@ final Path basePath = basedir.toPath() final Path asl2 = basePath.resolve('target/generated-resources/licenses/apache license 2.0 - license-2.0.txt') assert Files.exists(asl2) -assert asl2.text.contains('Proxied via LittleProxy') +assert asl2.toFile().text.contains('Proxied via LittleProxy') final Path expectedLicensesXml = basePath.resolve('licenses.expected.xml') final Path licensesXml = basePath.resolve('target/generated-resources/licenses.xml') -assert expectedLicensesXml.text.equals(licensesXml.text) +assert expectedLicensesXml.toFile().text.equals(licensesXml.toFile().text) diff --git a/src/main/java/org/codehaus/mojo/license/Eol.java b/src/main/java/org/codehaus/mojo/license/Eol.java index 91eef1fdc..e537e38f3 100644 --- a/src/main/java/org/codehaus/mojo/license/Eol.java +++ b/src/main/java/org/codehaus/mojo/license/Eol.java @@ -73,7 +73,7 @@ public static Eol autodetect( Path file, Charset charset ) throws IOException private final String eolString; - private Eol( String eolString ) + Eol( String eolString ) { this.eolString = eolString; } diff --git a/src/main/java/org/codehaus/mojo/license/LicenseMojoUtils.java b/src/main/java/org/codehaus/mojo/license/LicenseMojoUtils.java index e5962d6d0..4145c0e92 100644 --- a/src/main/java/org/codehaus/mojo/license/LicenseMojoUtils.java +++ b/src/main/java/org/codehaus/mojo/license/LicenseMojoUtils.java @@ -161,7 +161,7 @@ static class Slf4jLoggerFacade private final Logger delegate; - public Slf4jLoggerFacade( Logger delegate ) + Slf4jLoggerFacade( Logger delegate ) { super(); this.delegate = delegate; diff --git a/src/main/java/org/codehaus/mojo/license/api/ArtifactFilters.java b/src/main/java/org/codehaus/mojo/license/api/ArtifactFilters.java index db5a490df..fab8e2155 100644 --- a/src/main/java/org/codehaus/mojo/license/api/ArtifactFilters.java +++ b/src/main/java/org/codehaus/mojo/license/api/ArtifactFilters.java @@ -407,7 +407,7 @@ static class GaFilter { private final Pattern pattern; - public GaFilter( Pattern pattern ) + GaFilter( Pattern pattern ) { super(); this.pattern = pattern; @@ -452,7 +452,7 @@ public Builder include( ArtifactFilter filter ) private final List includesExcludes; - public IncludesExcludes( List includesExcludes, int includesCount ) + IncludesExcludes( List includesExcludes, int includesCount ) { super(); this.includesExcludes = includesExcludes; @@ -486,7 +486,7 @@ static class ScopeFilter { private final String scope; - public ScopeFilter( String scope ) + ScopeFilter( String scope ) { super(); this.scope = scope; @@ -503,7 +503,7 @@ static class TypeFilter { private final String type; - public TypeFilter( String type ) + TypeFilter( String type ) { super(); this.type = type; diff --git a/src/main/java/org/codehaus/mojo/license/download/LicenseMatchers.java b/src/main/java/org/codehaus/mojo/license/download/LicenseMatchers.java index ad8a5c6c4..1436343f4 100644 --- a/src/main/java/org/codehaus/mojo/license/download/LicenseMatchers.java +++ b/src/main/java/org/codehaus/mojo/license/download/LicenseMatchers.java @@ -248,7 +248,7 @@ public boolean matches( List licenses ) } }; - public LicenseListMatcher( List licenseMatchers ) + LicenseListMatcher( List licenseMatchers ) { this.licenseMatchers = licenseMatchers; } diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 29c50e253..bac362445 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -80,22 +80,20 @@ ${project.name} * {Usage} General instructions on how to use the License Plugin can be found on the {{{./usage.html}usage page}}. Some more - specific use cases are described in the examples given below. Last but not least, users occasionally contribute - additional examples, tips or errata to the - {{{http://docs.codehaus.org/display/MAVENUSER/License+Maven+Plugin}plugin's wiki page}}. + specific use cases are described in the examples given below. In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel - free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could + free to contact the {{{./mailing-lists.html}user mailing list}}. The posts to the mailing list are archived and could already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching - the {{{./mail-lists.html}mail archive}}. + the {{{./mailing-lists.html}mail archive}}. If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our - {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your + {{{./issue-management.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason, entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated. Of course, patches are welcome, too. Contributors can check out the project from our - {{{./source-repository.html}source repository}} and will find supplementary information in the - {{{http://mojo.codehaus.org/development/guidelines.html}development guidelines}}. + {{{./scm.html}source repository}} and will find supplementary information in the + {{{https://www.mojohaus.org/development/guidelines.html}development guidelines}}. * {Examples} diff --git a/src/site/site.xml b/src/site/site.xml index e1357a022..df69efc9b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,33 +22,31 @@ #L% --> - - - - - mojohaus/${this.artifactId} - right - gray - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + -