[prev in list] [next in list] [prev in thread] [next in thread] 

List:       maven-dev
Subject:    svn commit: r831541 - in
From:       bentmann () apache ! org
Date:       2009-10-31 13:50:33
Message-ID: 20091031135034.0D9E8238888D () eris ! apache ! org
[Download RAW message or body]

Author: bentmann
Date: Sat Oct 31 13:50:33 2009
New Revision: 831541

URL: http://svn.apache.org/viewvc?rev=831541&view=rev
Log:
[MNG-4422] [regression] Property expansion does not work for phase of plugin \
executions

o Added IT

Added:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java \
(with props)  maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/
  maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml \
(with props) Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java


Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
                
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/s \
rc/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=831541&r1=831540&r2=831541&view=diff
 ==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java \
                (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java \
Sat Oct 31 13:50:33 2009 @@ -85,6 +85,7 @@
         // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 
+        suite.addTestSuite( \
                MavenITmng4422PluginExecutionPhaseInterpolationTest.class );
         suite.addTestSuite( MavenITmng4416PluginOrderAfterProfileInjectionTest.class \
                );
         suite.addTestSuite( MavenITmng4415InheritedPluginOrderTest.class );
         suite.addTestSuite( MavenITmng4413MirroringOfDependencyRepoTest.class );

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
                
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/s \
rc/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java?rev=831541&view=auto
 ==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java \
                (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java \
Sat Oct 31 13:50:33 2009 @@ -0,0 +1,61 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * This is a test set for <a \
href="http://jira.codehaus.org/browse/MNG-4422">MNG-4422</a>. + * 
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4422PluginExecutionPhaseInterpolationTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    public MavenITmng4422PluginExecutionPhaseInterpolationTest()
+    {
+        super( "[2.0,2.0.99),[3.0-alpha-1,)" );
+    }
+
+    /**
+     * Test that the phase of plugin executions can be interpolated.
+     */
+    public void testit()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), \
"/mng-4422" ); +
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        verifier.assertFilePresent( "target/touch.txt" );
+    }
+
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
                
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java
                
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml
                
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml?rev=831541&view=auto
 ==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml \
                (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml \
Sat Oct 31 13:50:33 2009 @@ -0,0 +1,60 @@
+<?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.mng4422</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+
+  <name>Maven Integration Test :: MNG-4422</name>
+  <description>
+    Test that the phase of plugin executions can be interpolated.
+  </description>
+
+  <properties>
+    <thePhase>validate</thePhase>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>default</id>
+            <!-- Using a property here is the essential part of the test -->
+            <phase>${thePhase}</phase>
+            <goals>
+              <goal>reset</goal>
+            </goals>
+            <configuration>
+              <logFile>target/touch.txt</logFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml
                
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4422/pom.xml
                
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic