You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/07/21 13:51:18 UTC
svn commit: r678398 - in /maven/components/branches/MNG-2477: ./
maven-distribution/src/conf/
maven-embedder/src/test/java/org/apache/maven/embedder/
maven-embedder/src/test/resources/ maven-embedder/src/test/resources/gpg/
maven-project/src/main/resou...
Author: brett
Date: Mon Jul 21 04:51:17 2008
New Revision: 678398
URL: http://svn.apache.org/viewvc?rev=678398&view=rev
Log:
load the Maven KEYS file as it stands today into the default key ring. switch to the temporary test signed repository.
Modified:
maven/components/branches/MNG-2477/build.xml
maven/components/branches/MNG-2477/maven-distribution/src/conf/pubring.gpg
maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/branches/MNG-2477/maven-embedder/src/test/resources/gpg/pubring.gpg
maven/components/branches/MNG-2477/maven-embedder/src/test/resources/pom2.xml
maven/components/branches/MNG-2477/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
maven/components/branches/MNG-2477/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
Modified: maven/components/branches/MNG-2477/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/build.xml?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/build.xml (original)
+++ maven/components/branches/MNG-2477/build.xml Mon Jul 21 04:51:17 2008
@@ -104,7 +104,7 @@
<modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
<modello file="maven-profile/src/main/mdo/profiles.mdo"/>
- <modello file="maven-core/src/main/mdo/settings.mdo"/>
+ <modello file="maven-core/src/main/mdo/settings.mdo" version="2.1.0"/>
<modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
</target>
Modified: maven/components/branches/MNG-2477/maven-distribution/src/conf/pubring.gpg
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-distribution/src/conf/pubring.gpg?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java (original)
+++ maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderTestCase.java Mon Jul 21 04:51:17 2008
@@ -19,8 +19,7 @@
* under the License.
*/
-import java.io.File;
-
+import org.apache.maven.artifact.manager.WagonManager;
import org.codehaus.plexus.PlexusTestCase;
public abstract class AbstractEmbedderTestCase
@@ -41,6 +40,9 @@
configuration.setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE );
maven = new MavenEmbedder( configuration );
+
+ WagonManager wagonManager = (WagonManager) maven.getPlexusContainer().lookup( WagonManager.ROLE );
+ wagonManager.registerPublicKeyRing( getClass().getResourceAsStream( "/gpg/pubring.gpg" ) );
}
protected void tearDown()
Modified: maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java (original)
+++ maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderProjectWithExtensionReadingTest.java Mon Jul 21 04:51:17 2008
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
@@ -48,7 +49,10 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
MavenEmbedder embedder = new ExtendableMavenEmbedder( classLoader );
-
+
+ WagonManager wagonManager = (WagonManager) embedder.getPlexusContainer().lookup( WagonManager.ROLE );
+ wagonManager.registerPublicKeyRing( getClass().getResourceAsStream( "/gpg/pubring.gpg" ) );
+
// Here we take the artifact handler and programmatically place it into the container
ComponentDescriptor cd = new ComponentDescriptor();
Modified: maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/branches/MNG-2477/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Mon Jul 21 04:51:17 2008
@@ -252,8 +252,8 @@
Artifact p = (Artifact) project.getPluginArtifactMap().get( plugin.getKey() );
assertEquals( "2.2", p.getVersion() );
- /* Add the surefire plugin 2.3 to the pom */
- plugin.setVersion( "2.3" );
+ /* Add the surefire plugin 2.4.2 to the pom */
+ plugin.setVersion( "2.4.2" );
writer = WriterFactory.newXmlWriter( pom );
maven.writeModel( writer, model );
writer.close();
@@ -268,7 +268,7 @@
project = result.getProject();
p = (Artifact) project.getPluginArtifactMap().get( plugin.getKey() );
- assertEquals( "2.3", p.getVersion() );
+ assertEquals( "2.4.2", p.getVersion() );
}
// ----------------------------------------------------------------------
Modified: maven/components/branches/MNG-2477/maven-embedder/src/test/resources/gpg/pubring.gpg
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder/src/test/resources/gpg/pubring.gpg?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/components/branches/MNG-2477/maven-embedder/src/test/resources/pom2.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-embedder/src/test/resources/pom2.xml?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-embedder/src/test/resources/pom2.xml (original)
+++ maven/components/branches/MNG-2477/maven-embedder/src/test/resources/pom2.xml Mon Jul 21 04:51:17 2008
@@ -40,7 +40,7 @@
<plugin>
<!-- it's here just for the extensions tag -->
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.2</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: maven/components/branches/MNG-2477/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original)
+++ maven/components/branches/MNG-2477/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Mon Jul 21 04:51:17 2008
@@ -24,10 +24,10 @@
<repositories>
<repository>
- <id>central</id>
+ <id>central-signed</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
+ <url>http://repo1.maven.org/maven2-signed</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@@ -39,9 +39,9 @@
<pluginRepositories>
<pluginRepository>
- <id>central</id>
+ <id>central-signed</id>
<name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
+ <url>http://repo1.maven.org/maven2-signed</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
Modified: maven/components/branches/MNG-2477/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2477/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java?rev=678398&r1=678397&r2=678398&view=diff
==============================================================================
--- maven/components/branches/MNG-2477/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java (original)
+++ maven/components/branches/MNG-2477/maven-project/src/test/java/org/apache/maven/project/SuperPomProjectBuilderTest.java Mon Jul 21 04:51:17 2008
@@ -1,16 +1,5 @@
package org.apache.maven.project;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Profile;
-import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
-import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,6 +19,17 @@
* under the License.
*/
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Profile;
+import org.apache.maven.model.Repository;
+import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.activation.DefaultProfileActivationContext;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
public class SuperPomProjectBuilderTest
extends AbstractMavenProjectTestCase
{
@@ -71,10 +71,10 @@
{
MavenProject project = projectBuilder.buildStandaloneSuperProject();
- assertRepository( "central", project.getRepositories() );
- assertRepository( "central", project.getPluginRepositories() );
- assertArtifactRepository( "central", project.getRemoteArtifactRepositories() );
- assertArtifactRepository( "central", project.getPluginArtifactRepositories() );
+ assertRepository( "central-signed", project.getRepositories() );
+ assertRepository( "central-signed", project.getPluginRepositories() );
+ assertArtifactRepository( "central-signed", project.getRemoteArtifactRepositories() );
+ assertArtifactRepository( "central-signed", project.getPluginArtifactRepositories() );
}
private void assertArtifactRepository( String id,
@@ -119,4 +119,4 @@
assertTrue( found );
}
-}
\ No newline at end of file
+}