Cleanup build

- use plugin versions and configurations from parent pom - override links in documentation for multimodule project - show log of invoker executing only if fail
mojohaus · Jun 18, 2022 · 9ed7e16 · 9ed7e16
1 parent ef48381
commit 9ed7e16
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 70 deletions.
diff --git a/mrm-maven-plugin/pom.xml b/mrm-maven-plugin/pom.xml
@@ -34,37 +34,6 @@
     <maven>${mavenVersion}</maven>
   </prerequisites>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>mojo-descriptor</id>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <configuration>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-          <projectsDirectory>src/it</projectsDirectory>
-          <goals>
-            <goal>verify</goal>
-          </goals>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.codehaus.mojo</groupId>
@@ -152,6 +121,17 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <projectsDirectory>src/it</projectsDirectory>
+              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+              <showErrors>true</showErrors>
+              <settingsFile>src/it/settings.xml</settingsFile>
+              <postBuildHookScript>verify</postBuildHookScript>
+              <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+              <goals>
+                <goal>verify</goal>
+              </goals>
+            </configuration>
             <executions>
               <execution>
                 <id>integration-test</id>
@@ -160,9 +140,7 @@
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <streamLogs>true</streamLogs>
                   <debug>false</debug>
-                  <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
                 </configuration>
               </execution>
             </executions>

diff --git a/mrm-maven-plugin/src/it/custom-base-path/pom.xml b/mrm-maven-plugin/src/it/custom-base-path/pom.xml
@@ -33,8 +33,10 @@
             <mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
           </filterProperties>
           <postBuildHookScript>verify</postBuildHookScript>
-          <streamLogs>true</streamLogs>
-          <goal>verify</goal>
+          <streamLogsOnFailures>true</streamLogsOnFailures>
+          <goals>
+            <goal>verify</goal>
+          </goals>
         </configuration>
       </plugin>
       <plugin>

diff --git a/mrm-maven-plugin/src/it/hostedrepo/pom.xml b/mrm-maven-plugin/src/it/hostedrepo/pom.xml
@@ -32,8 +32,10 @@
             <mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
           </filterProperties>
           <postBuildHookScript>verify</postBuildHookScript>
-          <streamLogs>true</streamLogs>
-          <goal>verify</goal>
+          <streamLogsOnFailures>true</streamLogsOnFailures>
+          <goals>
+            <goal>verify</goal>
+          </goals>
         </configuration>
       </plugin>
       <plugin>
@@ -67,4 +69,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/mrm-maven-plugin/src/it/settings.xml b/mrm-maven-plugin/src/it/settings.xml
@@ -23,9 +23,6 @@ under the License.
   <profiles>
     <profile>
       <id>it-repo</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <repositories>
         <repository>
           <id>local.central</id>
@@ -52,4 +49,7 @@ under the License.
       </pluginRepositories>
     </profile>
   </profiles>
+  <activeProfiles>
+    <activeProfile>it-repo</activeProfile>
+  </activeProfiles>
 </settings>
diff --git a/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/AbstractStartMojo.java b/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/AbstractStartMojo.java
@@ -49,6 +49,8 @@ public abstract class AbstractStartMojo
      * <p>
      * If {@code basePath} is set to e.g. {@code foo/bar} then {@code org.acme:my-artifact:pom:1.2.3} will be served
      * under {@code http://localhost:<port>/foo/bar/org/acme/my-artifact/1.2.3/my-artifact-1.2.3.pom}.
+     *
+     * @since 1.4.0
      */
     @Parameter( property = "mrm.basePath", defaultValue = "/" )
     private String basePath;

diff --git a/pom.xml b/pom.xml
@@ -35,11 +35,13 @@
     Mock Repository Manager for Maven. The Mock Repository Manager provides a mock Maven
     repository manager.
   </description>
+  <url>https://www.mojohaus.org/mrm</url>
   <inceptionYear>2009</inceptionYear>
+
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -73,16 +75,20 @@
   <scm>
     <connection>scm:git:https://github.com/mojohaus/mrm.git</connection>
     <developerConnection>scm:git:ssh://[email protected]/mojohaus/mrm.git</developerConnection>
-    <url>https://github.com/mojohaus/mrm</url>
+    <url>https://github.com/mojohaus/mrm/tree/master</url>
     <tag>HEAD</tag>
   </scm>
   <issueManagement>
     <system>GitHub</system>
     <url>https://github.com/mojohaus/mrm/issues</url>
   </issueManagement>
+  <ciManagement>
+    <system>GitHub</system>
+    <url>https://github.com/mojohaus/mrm/actions</url>
+  </ciManagement>
 
   <properties>
-    <scmpublish.content>target/staging/mrm</scmpublish.content>
+    <scmpublish.content>${project.build.directory}/staging/mrm</scmpublish.content>
     <mavenVersion>2.2.1</mavenVersion>
     <mojo.java.target>1.8</mojo.java.target>
     <jetty.version>9.4.46.v20220331</jetty.version>
@@ -179,31 +185,18 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <configuration>
-            <content>${project.build.directory}/staging/mrm</content>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
           <version>${jetty.version}</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <autoVersionSubmodules>true</autoVersionSubmodules>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <id>enforce-java</id>
@@ -239,18 +232,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <configuration>
-          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-          <showErrors>true</showErrors>
-          <streamLogs>true</streamLogs>
-          <settingsFile>src/it/settings.xml</settingsFile>
-          <postBuildHookScript>verify</postBuildHookScript>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -19,6 +19,17 @@
 <project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"
          name="Mock Repository Manager">
+
+  <custom>
+    <fluidoSkin>
+      <gitHub>
+        <projectId>mojohaus/mrm</projectId>
+        <ribbonOrientation>right</ribbonOrientation>
+        <ribbonColor>gray</ribbonColor>
+      </gitHub>
+    </fluidoSkin>
+  </custom>
+
   <body>
     <menu ref="parent" inherit="top"/>