You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/11/11 17:49:14 UTC
[maven] 02/05: [MNG-7321] cleanup build
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7129_Separate
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4faab02ad62423fa81c3c54d2e6300247547a489
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Nov 11 17:11:34 2021 +0100
[MNG-7321] cleanup build
---
maven-caching/pom.xml | 62 +++++++++++++++++++++------------------------------
1 file changed, 26 insertions(+), 36 deletions(-)
diff --git a/maven-caching/pom.xml b/maven-caching/pom.xml
index b37f39c..233a1d1 100644
--- a/maven-caching/pom.xml
+++ b/maven-caching/pom.xml
@@ -43,42 +43,11 @@ under the License.
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>lifecycle-executor.txt</exclude>
- <exclude>plugin-manager.txt</exclude>
- <exclude>project-builder.txt</exclude>
- <exclude>src/site/resources/design/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>sisu-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>1.1.0</version>
<models>
<model>src/main/mdo/cache-config.mdo</model>
<model>src/main/mdo/cache-build.mdo</model>
@@ -86,17 +55,38 @@ under the License.
<model>src/main/mdo/cache-report.mdo</model>
</models>
<version>1.0.0</version>
- <outputDirectory>${basedir}/target/generated-sources/modello</outputDirectory>
</configuration>
<executions>
<execution>
- <id>modello-cache</id>
+ <id>modello-cache-xsd</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
<goal>xsd</goal>
</goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/generated-test-resources/modello</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>add-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-test-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/generated-test-resources/modello</directory>
+ </resource>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>