Author: bentmann
Date: Thu Oct 29 14:45:04 2009
New Revision: 830971
URL: http://svn.apache.org/viewvc?rev=830971&view=rev
Log:
o Added IT to check handling of missing/invalid POMs
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
(with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.jar
(with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/missing/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/missing/0.1/
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/missing/0.1/missing-0.1.jar
(with props)
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
(with props)
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml?rev=830971&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
Thu Oct 29 14:45:04 2009
@@ -0,0 +1,58 @@
+<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>it-parent</artifactId>
+ <version>${project.version}</version>
+ <relativePath>../it-parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.plugin.rresource.it</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+
+ <repositories>
+ <repository>
+ <id>test</id>
+ <url>file:///${it.dir}/repo</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <!-- dependency with missing POM -->
+ <groupId>test</groupId>
+ <artifactId>missing</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <!-- dependency with invalid POM -->
+ <groupId>test</groupId>
+ <artifactId>invalid</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>remote-resources</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-template:${project.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.jar?rev=830971&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom?rev=830971&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/invalid/0.1/invalid-0.1.pom
Thu Oct 29 14:45:04 2009
@@ -0,0 +1,34 @@
+<!--
+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>test</groupId>
+ <artifactId>invalid</artifactId>
+ <version>0.1</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>unversioned</artifactId>
+ <!-- missing version -->
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/missing/0.1/missing-0.1.jar
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/missing/0.1/missing-0.1.jar?rev=830971&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/repo/test/missing/0.1/missing-0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.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_BadDependencyPoms.java?rev=830971&view=auto
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
(added)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
Thu Oct 29 14:45:04 2009
@@ -0,0 +1,58 @@
+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 Benjamin Bentmann
+ */
+public class IT_BadDependencyPoms
+ extends AbstractIT
+{
+
+ public void test()
+ throws IOException, URISyntaxException, VerificationException
+ {
+ File dir = TestUtils.getTestDir( "bad-dependency-poms" );
+
+ Verifier verifier;
+
+ verifier = new Verifier( dir.getAbsolutePath() );
+ verifier.deleteArtifacts( "test" );
+ verifier.getSystemProperties().setProperty( "it.dir",
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( "Dependency Id: test:missing:0.1" ) >= 0
);
+ }
+
+}
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_BadDependencyPoms.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
