You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/10/18 11:49:09 UTC
svn commit: r705867 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0112-extensionsThatDragDependencies/
resources/mng-2228/ resources/mng-2228/repo/ resources/mng-2228/repo/org/
resources/mng-22...
Author: bentmann
Date: Sat Oct 18 02:49:08 2008
New Revision: 705867
URL: http://svn.apache.org/viewvc?rev=705867&view=rev
Log:
o Rewrote it0112 to use dedicated IT artifacts and IT support plugin instead of production artifacts/plugins
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java (contents, props changed)
- copied, changed from r705849, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0112ExtensionsThatDragDependencies.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/ (props changed)
- copied from r705849, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0112-extensionsThatDragDependencies/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0112ExtensionsThatDragDependencies.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0112-extensionsThatDragDependencies/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/test-extension/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/test-project/
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=705867&r1=705866&r2=705867&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 18 02:49:08 2008
@@ -144,6 +144,7 @@
suite.addTestSuite( MavenITmng2277AggregatorAndResolutionPluginsTest.class );
suite.addTestSuite( MavenITmng2254PomEncodingTest.class );
suite.addTestSuite( MavenITmng2234ActiveProfilesFromSettingsTest.class );
+ suite.addTestSuite( MavenITmng2228Test.class );
suite.addTestSuite( MavenITmng2123VersionRangeDependencyTest.class );
suite.addTestSuite( MavenITmng2068ReactorRelativeParentsTest.class );
suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class );
@@ -170,7 +171,6 @@
suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class );
suite.addTestSuite( MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class );
suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class );
- suite.addTestSuite( MavenIT0112ExtensionsThatDragDependencies.class );
suite.addTestSuite( MavenIT0110PluginDependenciesComeFromPluginReposTest.class );
suite.addTestSuite( MavenIT0107Test.class );
suite.addTestSuite( MavenIT0106Test.class );
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java (from r705849, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0112ExtensionsThatDragDependencies.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0112ExtensionsThatDragDependencies.java&r1=705849&r2=705867&rev=705867&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0112ExtensionsThatDragDependencies.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java Sat Oct 18 02:49:08 2008
@@ -23,33 +23,35 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Properties;
-public class MavenIT0112ExtensionsThatDragDependencies
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2228">MNG-2228</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng2228Test
extends AbstractMavenIntegrationTestCase
{
- public void testit0112()
+
+ /**
+ * Verify that components injected into plugins are actually assignment-compatible with the corresponding mojo
+ * fields in case the field type is both provided by a plugin dependency and by a build extension.
+ */
+ public void testitMNG2228()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0112-extensionsThatDragDependencies" );
-
- Verifier verifier;
-
- // Install the parent POM
- verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0112", "test-extension", "1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0112", "test-project", "1.0-SNAPSHOT", "jar" );
-
- // Install the extension with the resources required for the test
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-extension" ).getAbsolutePath() );
- verifier.executeGoal( "install" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2228" );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- // Run the whole test
- verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
- verifier.executeGoal( "org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1:scm" );
- // ommitted because we always get velocity errors that aren't covered by the verifier
-// verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ Properties apiProps = verifier.loadProperties( "target/api.properties" );
+ assertEquals( "true", apiProps.getProperty( "org.apache.maven.its.mng2228.DefaultComponent" ) );
}
+
}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228Test.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/
------------------------------------------------------------------------------
svn:mergeinfo =
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml?rev=705867&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml Sat Oct 18 02:49:08 2008
@@ -0,0 +1,91 @@
+<?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.mng2228</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+
+ <name>Maven Integration Test :: MNG-2228</name>
+ <description>
+ Verify that components injected into plugins are actually assignment-compatible with the corresponding mojo
+ fields in case the field type is both provided by a plugin dependency and by a build extension.
+ </description>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <extensions>
+ <!-- load component api and implementation into core/extension realm -->
+ <extension>
+ <groupId>org.apache.maven.its.mng2228</groupId>
+ <artifactId>component</artifactId>
+ <version>0.1</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-class-loader</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>api</id>
+ <phase>validate</phase>
+ <configuration>
+ <className>org.apache.maven.its.mng2228.Component</className>
+ <instanceofPropertiesFile>target/api.properties</instanceofPropertiesFile>
+ </configuration>
+ <goals>
+ <goal>instanceof</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <!-- load component api and implementation into plugin realm -->
+ <dependency>
+ <groupId>org.apache.maven.its.mng2228</groupId>
+ <artifactId>api</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2228</groupId>
+ <artifactId>component</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.jar?rev=705867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.pom?rev=705867&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/0.1/api-0.1.pom Sat Oct 18 02:49:08 2008
@@ -0,0 +1,55 @@
+<?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.mng2228</groupId>
+ <artifactId>api</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml?rev=705867&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml Sat Oct 18 02:49:08 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng2228</groupId>
+ <artifactId>api</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081017220645</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/api/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.jar?rev=705867&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.pom?rev=705867&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/0.1/component-0.1.pom Sat Oct 18 02:49:08 2008
@@ -0,0 +1,79 @@
+<?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.mng2228</groupId>
+ <artifactId>component</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2228</groupId>
+ <artifactId>api</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml?rev=705867&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml Sat Oct 18 02:49:08 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.mng2228</groupId>
+ <artifactId>component</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20081017220638</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2228/repo/org/apache/maven/its/mng2228/component/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision