You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/09/11 18:00:12 UTC
svn commit: r813889 - in
/maven/plugins/trunk/maven-remote-resources-plugin/src:
it/resources/bootstrap/
it/resources/bootstrap/resource-bundle-with-org-processing/
it/resources/bootstrap/resource-bundle-with-org-processing/src/
it/resources/bootstrap/...
Author: jdcasey
Date: Fri Sep 11 16:00:11 2009
New Revision: 813889
URL: http://svn.apache.org/viewvc?rev=813889&view=rev
Log:
[MRRESOURCES-43] Adding IT. Next is some doco, then we're done as far as I'm concerned.
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/pom.xml (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/DEPENDENCIES.vm (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/pom.xml (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/Dep.java (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/pom.xml (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/pom.xml (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/supplemental-models.xml (with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java (with props)
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml?rev=813889&r1=813888&r2=813889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/pom.xml Fri Sep 11 16:00:11 2009
@@ -31,6 +31,13 @@
<name>IT Bootstrap</name>
+ <distributionManagement>
+ <repository>
+ <id>it-remote</id>
+ <url>file:${remoteRepository}</url>
+ </repository>
+ </distributionManagement>
+
<repositories>
<repository>
<id>main-local</id>
@@ -40,6 +47,7 @@
<modules>
<module>resource-bundle-with-template</module>
+ <module>resource-bundle-with-org-processing</module>
</modules>
</project>
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/pom.xml?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/pom.xml (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/pom.xml Fri Sep 11 16:00:11 2009
@@ -0,0 +1,54 @@
+<?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.plugin.rresource.it</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>${project.version}</version>
+ </parent>
+
+ <artifactId>resource-bundle-with-org-processing</artifactId>
+
+ <name>Resource Bundle with Organization Processing</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+
+ <!-- Use an established version, not the one currently under test. -->
+ <version>1.0</version>
+
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/DEPENDENCIES.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/DEPENDENCIES.vm?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/DEPENDENCIES.vm (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/DEPENDENCIES.vm Fri Sep 11 16:00:11 2009
@@ -0,0 +1,10 @@
+Built-In: #if ($projectName)$projectName#else${project.name}#end
+
+#foreach ( $organizationName in $projectsSortedByOrganization.keySet() )
+From: '$organizationName.name'#if($organizationName.url) ($organizationName.url)#end
+
+#foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) )
+ - $project.name #if ($project.url)($project.url)#end $project.artifact
+#end
+
+#end
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bootstrap/resource-bundle-with-org-processing/src/main/resources/DEPENDENCIES.vm
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml Fri Sep 11 16:00:11 2009
@@ -0,0 +1,71 @@
+<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.plugin.rresource.it.mrr43</groupId>
+ <artifactId>supplemental-artifact</artifactId>
+ <version>1</version>
+
+ <name>Supplemental Artifact Consumer</name>
+
+ <repositories>
+ <repository>
+ <id>it-remote</id>
+ <url>file:${remoteRepository}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>main-local</id>
+ <url>file:${localRepository}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugin.rresource.it.mrr43</groupId>
+ <artifactId>deficient-dep</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>${project.version}</version>
+
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <supplementalModels>
+ <supplementalModel>supplemental-models.xml</supplementalModel>
+ </supplementalModels>
+
+ <supplementalModelArtifacts>
+ <supplementalModelArtifact>org.apache.maven.plugin.rresource.it.mrr43:supplemental-models:1</supplementalModelArtifact>
+ </supplementalModelArtifacts>
+
+ <resourceBundles>
+ <resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-org-processing:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/pom.xml?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/pom.xml (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/pom.xml Fri Sep 11 16:00:11 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>resources</artifactId>
+ <groupId>org.apache.maven.plugin.rresource.it.mrr43</groupId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>deficient-dep</artifactId>
+</project>
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/Dep.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/Dep.java?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/Dep.java (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/Dep.java Fri Sep 11 16:00:11 2009
@@ -0,0 +1,13 @@
+package org.apache.maven.test.plugin.mrr43;
+
+/**
+ * Hello world!
+ *
+ */
+public class Dep
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/deficient-dep/src/main/java/org/apache/maven/test/plugin/mrr43/Dep.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/pom.xml?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/pom.xml (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/pom.xml Fri Sep 11 16:00:11 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.plugin.rresource.it.mrr43</groupId>
+ <artifactId>resources</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>supplemental-models</module>
+ <module>deficient-dep</module>
+ </modules>
+
+ <distributionManagement>
+ <repository>
+ <id>it-remote</id>
+ <url>file:${remoteRepository}</url>
+ </repository>
+ </distributionManagement>
+</project>
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/pom.xml?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/pom.xml (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/pom.xml Fri Sep 11 16:00:11 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>resources</artifactId>
+ <groupId>org.apache.maven.plugin.rresource.it.mrr43</groupId>
+ <version>1</version>
+ </parent>
+
+ <artifactId>supplemental-models</artifactId>
+
+</project>
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/supplemental-models.xml?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/supplemental-models.xml (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/supplemental-models.xml Fri Sep 11 16:00:11 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels>
+ <supplement>
+ <project>
+ <groupId>org.apache.maven.plugin.rresource.it.mrr43</groupId>
+ <artifactId>deficient-dep</artifactId>
+
+ <name>Deficient Dependency</name>
+ <url>http://www.deficient-tools.us/dep</url>
+
+ <organization>
+ <name>Deficient Tooling, Inc.</name>
+ <url>http://www.deficient-tools.us/</url>
+ </organization>
+ </project>
+ </supplement>
+</supplementalDataModels>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/resource-projects/supplemental-models/src/main/resources/supplemental-models.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java?rev=813889&view=auto
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java (added)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java Fri Sep 11 16:00:11 2009
@@ -0,0 +1,67 @@
+package org.apache.maven.plugin.resources.remote.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.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+/**
+ * @author John Casey
+ */
+public class IT_SupplementalArtifact
+ extends AbstractIT
+{
+
+ public void test()
+ throws IOException, URISyntaxException, VerificationException
+ {
+ File dir = TestUtils.getTestDir( "supplemental-artifact" );
+ File resources = new File( dir, "resource-projects" );
+
+ Verifier verifier;
+
+ verifier = new Verifier( resources.getAbsolutePath() );
+
+ verifier.deleteArtifacts( "org.apache.maven.plugin.rresource.it.mrr43" );
+
+ verifier.executeGoal( "deploy" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier = new Verifier( dir.getAbsolutePath() );
+
+ verifier.executeGoal( "generate-resources" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
+ String content = FileUtils.fileRead( output );
+
+ assertTrue( content.indexOf( "From: 'Deficient Tooling, Inc.' (http://www.deficient-tools.us/)" ) > -1 );
+ assertTrue( content.indexOf( "Deficient Dependency (http://www.deficient-tools.us/dep) org.apache.maven.plugin.rresource.it.mrr43:deficient-dep" ) > -1 );
+ }
+
+}
Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_SupplementalArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java?rev=813889&r1=813888&r2=813889&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java Fri Sep 11 16:00:11 2009
@@ -21,7 +21,7 @@
Verifier verifier = new Verifier( bootstrapDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
+ verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();