Author: rfscholte
Date: Thu Jul 4 19:59:42 2013
New Revision: 1499852
URL: http://svn.apache.org/r1499852
Log:
[MENFORCER-156] Upgrading maven-enforcer-plugin from 1.2 to 1.3 breaks
maven-assembly-plugin
Remove requiresDependencyCollection from @Mojo annotation; this is covered by
the DependecyGraphBuilder
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer158_utils-1.0.pom
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/invoker.properties
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/assembly/
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/assembly/extjars.xml
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/verify.groovy
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/mrm/repository/menforcer158_utils-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer158_utils-1.0.pom?rev=1499852&view=auto
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer158_utils-1.0.pom
(added)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/mrm/repository/menforcer158_utils-1.0.pom
Thu Jul 4 19:59:42 2013
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer158_utils</artifactId>
+ <version>1.0</version>
+</project>
\ No newline at end of file
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/invoker.properties?rev=1499852&view=auto
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/invoker.properties
(added)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/invoker.properties
Thu Jul 4 19:59:42 2013
@@ -0,0 +1 @@
+invoker.goals = clean package
\ No newline at end of file
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml?rev=1499852&view=auto
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
(added)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml
Thu Jul 4 19:59:42 2013
@@ -0,0 +1,72 @@
+<?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>resolve_collect_dependencies</artifactId>
+ <version>1.0</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>
+ <requirePluginVersions />
+ </rules>
+ <fail>false</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/extjars.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.enforcer.its</groupId>
+ <artifactId>menforcer158_utils</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/assembly/extjars.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/assembly/extjars.xml?rev=1499852&view=auto
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/assembly/extjars.xml
(added)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/src/assembly/extjars.xml
Thu Jul 4 19:59:42 2013
@@ -0,0 +1,31 @@
+<?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. -->
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+ <id>extjars</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <!-- Copy including versions -->
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added:
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/verify.groovy?rev=1499852&view=auto
==============================================================================
---
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/verify.groovy
(added)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/verify.groovy
Thu Jul 4 19:59:42 2013
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+assert new File( basedir,
'target/resolve_collect_dependencies-1.0-extjars.zip' ).isFile()
+
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=1499852&r1=1499851&r2=1499852&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
Thu Jul 4 19:59:42 2013
@@ -34,7 +34,6 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.path.PathTranslator;
import org.codehaus.plexus.PlexusConstants;
@@ -50,8 +49,7 @@ import org.codehaus.plexus.personality.p
* @author <a href="mailto:[email protected]";>Brian Fox</a>
* @version $Id$
*/
-@Mojo( name = "enforce", defaultPhase = LifecyclePhase.VALIDATE, threadSafe =
true,
- requiresDependencyCollection = ResolutionScope.TEST )
+@Mojo( name = "enforce", defaultPhase = LifecyclePhase.VALIDATE, threadSafe =
true )
public class EnforceMojo
extends AbstractMojo
implements Contextualizable
