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 2009/08/12 12:30:04 UTC
svn commit: r803432 - in /maven/core-integration-testing/trunk:
core-it-suite/src/test/java/org/apache/maven/it/
core-it-suite/src/test/resources/mng-4293/
core-it-suite/src/test/resources/mng-4293/repo/
core-it-suite/src/test/resources/mng-4293/repo/o...
Author: bentmann
Date: Wed Aug 12 10:30:03 2009
New Revision: 803432
URL: http://svn.apache.org/viewvc?rev=803432&view=rev
Log:
[MNG-4293] Extend Mojo API to allow resolution of both compile and runtime dependencies
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/system-0.1.jar (with props)
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java (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=803432&r1=803431&r2=803432&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 Wed Aug 12 10:30:03 2009
@@ -86,6 +86,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+ suite.addTestSuite( MavenITmng4293RequiresCompilePlusRuntimeScopeTest.class );
suite.addTestSuite( MavenITmng4291MojoRequiresOnlineModeTest.class );
suite.addTestSuite( MavenITmng4283ParentPomPackagingTest.class );
suite.addTestSuite( MavenITmng4281PreferLocalSnapshotTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java Wed Aug 12 10:30:03 2009
@@ -0,0 +1,80 @@
+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;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4293">MNG-4293</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4293RequiresCompilePlusRuntimeScopeTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ /*
+ * NOTE: Class path ordering is another issue (MNG-1412), so we merely check set containment here.
+ */
+
+ public MavenITmng4293RequiresCompilePlusRuntimeScopeTest()
+ {
+ super( "[3.0-alpha3,)" );
+ }
+
+ /**
+ * Test support of "@requiresDependencyResolution compile+runtime".
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4293" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4293" );
+ Properties filterProps = verifier.newDefaultFilterProperties();
+ verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", filterProps );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List compileClassPath = verifier.loadLines( "target/compile-cp.txt", "UTF-8" );
+ assertTrue( compileClassPath.toString(), compileClassPath.contains( "system-0.1.jar" ) );
+ assertTrue( compileClassPath.toString(), compileClassPath.contains( "provided-0.1.jar" ) );
+ assertTrue( compileClassPath.toString(), compileClassPath.contains( "compile-0.1.jar" ) );
+ assertFalse( compileClassPath.toString(), compileClassPath.contains( "test-0.1.jar" ) );
+
+ List runtimeClassPath = verifier.loadLines( "target/runtime-cp.txt", "UTF-8" );
+ assertTrue( runtimeClassPath.toString(), runtimeClassPath.contains( "compile-0.1.jar" ) );
+ assertTrue( runtimeClassPath.toString(), runtimeClassPath.contains( "runtime-0.1.jar" ) );
+ assertFalse( runtimeClassPath.toString(), runtimeClassPath.contains( "test-0.1.jar" ) );
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml Wed Aug 12 10:30:03 2009
@@ -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.mng4293</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4293</name>
+ <description>
+ Test support of "@requiresDependencyResolution compile+runtime".
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>provided</artifactId>
+ <version>0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>compile</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>system</artifactId>
+ <version>0.1</version>
+ <scope>system</scope>
+ <systemPath>@basedir@/system-0.1.jar</systemPath>
+ </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>test</id>
+ <phase>validate</phase>
+ <configuration>
+ <compileClassPath>target/compile-cp.txt</compileClassPath>
+ <runtimeClassPath>target/runtime-cp.txt</runtimeClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <goals>
+ <goal>compile-runtime</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/pom-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.jar?rev=803432&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.pom?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/0.1/compile-0.1.pom Wed Aug 12 10:30:03 2009
@@ -0,0 +1,45 @@
+<?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.mng4293</groupId>
+ <artifactId>compile</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4293</name>
+ <description>
+ Test support of "@requiresDependencyResolution compile+runtime".
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml Wed Aug 12 10:30:03 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>compile</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090812095120</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/compile/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.jar?rev=803432&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.pom?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/0.1/provided-0.1.pom Wed Aug 12 10:30:03 2009
@@ -0,0 +1,45 @@
+<?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.mng4293</groupId>
+ <artifactId>provided</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4293</name>
+ <description>
+ Test support of "@requiresDependencyResolution compile+runtime".
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml Wed Aug 12 10:30:03 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>provided</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090812095142</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/provided/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.jar?rev=803432&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.pom?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/0.1/runtime-0.1.pom Wed Aug 12 10:30:03 2009
@@ -0,0 +1,45 @@
+<?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.mng4293</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4293</name>
+ <description>
+ Test support of "@requiresDependencyResolution compile+runtime".
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml Wed Aug 12 10:30:03 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090812095134</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/runtime/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.jar?rev=803432&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.pom?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.pom (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/0.1/test-0.1.pom Wed Aug 12 10:30:03 2009
@@ -0,0 +1,45 @@
+<?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.mng4293</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4293</name>
+ <description>
+ Test support of "@requiresDependencyResolution compile+runtime".
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+</project>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml Wed Aug 12 10:30:03 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4293</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <versioning>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20090812095152</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/repo/org/apache/maven/its/mng4293/test/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml Wed Aug 12 10:30:03 2009
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<settings>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/system-0.1.jar
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/system-0.1.jar?rev=803432&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4293/system-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java?rev=803432&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java (added)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java Wed Aug 12 10:30:03 2009
@@ -0,0 +1,127 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * 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.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Creates text files that list the dependencies with scope compile and runtime in the order returned from the Maven
+ * core.
+ *
+ * @goal compile-runtime
+ * @requiresDependencyResolution compile+runtime
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class CompileRuntimeMojo
+ extends AbstractDependencyMojo
+{
+
+ /**
+ * The path to the output file for the project artifacts, relative to the project base directory. Each line of this
+ * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
+ * disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
+ * that do not contribute to the class path.
+ *
+ * @parameter expression="${depres.projectArtifacts}"
+ */
+ private String projectArtifacts;
+
+ /**
+ * The path to the output file for the compile artifacts, relative to the project base directory. Each line of this
+ * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
+ * disk.
+ *
+ * @parameter expression="${depres.compileArtifacts}"
+ */
+ private String compileArtifacts;
+
+ /**
+ * The path to the output file for the compile class path, relative to the project base directory. Each line of
+ * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
+ * will not be written to disk.
+ *
+ * @parameter expression="${depres.compileClassPath}"
+ */
+ private String compileClassPath;
+
+ /**
+ * The path to the properties file for the checksums of the compile class path elements, relative to the project
+ * base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
+ * the JAR. If not specified, the class path checksums will not be calculated.
+ *
+ * @parameter expression="${depres.compileClassPathChecksums}"
+ */
+ private String compileClassPathChecksums;
+
+ /**
+ * The path to the output file for the runtime artifacts, relative to the project base directory. Each line of this
+ * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
+ * disk.
+ *
+ * @parameter expression="${depres.runtimeArtifacts}"
+ */
+ private String runtimeArtifacts;
+
+ /**
+ * The path to the output file for the runtime class path, relative to the project base directory. Each line of
+ * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
+ * will not be written to disk.
+ *
+ * @parameter expression="${depres.runtimeClassPath}"
+ */
+ private String runtimeClassPath;
+
+ /**
+ * The path to the properties file for the checksums of the runtime class path elements, relative to the project
+ * base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
+ * the JAR. If not specified, the class path checksums will not be calculated.
+ *
+ * @parameter expression="${depres.runtimeClassPathChecksums}"
+ */
+ private String runtimeClassPathChecksums;
+
+ /**
+ * Runs this mojo.
+ *
+ * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
+ */
+ public void execute()
+ throws MojoExecutionException
+ {
+ try
+ {
+ writeArtifacts( projectArtifacts, project.getArtifacts() );
+ writeArtifacts( compileArtifacts, project.getCompileArtifacts() );
+ writeClassPath( compileClassPath, project.getCompileClasspathElements() );
+ writeClassPathChecksums( compileClassPathChecksums, project.getCompileClasspathElements() );
+ writeArtifacts( runtimeArtifacts, project.getRuntimeArtifacts() );
+ writeClassPath( runtimeClassPath, project.getRuntimeClasspathElements() );
+ writeClassPathChecksums( runtimeClassPathChecksums, project.getRuntimeClasspathElements() );
+ }
+ catch ( DependencyResolutionRequiredException e )
+ {
+ throw new MojoExecutionException( "Failed to resolve dependencies", e );
+ }
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision