Skip to content

Commit

Permalink
Cleanup - use project configuration from parent
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Aug 7, 2022
1 parent 7e16ce3 commit f78c12b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 41 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ This is the [flatten-maven-plugin](http://www.mojohaus.org/flatten-maven-plugin/
[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/mojohaus/versions-maven-plugin.svg?label=License)](http://www.apache.org/licenses/)
[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.mojo/flatten-maven-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.mojo/flatten-maven-plugin)
[![GitHub CI](https://github.com/mojohaus/flatten-maven-plugin/actions/workflows/maven.yml/badge.svg)](https://github.com/mojohaus/flatten-maven-plugin/actions/workflows/maven.yml)
1.0.x branch: [![GitHub CI](https://github.com/mojohaus/flatten-maven-plugin/actions/workflows/maven.yml/badge.svg?branch=1.0.x)](https://github.com/mojohaus/flatten-maven-plugin/actions/workflows/maven.yml)

## Quickstart
This plugin generates a flattened version of your pom.xml and makes maven to install and deploy this one instead of the original pom.xml.
Expand Down
28 changes: 5 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,27 +225,6 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.3.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<goalPrefix>flatten</goalPrefix>
</configuration>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
Expand All @@ -254,8 +233,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links combine.self="override">
<link>http://junit.org/junit4/javadoc/latest</link>
<link>http://maven.apache.org/ref/${mavenVersion}/apidocs/</link>
<link>https://junit.org/junit4/javadoc/latest</link>
<link>https://maven.apache.org/ref/${mavenVersion}/apidocs/</link>
</links>
</configuration>
</plugin>
Expand Down Expand Up @@ -323,6 +302,9 @@
<mockRepo>
<source>src/it/mrm/repository</source>
</mockRepo>
<localRepo>
<source>${project.build.directory}/local-repo</source>
</localRepo>
<proxyRepo />
</repositories>
</configuration>
Expand Down
25 changes: 8 additions & 17 deletions src/site/site.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<custom>
<fluidoSkin>
<googleSearch>
<sitesearch>www.mojohaus.org</sitesearch>
</googleSearch>
<ohloh>
<projectId>5211</projectId>
<widget>thin-badge</widget>
</ohloh>
<gitHub>
<projectId>mojohaus/${project.artifactId}</projectId>
<ribbonOrientation>right</ribbonOrientation>
<ribbonColor>gray</ribbonColor>
</gitHub>
</fluidoSkin>
</custom>
<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">
<body>
<breadcrumbs>
<item name="MojoHaus" href="https://www.mojohaus.org/"/>
<item name="${this.name}" href="${this.url}" />
</breadcrumbs>

<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Goals" href="plugin-info.html"/>
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
</menu>

<menu name="Examples">
<item name="Simple Project" href="examples/example-simple-project.html"/>
<item name="Central Version" href="examples/example-central-version.html"/>
Expand Down

0 comments on commit f78c12b

Please sign in to comment.