You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2008/03/01 23:15:24 UTC

svn commit: r632664 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges: plugin/plugin/ plugin/plugin/src/ plugin/plugin/src/main/ plugin/plugin/src/main/java/ plugi...

Author: carlos
Date: Sat Mar  1 14:15:23 2008
New Revision: 632664

URL: http://svn.apache.org/viewvc?rev=632664&view=rev
Log:
[MNG-3410] Fix the integration test

Added:
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java   (with props)
Modified:
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/   (props changed)
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml
    maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml

Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar  1 14:15:23 2008
@@ -1 +1,4 @@
-target
+target
+.classpath
+.project
+.settings

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml?rev=632664&r1=632663&r2=632664&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/pom.xml Sat Mar  1 14:15:23 2008
@@ -14,6 +14,11 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0.4</version>
+    </dependency>
+    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>B</artifactId>
       <version>1.0</version>
@@ -23,7 +28,7 @@
     <dependencies>
       <dependency>
         <groupId>${pom.groupId}</groupId>
-        <artifactId>${pom.groupId}</artifactId>
+        <artifactId>A</artifactId>
         <version>3.0</version>
       </dependency>
     </dependencies>

Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java?rev=632664&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java Sat Mar  1 14:15:23 2008
@@ -0,0 +1,35 @@
+package org.apache.maven.its.mng3396;
+
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ * 
+ * Licensed 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.
+ */
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
+/**
+ * @goal noop
+ * @phase compile
+ * @requiresDependencyResolution test
+ */
+public class NoopMojo
+    extends AbstractMojo
+{
+
+    public void execute()
+        throws MojoExecutionException, MojoFailureException
+    {
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/plugin/plugin/src/main/java/org/apache/maven/its/mng3396/NoopMojo.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml?rev=632664&r1=632663&r2=632664&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3396-dependencyManagementForOverConstrainedRanges/pluginuser/pom.xml Sat Mar  1 14:15:23 2008
@@ -14,6 +14,14 @@
         <groupId>${pom.groupId}</groupId>
         <artifactId>plugin</artifactId>
         <version>1.0</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>noop</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>