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/08 16:21:49 UTC
svn commit: r1490991 - in /maven/enforcer/trunk/maven-enforcer-plugin/src:
it/projects/multimodule/ it/projects/multimodule/module1/
it/projects/multimodule/module2/ main/java/org/apache/maven/plugins/enforcer/
Author: rfscholte
Date: Sat Jun 8 14:21:48 2013
New Revision: 1490991
URL: http://svn.apache.org/r1490991
Log:
[MENFORCER-42] Maven-Enforcer-Plugin fails in multimodule project when artifacts not in repository
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/invoker.properties
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module1/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module1/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module2/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module2/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/invoker.properties
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/invoker.properties?rev=1490991&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/invoker.properties (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/invoker.properties Sat Jun 8 14:21:48 2013
@@ -0,0 +1 @@
+invoker.goals = validate
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module1/pom.xml?rev=1490991&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module1/pom.xml (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module1/pom.xml Sat Jun 8 14:21:48 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.enforcer</groupId>
+ <artifactId>multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>module1</artifactId>
+
+</project>
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module2/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module2/pom.xml?rev=1490991&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module2/pom.xml (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/module2/pom.xml Sat Jun 8 14:21:48 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.enforcer</groupId>
+ <artifactId>multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>module2</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.enforcer</groupId>
+ <artifactId>module1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
Added: maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml?rev=1490991&view=auto
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml (added)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml Sat Jun 8 14:21:48 2013
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.enforcer</groupId>
+ <artifactId>multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <AlwaysPass/>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
+</project>
Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java?rev=1490991&r1=1490990&r2=1490991&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java Sat Jun 8 14:21:48 2013
@@ -51,7 +51,7 @@ import org.codehaus.plexus.personality.p
* @version $Id$
*/
@Mojo( name = "enforce", defaultPhase = LifecyclePhase.VALIDATE, threadSafe = true,
- requiresDependencyResolution = ResolutionScope.TEST )
+ requiresDependencyCollection = ResolutionScope.TEST )
public class EnforceMojo
extends AbstractMojo
implements Contextualizable