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 2011/05/24 05:26:28 UTC
svn commit: r1126848 - in /maven/maven-3/branches/mirror-group-routing:
maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
maven-core/pom.xml pom.xml pom.xml.orig
Author: jdcasey
Date: Tue May 24 03:26:27 2011
New Revision: 1126848
URL: http://svn.apache.org/viewvc?rev=1126848&view=rev
Log:
rename auto-mirror-model to routem-api
Modified:
maven/maven-3/branches/mirror-group-routing/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
maven/maven-3/branches/mirror-group-routing/maven-core/pom.xml
maven/maven-3/branches/mirror-group-routing/pom.xml
maven/maven-3/branches/mirror-group-routing/pom.xml.orig
Modified: maven/maven-3/branches/mirror-group-routing/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java?rev=1126848&r1=1126847&r2=1126848&view=diff
==============================================================================
--- maven/maven-3/branches/mirror-group-routing/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java (original)
+++ maven/maven-3/branches/mirror-group-routing/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java Tue May 24 03:26:27 2011
@@ -68,7 +68,10 @@ public class DefaultMirrorSelector
return mirror;
}
- if ( mirror == null )
+ // FIXME: I suspect we need a better approach than simply punting when the session hasn't
+ // been set. This will nullify the mirror selection taking place in the
+ // DefaultMavenExecutionRequestPopulator.
+ if ( mirror == null && legacySupport.getSession() != null )
{
final String repoUrl = repository.getUrl();
Modified: maven/maven-3/branches/mirror-group-routing/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/maven-core/pom.xml?rev=1126848&r1=1126847&r2=1126848&view=diff
==============================================================================
--- maven/maven-3/branches/mirror-group-routing/maven-core/pom.xml (original)
+++ maven/maven-3/branches/mirror-group-routing/maven-core/pom.xml Tue May 24 03:26:27 2011
@@ -58,6 +58,10 @@
<artifactId>maven-aether-provider</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-routem-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
@@ -103,10 +107,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-auto-mirror-model</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
Modified: maven/maven-3/branches/mirror-group-routing/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/pom.xml?rev=1126848&r1=1126847&r2=1126848&view=diff
==============================================================================
--- maven/maven-3/branches/mirror-group-routing/pom.xml (original)
+++ maven/maven-3/branches/mirror-group-routing/pom.xml Tue May 24 03:26:27 2011
@@ -140,7 +140,7 @@
<module>maven-model-builder</module>
<module>maven-embedder</module>
<module>maven-compat</module>
- <module>maven-auto-mirror-model</module>
+ <module>maven-routem-api</module>
</modules>
<scm>
@@ -171,7 +171,7 @@
<!--bootstrap-start-comment-->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-auto-mirror-model</artifactId>
+ <artifactId>maven-routem-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -345,7 +345,7 @@
<version>${jxpathVersion}</version>
</dependency>
- <!-- START: Used in auto-mirror handling -->
+ <!-- START: Used in Route-M auto-mirror handling -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Modified: maven/maven-3/branches/mirror-group-routing/pom.xml.orig
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/mirror-group-routing/pom.xml.orig?rev=1126848&r1=1126847&r2=1126848&view=diff
==============================================================================
--- maven/maven-3/branches/mirror-group-routing/pom.xml.orig (original)
+++ maven/maven-3/branches/mirror-group-routing/pom.xml.orig Tue May 24 03:26:27 2011
@@ -1,6 +1,5 @@
<?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
@@ -8,9 +7,7 @@
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/xsd/maven-4.0.0.xsd">
+ --><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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -143,6 +140,7 @@
<module>maven-model-builder</module>
<module>maven-embedder</module>
<module>maven-compat</module>
+ <module>maven-auto-mirror-model</module>
</modules>
<scm>
@@ -173,6 +171,11 @@
<!--bootstrap-start-comment-->
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-auto-mirror-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${project.version}</version>
</dependency>
@@ -341,6 +344,20 @@
<artifactId>commons-jxpath</artifactId>
<version>${jxpathVersion}</version>
</dependency>
+
+ <!-- START: Used in auto-mirror handling -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <!-- END: Used in auto-mirror handling -->
+
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
@@ -541,7 +558,7 @@
<reportSets>
<reportSet>
<!-- Disabled at it kills the site generation via a NoClassDefFoundError -->
- <reports />
+ <reports/>
</reportSet>
</reportSets>
</plugin>
@@ -593,9 +610,9 @@
<configuration>
<mappingId>customizable</mappingId>
<configurators>
- <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator" />
- <configurator id="org.maven.ide.eclipse.modello.modelloConfigurator" />
- <configurator id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator" />
+ <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator"/>
+ <configurator id="org.maven.ide.eclipse.modello.modelloConfigurator"/>
+ <configurator id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator"/>
</configurators>
<mojoExecutions>
<mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
@@ -606,4 +623,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file