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 2010/09/16 14:10:53 UTC
svn commit: r997708 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-4309/ resources/mng-4309/repo/
resources/mng-4309/repo/org/ resources/mng-4309/repo/org/apache/
resources/mng-4309/repo/org/a...
Author: bentmann
Date: Thu Sep 16 12:10:52 2010
New Revision: 997708
URL: http://svn.apache.org/viewvc?rev=997708&view=rev
Log:
[MNG-4309] Checksum validation doesn't fail the build for repository metadata files
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml.sha1
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml.sha1
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=997708&r1=997707&r2=997708&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 Thu Sep 16 12:10:52 2010
@@ -208,6 +208,7 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenITmng4317PluginVersionResolutionFromMultiReposTest.class );
suite.addTestSuite( MavenITmng4314DirectInvocationOfAggregatorTest.class );
suite.addTestSuite( MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.class );
+ suite.addTestSuite( MavenITmng4309StrictChecksumValidationForMetadataTest.class );
suite.addTestSuite( MavenITmng4305LocalRepoBasedirTest.class );
suite.addTestSuite( MavenITmng4304ProjectDependencyArtifactsTest.class );
suite.addTestSuite( MavenITmng4293RequiresCompilePlusRuntimeScopeTest.class );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java?rev=997708&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java Thu Sep 16 12:10:52 2010
@@ -0,0 +1,70 @@
+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.FileUtils;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4309">MNG-4309</a>.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4309StrictChecksumValidationForMetadataTest
+ extends AbstractMavenIntegrationTestCase
+{
+
+ public MavenITmng4309StrictChecksumValidationForMetadataTest()
+ {
+ super( "[3.0-beta-3,)" );
+ }
+
+ /**
+ * Verify that strict checksum verification applies to metadata as well and in particular fails the build
+ * during deployment when the previous metadata is corrupt.
+ */
+ public void testit()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4309" );
+
+ Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng4309" );
+ FileUtils.copyDirectoryStructure( new File( testDir, "repo" ), new File( testDir, "target/repo" ) );
+ verifier.getCliOptions().add( "--strict-checksums" );
+ try
+ {
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ fail( "Checksum mismatch for metadata did not fail the build despite strict mode" );
+ }
+ catch ( VerificationException e )
+ {
+ // expected
+ }
+ verifier.resetStreams();
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml?rev=997708&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml Thu Sep 16 12:10:52 2010
@@ -0,0 +1,66 @@
+<?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.mng4309</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4309</name>
+ <description>
+ Verify that strict checksum verification applies to metadata as well and in particular fails the build
+ during deployment when the previous metadata is corrupt.
+ </description>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/target/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-artifact</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <mainFile>pom.xml</mainFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>set</goal>
+ <goal>install</goal>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml?rev=997708&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml Thu Sep 16 12:10:52 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4309</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <timestamp>20100916.111632</timestamp>
+ <buildNumber>1</buildNumber>
+ </snapshot>
+ <lastUpdated>20100916111632</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml.sha1?rev=997708&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml.sha1 (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/0.1-SNAPSHOT/maven-metadata.xml.sha1 Thu Sep 16 12:10:52 2010
@@ -0,0 +1 @@
+ba2b05c8a271be5aa8f536fadebf7b3691458408
\ No newline at end of file
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml?rev=997708&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml Thu Sep 16 12:10:52 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4309</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <versioning>
+ <versions>
+ <version>0.1-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20100916111632</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml.sha1
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml.sha1?rev=997708&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml.sha1 (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4309/repo/org/apache/maven/its/mng4309/test/maven-metadata.xml.sha1 Thu Sep 16 12:10:52 2010
@@ -0,0 +1 @@
+70ad19ff9d0a31210f794cd82a237105d4200a6e
\ No newline at end of file