You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/06/03 23:01:15 UTC
svn commit: r1489173 - in /maven/enforcer/trunk/maven-enforcer-plugin: ./
src/it/ src/it/mrm/ src/it/mrm/repository/
src/it/projects/ban-pom-dependency-version/
Author: rfscholte
Date: Mon Jun 3 21:01:15 2013
New Revision: 1489173
URL: http://svn.apache.org/r1489173
Log:
[MENFORCER-15] Use Mock Repository Manager for ITs
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer152-1.0.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/settings.xml
Removed:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/settings.xml
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/verify.groovy
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=1489173&r1=1489172&r2=1489173&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Jun 3 21:01:15 2013
@@ -146,7 +146,7 @@
<preBuildHookScript>setup</preBuildHookScript>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
+ <settingsFile>src/it/mrm/settings.xml</settingsFile>
<goals>
<goal>validate</goal>
</goals>
@@ -161,6 +161,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>mrm-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <propertyName>repository.proxy.url</propertyName>
+ <repositories>
+ <mockRepo>
+ <source>src/it/mrm/repository</source>
+ </mockRepo>
+ <proxyRepo />
+ </repositories>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer152-1.0.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer152-1.0.pom?rev=1489173&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer152-1.0.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer152-1.0.pom Mon Jun 3 21:01:15 2013
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer152</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/settings.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/settings.xml?rev=1489173&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/settings.xml (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/settings.xml Mon Jun 3 21:01:15 2013
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <mirrors>
+ <mirror>
+ <id>mrm-maven-plugin</id>
+ <name>Mock Repository Manager</name>
+ <url>@repository.proxy.url@</url>
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <repositories>
+ <repository>
+ <id>snapshots</id>
+ <url>@repository.proxy.url@</url>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>snapshots</id>
+ <url>@repository.proxy.url@</url>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>it-repo</activeProfile>
+ </activeProfiles>
+</settings>
\ No newline at end of file
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml?rev=1489173&r1=1489172&r2=1489173&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml Mon Jun 3 21:01:15 2013
@@ -51,14 +51,14 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0</version>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer152</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0</version>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer152</artifactId>
+ <version>1.0</version>
</dependency>
</dependencies>
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/verify.groovy
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/verify.groovy?rev=1489173&r1=1489172&r2=1489173&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/verify.groovy (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/verify.groovy Mon Jun 3 21:01:15 2013
@@ -19,7 +19,7 @@
File buildLog = new File( basedir, 'build.log' )
assert buildLog.text.contains( '[WARNING] Rule 0: org.apache.maven.plugins.enforcer.BanDuplicatePomDependencyVersions failed with message:' )
assert buildLog.text.contains( 'Found 1 duplicate dependency declaration in this project:' )
-assert buildLog.text.contains( '- dependencies.dependency[org.codehaus.plexus:plexus-utils:jar] ( 2 times )' )
+assert buildLog.text.contains( '- dependencies.dependency[org.apache.maven.plugins.enforcer.its:menforcer152:jar] ( 2 times )' )