Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup build #107

Merged
merged 1 commit into from
Jun 18, 2022
Merged

Cleanup build #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 11 additions & 33 deletions mrm-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions mrm-maven-plugin/src/it/custom-base-path/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 5 additions & 3 deletions mrm-maven-plugin/src/it/hostedrepo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -67,4 +69,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
6 changes: 3 additions & 3 deletions mrm-maven-plugin/src/it/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ under the License.
<profiles>
<profile>
<id>it-repo</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
<id>local.central</id>
Expand All @@ -52,4 +49,7 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>it-repo</activeProfile>
</activeProfiles>
</settings>
2 changes: 2 additions & 0 deletions mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/AbstractStartMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
39 changes: 10 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down