Merge branch 'master' into enforcement-readme

rremer · Sep 2, 2021 · b4a37e3 · b4a37e3
2 parents 7c51b4e + 5d808fa
commit b4a37e3
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ before_install:
 
 install: /usr/bin/env true
 
-script: mvn clean install -V -B -s settings.xml -Dmaven.artifact.threads=64 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+script: mvn clean install site -DperformRelease=true -Dgpg.skip=true -V -B -s settings.xml -Dmaven.artifact.threads=64 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
 cache:
   #  timeout: 5000

diff --git a/README.md b/README.md
@@ -2,10 +2,7 @@ __Lastest releases__ (note that it may take up to 1-2 days to be in Maven Centra
 
 * [4.1](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/4.1/) (2021-04-23) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/milestone/17?closed=1)
 * [4.0](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/4.0/) (2021-03-30) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/milestone/16?closed=1)
-* [4.0.rc2](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/4.0.rc2/) (2020-08-16) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/milestone/15?closed=1)
-* [4.0.rc1](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/4.0.rc1/) (2020-06-09) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/milestone/14?closed=1)
 * [3.0](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/3.0/) (2016-08-20) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/issues?q=milestone%3A3.0)
-* [3.0.rc1](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/3.0.rc1/) (2016-04-26) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/issues?q=milestone%3A3.0.rc1)
 * [2.11](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/2.11/) (2015-04-20) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/issues?q=milestone%3A2.11)
 * [2.10](https://repo1.maven.org/maven2/com/mycila/license-maven-plugin/2.10/) (2015-03-16) - see [issues and pull requests](https://github.com/mathieucarbou/license-maven-plugin/issues?q=milestone%3A2.8)
 
@@ -160,9 +157,10 @@ more license configurations in a single execution of the plugin. In simple terms
 wraps the previous configuration options for a license. The previous
 configuration syntax is still supported but deprecated, and may be removed in future. 
 
- - [4.0.rc1](https://mycila.carbou.me/license-maven-plugin/reports/4.0.rc1/license-maven-plugin/plugin-info.html)
+ - [4.2-SNAPSHOT](https://mycila.carbou.me/license-maven-plugin/reports/4.2-SNAPSHOT/license-maven-plugin/plugin-info.html)
+ - [4.1](https://mycila.carbou.me/license-maven-plugin/reports/4.1/license-maven-plugin/plugin-info.html)
+ - [4.0](https://mycila.carbou.me/license-maven-plugin/reports/4.0/license-maven-plugin/plugin-info.html)
  - [3.0](https://mycila.carbou.me/license-maven-plugin/reports/3.0/plugin-info.html)
- - [3.0.rc1](https://mycila.carbou.me/license-maven-plugin/reports/3.0.rc1/plugin-info.html)
  - [2.3](https://mycila.carbou.me/license-maven-plugin/reports/2.3/plugin-info.html)
  - [2.2](https://mycila.carbou.me/license-maven-plugin/reports/2.2/plugin-info.html)
  - [2.0](https://mycila.carbou.me/license-maven-plugin/reports/2.0/plugin-info.html)

diff --git a/license-maven-plugin-git/pom.xml b/license-maven-plugin-git/pom.xml
@@ -28,11 +28,22 @@
   <name>license-maven-plugin-git</name>
   <description>An optional module for license-maven-plugin adding git related functionality</description>
 
+  <reporting>
+    <outputDirectory>../target/site/${project.version}/${project.artifactId}</outputDirectory>
+  </reporting>
+
+  <distributionManagement>
+    <site>
+      <id>report</id>
+      <url>https://mycila.carbou.me/license-maven-plugin/reports/${project.version}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+
   <dependencies>
     <dependency>
-       <groupId>com.mycila</groupId>
-       <artifactId>license-maven-plugin</artifactId>
-       <version>${project.version}</version>
+      <groupId>com.mycila</groupId>
+      <artifactId>license-maven-plugin</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>

diff --git a/license-maven-plugin-svn/pom.xml b/license-maven-plugin-svn/pom.xml
@@ -17,25 +17,36 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.mycila</groupId>
-        <artifactId>license-maven-plugin-parent</artifactId>
-        <version>4.2-SNAPSHOT</version>
-    </parent>
-    <artifactId>license-maven-plugin-svn</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.mycila</groupId>
-            <artifactId>license-maven-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.tmatesoft.svnkit</groupId>
-            <artifactId>svnkit</artifactId>
-            <version>1.8.7</version>
-        </dependency>
-    </dependencies>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.mycila</groupId>
+    <artifactId>license-maven-plugin-parent</artifactId>
+    <version>4.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>license-maven-plugin-svn</artifactId>
+  <packaging>jar</packaging>
+
+  <reporting>
+    <outputDirectory>../target/site/${project.version}/${project.artifactId}</outputDirectory>
+  </reporting>
+
+  <distributionManagement>
+    <site>
+      <id>report</id>
+      <url>https://mycila.carbou.me/license-maven-plugin/reports/${project.version}/${project.artifactId}</url>
+    </site>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.mycila</groupId>
+      <artifactId>license-maven-plugin</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.tmatesoft.svnkit</groupId>
+      <artifactId>svnkit</artifactId>
+      <version>1.8.7</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/license-maven-plugin/pom.xml b/license-maven-plugin/pom.xml
@@ -31,12 +31,12 @@
     <name>license-maven-plugin</name>
     <description>Maven 2 plugin to check and update license headers in source files</description>
     <inceptionYear>2008</inceptionYear>
-    <url>http://mycila.github.io/${mycila.github.name}</url>
+    <url>https://mycila.carbou.me/${mycila.github.name}</url>
 
     <scm>
         <connection>scm:git:https://github.com/mycila/${mycila.github.name}.git</connection>
         <developerConnection>scm:git:[email protected]:mycila/${mycila.github.name}.git</developerConnection>
-        <url>http://github.com/mycila/${mycila.github.name}</url>
+        <url>https://github.com/mathieucarbou/${mycila.github.name}</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -83,6 +83,7 @@
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
+                    <failOnError>false</failOnError>
                     <!--additionalparam>-Xdoclint:none</additionalparam-->
                     <sourceFileExcludes combine.children="append">
                         <sourceFileExclude>**/*Mojo.java</sourceFileExclude>
@@ -118,6 +119,17 @@
         </plugins>
     </build>
 
+    <reporting>
+        <outputDirectory>../target/site/${project.version}/${project.artifactId}</outputDirectory>
+    </reporting>
+
+    <distributionManagement>
+        <site>
+            <id>report</id>
+            <url>https://mycila.carbou.me/license-maven-plugin/reports/${project.version}/${project.artifactId}</url>
+        </site>
+    </distributionManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/AbstractLicenseMojo.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/AbstractLicenseMojo.java
@@ -470,7 +470,7 @@ private void executeForLicenseSets(final LicenseSet[] licenseSets, final Callbac
         }
         if (!strictCheck) {
             warn("Property 'strictCheck' is not enabled. Please consider adding <strictCheck>true</strictCheck> in your pom.xml file.");
-            warn("See http://mycila.github.io/license-maven-plugin for more information.");
+            warn("See https://mycila.carbou.me/license-maven-plugin for more information.");
         }
 
         // then execute each license set

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     <name>license-maven-plugin-parent</name>
     <description>Contains a Maven 2 plugin to check and update license headers in source files and its optional dependencies</description>
     <inceptionYear>2008</inceptionYear>
-    <url>http://mycila.github.io/${mycila.github.name}</url>
+    <url>https://mycila.carbou.me/license-maven-plugin/reports/${project.version}</url>
 
     <properties>
         <jdk.version>1.8</jdk.version>
@@ -50,7 +50,7 @@
     <scm>
         <connection>scm:git:https://github.com/mycila/${mycila.github.name}.git</connection>
         <developerConnection>scm:git:[email protected]:mycila/${mycila.github.name}.git</developerConnection>
-        <url>http://github.com/mycila/${mycila.github.name}</url>
+        <url>https://github.com/mathieucarbou/${mycila.github.name}</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -110,6 +110,7 @@
     </dependencyManagement>
 
     <reporting>
+        <outputDirectory>target/site/${project.version}</outputDirectory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -124,6 +125,13 @@
         </plugins>
     </reporting>
 
+    <distributionManagement>
+        <site>
+            <id>report</id>
+            <url>https://mycila.carbou.me/license-maven-plugin/reports/${project.version}</url>
+        </site>
+    </distributionManagement>
+
     <build>
         <pluginManagement>
             <plugins>

diff --git a/settings.xml b/settings.xml
@@ -16,15 +16,21 @@
     limitations under the License.
 
 -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+<settings xmlns="https://maven.apache.org/POM/4.0.0"
+          xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
   <mirrors>
     <mirror>
       <id>maven-central</id>
       <name>Maven Central</name>
       <url>https://repo1.maven.org/maven2</url>
       <mirrorOf>central</mirrorOf>
     </mirror>
+    <mirror>
+      <id>codehaus.org</id>
+      <mirrorOf>external:http:*</mirrorOf>
+      <url>https://repo.maven.apache.org/maven2</url>
+      <blocked>false</blocked>
+    </mirror>
   </mirrors>
 </settings>