Author: bentmann
Date: Fri Nov 7 04:04:27 2008
New Revision: 712113
URL: http://svn.apache.org/viewvc?rev=712113&view=rev
Log:
[MNG-3818] Plugins that don't declare dependency on plexus-utils no longer get
plexus-utils:1.1
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3813/pom.xml
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=712113&r1=712112&r2=712113&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
Fri Nov 7 04:04:27 2008
@@ -88,6 +88,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite( MavenITmng3818PluginDepPlexusUtilsTest.class );
suite.addTestSuite( MavenITmng3813PluginClassPathOrderingTest.class );
suite.addTestSuite( MavenITmng3805ExtensionClassPathOrderingTest.class
);
suite.addTestSuite( MavenITmng3796ClassImportInconsistencyTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java?rev=712113&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java
Fri Nov 7 04:04:27 2008
@@ -0,0 +1,63 @@
+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.Properties;
+
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3818";>MNG-3818</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng3818PluginDepPlexusUtilsTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ /**
+ * Verify that plexus-utils:1.1 is present on plugin class path if
plexus-utils is not explicitly declared in
+ * plugin POM for backward-compat with Maven 2.0.5- (due to MNG-2892,
plexus-utils is no longer part of the core
+ * class realm in Maven 2.0.6+).
+ */
+ public void testitMNG3818()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3818" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties pclProps = verifier.loadProperties( "target/pcl.properties"
);
+
+ assertNotNull( pclProps.getProperty(
"org.codehaus.plexus.util.cli.CommandLineUtils" ) );
+ assertEquals( "executeCommandLine,executeCommandLine,getSystemEnvVars",
+ pclProps.getProperty(
"org.codehaus.plexus.util.cli.CommandLineUtils.methods" ) );
+ assertNull( pclProps.getProperty(
"org.codehaus.plexus.util.RealmDelegatingClassLoader" ) );
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3818PluginDepPlexusUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3813/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3813/pom.xml?rev=712113&r1=712112&r2=712113&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3813/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3813/pom.xml
Fri Nov 7 04:04:27 2008
@@ -55,7 +55,7 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
+
<build>
<plugins>
<plugin>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml?rev=712113&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml
Fri Nov 7 04:04:27 2008
@@ -0,0 +1,63 @@
+<?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.mng3818</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+
+ <name>Maven Integration Test :: MNG-3818</name>
+ <description>
+ Verify that plexus-utils:1.1 is present on plugin class path if
plexus-utils is not explicitly declared in
+ plugin POM for backward-compat with Maven 2.0.5- (due to MNG-2892,
plexus-utils is no longer part of the core
+ class realm in Maven 2.0.6+).
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-class-loader</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>load</id>
+ <phase>validate</phase>
+ <configuration>
+ <!--
+ These two classes allow fairly well to tell the version of
plexus-utils being used:
+ a) CommandLineUtils.killProcess was added in version 1.2
+ b) RealmDelegatingClassLoader was deleted in version 1.1
+ -->
+
<classNames>org.codehaus.plexus.util.cli.CommandLineUtils,org.codehaus.plexus.util.RealmDelegatingClassLoader</classNames>
+
<pluginClassLoaderOutput>target/pcl.properties</pluginClassLoaderOutput>
+ </configuration>
+ <goals>
+ <goal>load</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3818/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
