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/26 00:03:00 UTC
svn commit: r707908 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0120-ejbClientDependency/
resources/mng-2871/ resources/mng-2871/consumer/ resources/mng-2871/ejbs/
resources/mng-2871/ejbs/tar...
Author: bentmann
Date: Sat Oct 25 15:02:59 2008
New Revision: 707908
URL: http://svn.apache.org/viewvc?rev=707908&view=rev
Log:
o Restored original intention of it0120, i.e. merely captured MNG-2921, and decoupled it from production plugins
(The test was changed in r572208 to also capture MNG-2871 which is however a substantially different issue)
o Added dedicated IT for MNG-2871
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java (contents, props changed)
- copied, changed from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0120EjbClientDependency.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ (props changed)
- copied from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0120-ejbClientDependency/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/attached.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/main.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/attached.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/main.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml (with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0120EjbClientDependency.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0120-ejbClientDependency/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/client/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/model/
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-2921/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=707908&r1=707907&r2=707908&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 25 15:02:59 2008
@@ -131,8 +131,10 @@
suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class );
suite.addTestSuite( MavenITmng3012Test.class );
suite.addTestSuite( MavenITmng2972OverridePluginDependency.class );
+ suite.addTestSuite( MavenITmng2921Test.class );
suite.addTestSuite( MavenITmng2892Test.class );
suite.addTestSuite( MavenITmng2878Test.class );
+ suite.addTestSuite( MavenITmng2871Test.class );
suite.addTestSuite( MavenITmng2861RelocationsAndRanges.class );
suite.addTestSuite( MavenITmng2790Test.class );
suite.addTestSuite( MavenITmng2749Test.class );
@@ -279,9 +281,6 @@
// suite.addTestSuite( MavenITmng3391ImportScopeErrorScenariosTest.class );
// suite.addTestSuite( MavenITmng3530DynamicPOMInterpolationTest.class );
- // -- not passing for 2.0.7 either, looks to be 2.1+ ?
- // suite.addTestSuite( MavenIT0120EjbClientDependency.class );
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
// suite.addTestSuite( MavenIT0121TransitiveDepManVersion.class ); -- MNG-3038
// suite.addTestSuite( MavenIT0122ReactorDependencyResolutionTest.class ); -- MNG-3023
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java Sat Oct 25 15:02:59 2008
@@ -0,0 +1,64 @@
+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.List;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2871">MNG-2871</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng2871Test
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng2871Test()
+ {
+ super( "(2.999,)" );
+ }
+
+ /**
+ * Verify that dependencies on not-yet-packaged sub artifacts in build phases prior to package can be satisfied
+ * from a module's output directory, i.e. with the loose class files.
+ */
+ public void testitMNG2871()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2871" );
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "consumer/target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List compileClassPath = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
+ assertEquals( 2, compileClassPath.size() );
+ assertEquals( new File( testDir, "ejbs/target/classes" ).getCanonicalFile(),
+ new File( compileClassPath.get( 1 ).toString() ).getCanonicalFile() );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871Test.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java (from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0120EjbClientDependency.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0120EjbClientDependency.java&r1=707866&r2=707908&rev=707908&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0120EjbClientDependency.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java Sat Oct 25 15:02:59 2008
@@ -19,29 +19,56 @@
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-public class MavenIT0120EjbClientDependency
+import java.io.File;
+import java.util.Collection;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2921">MNG-2921</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng2921Test
extends AbstractMavenIntegrationTestCase
{
- public void testit0120()
- throws Exception
+
+ public MavenITmng2921Test()
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0120-ejbClientDependency" );
+ super( "(2.0.6,)" );
+ }
+ /**
+ * Verify that attached project artifacts can be resolved from the reactor as active project artifacts for
+ * consumption on other module's class paths. Note the subtle difference of this test compared to the closely
+ * related issue MNG-2871: This test is about *attached* artifacts, i.e. dependencies that have already been
+ * packaged. MNG-2871 on the other hand is about dependencies that haven't been packaged yet but merely exist
+ * as loose class files in a module's output directory.
+ */
+ public void testitMNG2921()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2921" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.it0120", "parent", "1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.it0120", "client", "1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0120", "model", "1.0-SNAPSHOT", "ejb" );
-
- /* Not "install" or "higher" goal to repeat the bug */
- verifier.executeGoal( "compile" );
-
- verifier.verifyErrorFreeLog();
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "consumer/target" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ Collection compileArtifacts = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" );
+ assertTrue( compileArtifacts.toString(),
+ compileArtifacts.contains( "org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT" ) );
+ assertFalse( compileArtifacts.toString(),
+ compileArtifacts.contains( "org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT" ) );
+
+ Collection testArtifacts = verifier.loadLines( "consumer/target/test.txt", "UTF-8" );
+ assertTrue( testArtifacts.toString(),
+ testArtifacts.contains( "org.apache.maven.its.mng2921:ejbs:ejb-client:client:1.0-SNAPSHOT" ) );
+ assertTrue( testArtifacts.toString(),
+ testArtifacts.contains( "org.apache.maven.its.mng2921:tests:test-jar:tests:1.0-SNAPSHOT" ) );
}
+
}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921Test.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml Sat Oct 25 15:02:59 2008
@@ -0,0 +1,67 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng2871</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>consumer</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-2871 :: Dependency Consumer</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2871</groupId>
+ <artifactId>ejbs</artifactId>
+ <type>ejb-client</type>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <phase>validate</phase>
+ <configuration>
+ <compileClassPath>target/compile.txt</compileClassPath>
+ </configuration>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml Sat Oct 25 15:02:59 2008
@@ -0,0 +1,61 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng2871</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ejbs</artifactId>
+ <packaging>ejb</packaging>
+
+ <name>Maven Integration Test :: MNG-2871 :: EJB Client JAR Provider</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <!--
+ NOTE: This mimics the Maven Compiler Plugin which would normally set the output directory as the project's
+ artifact file.
+ -->
+ <execution>
+ <id>install</id>
+ <phase>validate</phase>
+ <configuration>
+ <mainFile>target/classes</mainFile>
+ </configuration>
+ <goals>
+ <goal>set</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties Sat Oct 25 15:02:59 2008
@@ -0,0 +1,3 @@
+# NOTE: This build output is a static part of the test and not generated by the actual test run, so apparently
+# shouldn't be cleaned.
+key = value
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/ejbs/target/classes/test.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml Sat Oct 25 15:02:59 2008
@@ -0,0 +1,41 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng2871</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-2871 :: Parent</name>
+ <description>
+ Verify that dependencies on not-yet-packaged sub artifacts in build phases prior to package can be satisfied
+ from a module's output directory, i.e. with the loose class files.
+ </description>
+
+ <modules>
+ <module>ejbs</module>
+ <module>consumer</module>
+ </modules>
+
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2871/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/
------------------------------------------------------------------------------
svn:mergeinfo =
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml Sat Oct 25 15:02:59 2008
@@ -0,0 +1,80 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng2921</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>consumer</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-2921 :: Dependency Consumer</name>
+
+ <dependencies>
+ <!--
+ NOTE: Is is an essential part of the test design to check dependencies with different scopes since active project
+ artifacts must be resolved with the same scope as the requested dependency.
+ -->
+ <dependency>
+ <groupId>org.apache.maven.its.mng2921</groupId>
+ <artifactId>ejbs</artifactId>
+ <type>ejb-client</type>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2921</groupId>
+ <artifactId>tests</artifactId>
+ <type>test-jar</type>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <phase>validate</phase>
+ <configuration>
+ <compileArtifacts>target/compile.txt</compileArtifacts>
+ <testArtifacts>target/test.txt</testArtifacts>
+ </configuration>
+ <goals>
+ <goal>compile</goal>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/attached.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/attached.jar?rev=707908&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/attached.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/main.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/main.jar?rev=707908&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/main.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml Sat Oct 25 15:02:59 2008
@@ -0,0 +1,61 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng2921</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ejbs</artifactId>
+ <packaging>ejb</packaging>
+
+ <name>Maven Integration Test :: MNG-2921 :: EJB Client JAR Provider</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>validate</phase>
+ <configuration>
+ <mainFile>main.jar</mainFile>
+ <attachedFile>attached.jar</attachedFile>
+ <artifactType>ejb-client</artifactType>
+ <artifactClassifier>client</artifactClassifier>
+ </configuration>
+ <goals>
+ <goal>set</goal>
+ <goal>attach</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/ejbs/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml?rev=707908&r1=707866&r2=707908&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/pom.xml Sat Oct 25 15:02:59 2008
@@ -9,7 +9,7 @@
"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
+ 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
@@ -19,20 +19,27 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0120</groupId>
+
+ <groupId>org.apache.maven.its.mng2921</groupId>
<artifactId>parent</artifactId>
- <name>Parent</name>
- <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-2921 :: Parent</name>
+ <description>
+ Verify that attached project artifacts can be resolved from the reactor as active project artifacts for
+ consumption on other module's class paths. Note the subtle difference of this test compared to the closely
+ related issue MNG-2871: This test is about *attached* artifacts, i.e. dependencies that have already been
+ packaged. MNG-2871 on the other hand is about dependencies that haven't been packaged yet but merely exist
+ as loose class files in a module's output directory.
+ </description>
+
<modules>
- <module>model</module>
- <module>client</module>
+ <module>tests</module>
+ <module>ejbs</module>
+ <module>consumer</module>
</modules>
- <properties>
- <issue>MNG-2921,MNG-2871</issue>
- </properties>
+
</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/attached.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/attached.jar?rev=707908&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/attached.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/main.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/main.jar?rev=707908&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/main.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml?rev=707908&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml Sat Oct 25 15:02:59 2008
@@ -0,0 +1,61 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng2921</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tests</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-2921 :: Test JAR Provider</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>validate</phase>
+ <configuration>
+ <mainFile>main.jar</mainFile>
+ <attachedFile>attached.jar</attachedFile>
+ <artifactType>test-jar</artifactType>
+ <artifactClassifier>tests</artifactClassifier>
+ </configuration>
+ <goals>
+ <goal>set</goal>
+ <goal>attach</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2921/tests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision