Author: bentmann
Date: Sat Oct 31 18:23:39 2009
New Revision: 831578
URL:
http://svn.apache.org/viewvc?rev=831578&view=revLog:
[MNG-4421] Warn regarding old-style references when used in a project build
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/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/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=831578&r1=831577&r2=831578&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 18:23:39 2009
@@ -87,6 +87,7 @@
suite.addTestSuite( MavenITmng4423SessionDataFromPluginParameterExpressionTest.class );
suite.addTestSuite( MavenITmng4422PluginExecutionPhaseInterpolationTest.class );
+ suite.addTestSuite( MavenITmng4421DeprecatedPomInterpolationExpressionsTest.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/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java?rev=831578&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java Sat Oct 31 18:23:39 2009
@@ -0,0 +1,88 @@
+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;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="
http://jira.codehaus.org/browse/MNG-4421">MNG-4421</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4421DeprecatedPomInterpolationExpressionsTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4421DeprecatedPomInterpolationExpressionsTest()
+ {
+ super( "[3.0-alpha-3,)" );
+ }
+
+ /**
+ * Test that expressions of the form ${pom.*} and {*} referring to the model cause build warnings.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4421" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties( "target/pom.properties" );
+ assertEquals( "0.1", props.getProperty( "project.properties.property1" ) );
+ assertEquals( "0.1", props.getProperty( "project.properties.property2" ) );
+
+ List lines = verifier.loadLines( "log.txt", null );
+
+ boolean warnedPomPrefix = false;
+ boolean warnedEmptyPrefix = false;
+
+ for ( Iterator it = lines.iterator(); it.hasNext(); )
+ {
+ String line = (String) it.next();
+ if ( line.startsWith( "[WARN" ) )
+ {
+ if ( line.indexOf( "${pom.version}" ) >= 0 )
+ {
+ warnedPomPrefix = true;
+ }
+ if ( line.indexOf( "${version}" ) >= 0 )
+ {
+ warnedEmptyPrefix = true;
+ }
+ }
+ }
+
+ assertTrue( warnedPomPrefix );
+ assertTrue( warnedEmptyPrefix );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/pom.xml?rev=831578&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/pom.xml Sat Oct 31 18:23:39 2009
@@ -0,0 +1,62 @@
+<?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.mng4421</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4421</name>
+ <description>
+ Test that expressions of the form ${pom.*} and {*} referring to the model cause build warnings.
+ </description>
+
+ <properties>
+ <property1>${pom.version}</property1>
+ <property2>${version}</property2>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>eval</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/pom.properties</outputFile>
+ <expressions>
+ <expression>project/properties</expression>
+ </expressions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4421/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
