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/12/23 01:08:22 UTC
svn commit: r728826 - in /maven/components/branches/maven-2.1.x: ./
apache-maven/
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/
maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/
maven-core-it-runner/ mave...
Author: brett
Date: Mon Dec 22 16:08:22 2008
New Revision: 728826
URL: http://svn.apache.org/viewvc?rev=728826&view=rev
Log:
merge -r693955:728820 from maven-2.0.x branch
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/pom.xml
maven/components/branches/maven-2.1.x/build.xml
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml
maven/components/branches/maven-2.1.x/maven-core/pom.xml
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 22 16:08:22 2008
@@ -1,5 +1,5 @@
-/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359,726876-726881
-/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007,727548,727998,728264
+/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902,726845
Propchange: maven/components/branches/maven-2.1.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 22 16:08:22 2008
@@ -1,5 +1,5 @@
-/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359,726876-726881
-/maven/components/branches/maven-2.0.x/apache-maven:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007,727548,728264
+/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,708790-728809
+/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990
/maven/components/trunk/apache-maven:720001,721902,726845,727688
Modified: maven/components/branches/maven-2.1.x/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/pom.xml?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/pom.xml Mon Dec 22 16:08:22 2008
@@ -91,11 +91,6 @@
<pattern>org.apache.commons.codec</pattern>
</relocation>
- <!-- For jsch wagon -->
- <relocation>
- <pattern>com.jcraft</pattern>
- </relocation>
-
<!-- For wagon API -->
<relocation>
<pattern>org.cyberneko</pattern>
@@ -121,9 +116,6 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
- <!--
- <version>2.2-beta-2</version>
- -->
<executions>
<execution>
<id>bin-assembly</id>
Modified: maven/components/branches/maven-2.1.x/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/build.xml (original)
+++ maven/components/branches/maven-2.1.x/build.xml Mon Dec 22 16:08:22 2008
@@ -274,6 +274,7 @@
</exec>
<echo>Running integration tests</echo>
+ <echo>maven.home is: ${maven.home}</echo>
<!-- Using java.io.tmpdir to avoid long path names that will make windows scream. -->
<exec failonerror="true" dir="${java.io.tmpdir}/${itPom.artifactId}-${itPom.version}" executable="${maven.home}/bin/mvn">
<env key="M2_HOME" value="${maven.home}"/>
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Dec 22 16:08:22 2008
@@ -36,7 +36,6 @@
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.observers.ChecksumObserver;
import org.apache.maven.wagon.proxy.ProxyInfo;
-import org.apache.maven.wagon.proxy.ProxyInfoProvider;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.codehaus.plexus.PlexusConstants;
@@ -251,7 +250,6 @@
}
}
-// wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), getProxy( protocol ) );
wagon.connect( artifactRepository, getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider()
{
public ProxyInfo getProxyInfo( String protocol )
Modified: maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original)
+++ maven/components/branches/maven-2.1.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Mon Dec 22 16:08:22 2008
@@ -361,6 +361,7 @@
StringWagon wagon = (StringWagon) wagonManager.getWagon( "string" );
+ artifact.getFile().delete();
wagon.clearExpectedContent();
wagon.addExpectedContent( "path", "lower-case-checksum" );
wagon.addExpectedContent( "path.sha1", "2a25dc564a3b34f68237fc849066cbc7bb7a36a1" );
Modified: maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core-it-runner/pom.xml Mon Dec 22 16:08:22 2008
@@ -8,7 +8,7 @@
"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
+ 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
@@ -19,155 +19,155 @@
-->
<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>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven</groupId>
- <version>2.1.0-M2-SNAPSHOT</version>
- <artifactId>maven-core-it-runner</artifactId>
- <name>Integration Test Executor</name>
+ <groupId>org.apache.maven</groupId>
+ <version>2.1.0-M2-SNAPSHOT</version>
+ <artifactId>maven-core-it-runner</artifactId>
+ <name>Integration Test Executor</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it-runner</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it-runner</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x/maven-core-it-runner</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/branches/maven-2.1.x/maven-core-it-runner</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.1.x/maven-core-it-runner</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/components/branches/maven-2.1.x/maven-core-it-runner</url>
+ </scm>
- <repositories>
- <repository>
- <id>test-plugins</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>apache-maven</artifactId>
- <version>${project.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>core-it-suite</artifactId>
- <version>2.1-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
+ <repositories>
+ <repository>
+ <id>test-plugins</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>apache-maven</artifactId>
+ <version>${project.version}</version>
+ <classifier>bin</classifier>
+ <type>tar.gz</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>core-it-suite</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>apache-maven</artifactId>
+ <version>${project.version}</version>
+ <classifier>bin</classifier>
+ <type>tar.gz</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>target/maven-installation</outputDirectory>
+ </configuration>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <tasks>
+ <chmod file="${basedir}/target/maven-installation/apache-maven-${pom.version}/bin/mvn" perm="755"/>
+ </tasks>
+ </configuration>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>no-local-repo-defined</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven</groupId>
- <artifactId>apache-maven</artifactId>
- <version>${project.version}</version>
- <classifier>bin</classifier>
- <type>tar.gz</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>target/maven-installation</outputDirectory>
- </configuration>
- <goals>
- <goal>unpack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <tasks>
- <chmod file="${basedir}/target/maven-installation/apache-maven-${pom.version}/bin/mvn" perm="755"/>
- </tasks>
- </configuration>
- <phase>process-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>maven.home</name>
+ <value>${basedir}/target/maven-installation/apache-maven-${project.version}</value>
+ </property>
+ <property>
+ <name>maven.test.tmpdir</name>
+ <value>${basedir}/target/it-working-folder</value>
+ </property>
+ </systemProperties>
+ <includes>
+ <include>**/Suite.java</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- <profiles>
- <profile>
- <id>no-local-repo-defined</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>maven.home</name>
- <value>${basedir}/target/maven-installation/apache-maven-${project.version}</value>
- </property>
- <property>
- <name>maven.test.tmpdir</name>
- <value>${basedir}/target/it-working-folder</value>
- </property>
- </systemProperties>
- <includes>
- <include>**/Suite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!--this profile is activated if maven.repo.local is defined and passes it to surefire-->
- <id>local-repo-defined</id>
- <activation>
+ </build>
+ </profile>
+ <profile>
+ <!--this profile is activated if maven.repo.local is defined and passes it to surefire-->
+ <id>local-repo-defined</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>maven.home</name>
+ <value>${basedir}/target/maven-installation/apache-maven-${project.version}</value>
+ </property>
+ <property>
+ <name>maven.test.tmpdir</name>
+ <value>${basedir}/target/it-working-folder</value>
+ </property>
<property>
<name>maven.repo.local</name>
+ <value>${maven.repo.local}</value>
</property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>maven.home</name>
- <value>${basedir}/target/maven-installation/apache-maven-${project.version}</value>
- </property>
- <property>
- <name>maven.test.tmpdir</name>
- <value>${basedir}/target/it-working-folder</value>
- </property>
- <property>
- <name>maven.repo.local</name>
- <value>${maven.repo.local}</value>
- </property>
- </systemProperties>
- <includes>
- <include>**/Suite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </systemProperties>
+ <includes>
+ <include>**/Suite.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: maven/components/branches/maven-2.1.x/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/pom.xml?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core/pom.xml Mon Dec 22 16:08:22 2008
@@ -184,15 +184,6 @@
</plugins>
</reporting>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
<profiles>
<profile>
<id>include-site</id>
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java Mon Dec 22 16:08:22 2008
@@ -64,6 +64,7 @@
Set artifacts = new HashSet();
artifacts.add( "classworlds" );
+ artifacts.add( "jsch" );
artifacts.add( "commons-cli" );
artifacts.add( "doxia-sink-api" );
artifacts.add( "doxia-logging-api" );
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Mon Dec 22 16:08:22 2008
@@ -629,7 +629,7 @@
+ System.getProperty( "file.encoding", "<unknown encoding>" ) );
System.out.println( "OS name: \"" + Os.OS_NAME + "\" version: \"" + Os.OS_VERSION +
- "\" arch: \"" + Os.OS_ARCH + "\" family: \"" + Os.OS_FAMILY + "\"" );
+ "\" arch: \"" + Os.OS_ARCH + "\" Family: \"" + Os.OS_FAMILY + "\"" );
}
private static String reduce( String s )
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Mon Dec 22 16:08:22 2008
@@ -200,6 +200,7 @@
if ( getLogger().isDebugEnabled() )
{
+ getLogger().debug( "Extension container contents:" );
extensionContainer.getContainerRealm().display();
}
}
@@ -267,13 +268,19 @@
try
{
Map wagons = extensionContainer.lookupMap( Wagon.ROLE );
+ getLogger().debug( "Wagons to register: " + wagons.keySet() );
wagonManager.registerWagons( wagons.keySet(), extensionContainer );
}
catch ( ComponentLookupException e )
{
// no wagons found in the extension
+ getLogger().debug( "No wagons found in the extensions or other internal error: " + e.getMessage(), e );
}
}
+ else
+ {
+ getLogger().debug( "Wagons could not be registered as the extension container was never created" );
+ }
}
public void contextualize( Context context )
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon Dec 22 16:08:22 2008
@@ -193,6 +193,7 @@
Extension extension = (Extension) j.next();
try
{
+ getLogger().debug( "Adding extension: " + extension );
extensionManager.addExtension( extension, project, session.getLocalRepository() );
}
catch ( PlexusContainerException e )
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Dec 22 16:08:22 2008
@@ -604,17 +604,5 @@
</requirements>
</component>
- <!-- TODO: Re-enable this once maven-shade-plugin 1.2 is release and can be
- used to merge this configuration with that of the wagon artifacts.
- We also need a way not to filter in the os.name, etc during the build, just the project version
- <component>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
- <configuration>
- <httpUserAgent>Apache-Maven/${project.version} maven-artifact/${project.version} (Java @java.version@; @os.name@ @os.version@)</httpUserAgent>
- </configuration>
- </component>
- -->
</components>
</component-set>
Modified: maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=728826&r1=728825&r2=728826&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Dec 22 16:08:22 2008
@@ -92,7 +92,6 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;