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/15 16:07:23 UTC
svn commit: r1493359 - in
/maven/enforcer/trunk/maven-enforcer-plugin/src/it: mrm/repository/
projects/require-upper-bound-deps_failure/
projects/require-upper-bound-deps_success/
Author: rfscholte
Date: Sat Jun 15 14:07:22 2013
New Revision: 1493359
URL: http://svn.apache.org/r1493359
Log:
[MENFORCER-153] Use Mock Repository Manager for ITs
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.4.0.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.5.0.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.6.0.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_classic-0.9.9.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/verify.groovy
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.4.0.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.4.0.pom?rev=1493359&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.4.0.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.4.0.pom Sat Jun 15 14:07:22 2013
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_api</artifactId>
+ <version>1.4.0</version>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.5.0.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.5.0.pom?rev=1493359&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.5.0.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.5.0.pom Sat Jun 15 14:07:22 2013
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_api</artifactId>
+ <version>1.5.0</version>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.6.0.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.6.0.pom?rev=1493359&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.6.0.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_api-1.6.0.pom Sat Jun 15 14:07:22 2013
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_api</artifactId>
+ <version>1.6.0</version>
+</project>
\ No newline at end of file
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_classic-0.9.9.pom
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_classic-0.9.9.pom?rev=1493359&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_classic-0.9.9.pom (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer128_classic-0.9.9.pom Sat Jun 15 14:07:22 2013
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_classic</artifactId>
+ <version>0.9.9</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_api</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml?rev=1493359&r1=1493358&r2=1493359&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml Sat Jun 15 14:07:22 2013
@@ -2,21 +2,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>TestParent</artifactId>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_api</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_classic</artifactId>
<version>0.9.9</version>
- <!-- Depends on org.slf4j:slf4j-api:1.5.0 -->
+ <!-- Depends on org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0 -->
</dependency>
</dependencies>
<build>
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/verify.groovy
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/verify.groovy?rev=1493359&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/verify.groovy (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/verify.groovy Sat Jun 15 14:07:22 2013
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+def LS = System.getProperty( "line.separator" )
+File buildLog = new File( basedir, 'build.log' )
+
+assert buildLog.text.contains( 'Rule 0: org.apache.maven.plugins.enforcer.RequireUpperBoundDeps failed with message:' )
+def message =
+'Require upper bound dependencies error for org.apache.maven.plugins.enforcer.its:menforcer128_api:1.4.0 paths to dependency are:'+LS+
+'+-org.apache.maven.plugins.enforcer.its:menforcer128:1.0-SNAPSHOT'+LS+
+' +-org.apache.maven.plugins.enforcer.its:menforcer128_api:1.4.0'+LS+
+'and'+LS+
+'+-org.apache.maven.plugins.enforcer.its:menforcer128:1.0-SNAPSHOT'+LS+
+' +-org.apache.maven.plugins.enforcer.its:menforcer128_classic:0.9.9'+LS+
+' +-org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0'+LS
+assert buildLog.text.contains( message )
+
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml?rev=1493359&r1=1493358&r2=1493359&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml Sat Jun 15 14:07:22 2013
@@ -2,21 +2,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>TestParent</artifactId>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_api</artifactId>
<version>1.6.0</version>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer128_classic</artifactId>
<version>0.9.9</version>
- <!-- Depends on org.slf4j:slf4j-api:1.5.0 -->
+ <!-- Depends on org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0 -->
</dependency>
</dependencies>
<build>