svn commit: r1439834 - in /maven/plugins/trunk/maven-pmd-plugin: ./ src/it/mpmd-89/ src/it/mpmd-89/src/ src/it/mpmd-89/src/main/ src/it/mpmd-89/src/main/pmd/ src/it/mpmd-89/src/test/ src/it/mpmd-89/sr
Author: bentmann
Date: Tue Jan 29 11:11:55 2013
New Revision: 1439834
URL: http://svn.apache.org/viewvc?rev=1439834view=rev
Log:
[MPMD-89] Having an equivalent for auxclasspath option
Added:
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/ (with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties
(with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/pom.xml (with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/ (with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/main/ (with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/main/pmd/ (with
props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/main/pmd/ruleset.xml
(with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/test/ (with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/test/java/ (with
props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/test/java/it/
(with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/test/java/it/NoTestsHere.java
(with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/src/test/java/it/TestSupport.java
(with props)
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/verify.bsh (with
props)
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1439834r1=1439833r2=1439834view=diff
==
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Tue Jan 29 11:11:55 2013
@@ -82,6 +82,11 @@ under the License.
!-- maven --
dependency
groupIdorg.apache.maven/groupId
+ artifactIdmaven-artifact/artifactId
+ version${mavenVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
version${mavenVersion}/version
/dependency
@@ -174,12 +179,6 @@ under the License.
version1.2/version
scopetest/scope
/dependency
-dependency
- groupIdorg.apache.maven/groupId
- artifactIdmaven-artifact/artifactId
- version${mavenVersion}/version
- scopetest/scope
-/dependency
/dependencies
build
Propchange: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/
--
bugtraq:number = true
Added: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties?rev=1439834view=auto
==
--- maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties
(added)
+++ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties Tue
Jan 29 11:11:55 2013
@@ -0,0 +1,2 @@
+invoker.goals = clean test-compile
+invoker.buildResult = failure
Propchange:
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/invoker.properties
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/pom.xml?rev=1439834view=auto
==
--- maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/pom.xml (added)
+++ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-89/pom.xml Tue Jan 29
11:11:55 2013
@@ -0,0 +1,74 @@
+?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
+ modelVersion4.0.0/modelVersion
svn commit: r1210240 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Author: bentmann
Date: Sun Dec 4 21:52:04 2011
New Revision: 1210240
URL: http://svn.apache.org/viewvc?rev=1210240view=rev
Log:
o Revised fix from r1151426 which broke the appassembler-maven-plugin
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java?rev=1210240r1=1210239r2=1210240view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Sun Dec 4 21:52:04 2011
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
import org.apache.maven.repository.Proxy;
import org.sonatype.aether.RepositorySystem;
@@ -58,6 +59,8 @@ public class LegacyLocalRepositoryManage
private final LocalRepository repo;
+private final boolean realLocalRepo;
+
public static RepositorySystemSession overlay( ArtifactRepository
repository, RepositorySystemSession session,
RepositorySystem system )
{
@@ -103,6 +106,20 @@ public class LegacyLocalRepositoryManage
repo =
new LocalRepository( new File( delegate.getBasedir() ),
( layout != null ) ?
layout.getClass().getSimpleName() : legacy );
+
+/*
+ * NOTE: invoker:install vs appassembler:assemble: Both mojos use
the artifact installer to put an artifact
+ * into a repository. In the first case, the result needs to be a
proper local repository that one can use for
+ * local artifact resolution. In the second case, the result needs to
precisely obey the path information of the
+ * repository's layout to allow pointing at artifacts within the
repository. Unfortunately,
+ * DefaultRepositoryLayout does not correctly describe the layout of a
local repository which unlike a remote
+ * repository never uses timestamps in the filename of a snapshot
artifact. The discrepancy gets notable when a
+ * remotely resolved snapshot artifact gets passed into pathOf(). So
producing a proper local artifact path
+ * using DefaultRepositoryLayout requires us to enforce usage of the
artifact's base version. This
+ * transformation however contradicts the other use case of precisely
obeying the repository's layout. The below
+ * flag tries to detect which use case applies to make both plugins
happy.
+ */
+realLocalRepo = ( layout instanceof DefaultRepositoryLayout )
local.equals( delegate.getId() );
}
public LocalRepository getRepository()
@@ -112,7 +129,11 @@ public class LegacyLocalRepositoryManage
public String getPathForLocalArtifact( Artifact artifact )
{
-return delegate.pathOf( RepositoryUtils.toArtifact(
artifact.setVersion( artifact.getBaseVersion() ) ) );
+if ( realLocalRepo )
+{
+return delegate.pathOf( RepositoryUtils.toArtifact(
artifact.setVersion( artifact.getBaseVersion() ) ) );
+}
+return delegate.pathOf( RepositoryUtils.toArtifact( artifact ) );
}
public String getPathForRemoteArtifact( Artifact artifact,
RemoteRepository repository, String context )
svn commit: r1206564 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
Author: bentmann
Date: Sat Nov 26 19:48:17 2011
New Revision: 1206564
URL: http://svn.apache.org/viewvc?rev=1206564view=rev
Log:
o Fixed XML snippet for Maven dependencies which have a type, not a
packaging
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java?rev=1206564r1=1206563r2=1206564view=diff
==
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
Sat Nov 26 19:48:17 2011
@@ -131,7 +131,7 @@ public final class DependencyInformation
if ( !JAR_PACKAGING.equals( packaging ) )
{
-mavenDependency = mavenDependency.format(
packaging%s/packaging%n, packaging );
+mavenDependency = mavenDependency.format(
type%s/type%n, packaging );
}
renderDependencyInfo( Apache Maven, mavenDependency.format(
/dependency ) );
svn commit: r1180647 - /maven/core-integration-testing/trunk/core-it-suite/pom.xml
Author: bentmann
Date: Sun Oct 9 16:50:22 2011
New Revision: 1180647
URL: http://svn.apache.org/viewvc?rev=1180647view=rev
Log:
o Added profile to point ITs at already downloaded but unpacked Maven distro
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=1180647r1=1180646r2=1180647view=diff
==
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Sun Oct 9
16:50:22 2011
@@ -48,6 +48,10 @@ under the License.
mvn clean test -Prun-its -DmavenVersion=2.2.1
+ It's also possible to point the ITs at an already downloaded Maven
distribution:
+
+mvn clean test -Prun-its -DmavenDistro=path-to-bin-archive
+
To run the ITs using embedded Maven 3.x, additionally activate the profile
embedded.
ITs that don't require to fork Maven can also be run from the IDE using the
Maven projects from the workspace if the
@@ -273,7 +277,7 @@ under the License.
/build
/profile
profile
- idmaven-distro/id
+ idmaven-from-repo/id
activation
property
namemavenVersion/name
@@ -344,6 +348,50 @@ under the License.
/build
/profile
profile
+ idmaven-distro/id
+ activation
+property
+ namemavenDistro/name
+/property
+ /activation
+ properties
+mavenHome${project.build.directory}/apache-maven/mavenHome
+ /properties
+ build
+plugins
+ plugin
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+ skipfalse/skip
+/configuration
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-antrun-plugin/artifactId
+version1.6/version
+executions
+ execution
+idunpack-maven-distro/id
+phaseprocess-test-resources/phase
+goals
+ goalrun/goal
+/goals
+configuration
+ tasks
+delete dir=${mavenHome}/
+unzip src=${mavenDistro} dest=${mavenHome}
+ regexpmapper from=^([^/]+)/(.*)$ to=\2
handledirsep=true /
+/unzip
+chmod dir=${mavenHome}/bin perm=ugo+rx
includes=mvn,mvnDebug/
+ /tasks
+/configuration
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
+profile
idemma/id
properties
preparedMavenHome${project.build.directory}/distro/preparedMavenHome
svn commit: r1180648 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4207/ resources/mng-4450/
Author: bentmann Date: Sun Oct 9 16:53:24 2011 New Revision: 1180648 URL: http://svn.apache.org/viewvc?rev=1180648view=rev Log: o Decoupled ITs from user-specific settings Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4450/settings.xml (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java?rev=1180648r1=1180647r2=1180648view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java Sun Oct 9 16:53:24 2011 @@ -49,6 +49,8 @@ public class MavenITmng4207PluginWithLog Verifier verifier = newVerifier( testDir.getAbsolutePath(), remote ); verifier.setAutoclean( false ); verifier.deleteArtifacts( org.apache.maven.its.mng4207 ); +verifier.getCliOptions().add( -s ); +verifier.getCliOptions().add( settings.xml ); verifier.executeGoal( initialize ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java?rev=1180648r1=1180647r2=1180648view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java Sun Oct 9 16:53:24 2011 @@ -51,6 +51,8 @@ public class MavenITmng4450StubModelForM verifier.setAutoclean( false ); verifier.deleteDirectory( target ); verifier.deleteArtifacts( org.apache.maven.its.mng4450 ); +verifier.getCliOptions().add( -s ); +verifier.getCliOptions().add( settings.xml ); verifier.executeGoal( validate ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml?rev=1180648view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml Sun Oct 9 16:53:24 2011 @@ -0,0 +1,24 @@ +?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. +-- + +settings + !-- empty, just to disable any user-specific mirrors for central that would cause unexpected errors -- +/settings Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml -- svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/settings.xml
svn commit: r1180662 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4963/ resources/mng-4963/repo/ resources/mng-4963/repo/org/ resources/mn
Author: bentmann Date: Sun Oct 9 17:40:30 2011 New Revision: 1180662 URL: http://svn.apache.org/viewvc?rev=1180662view=rev Log: [MNG-4963] [regression] Parent POM not downloaded when settings define global mirror and one snapshot repo but no other release repository o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/maven/its/mng4963/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/maven/its/mng4963/parent/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/maven/its/mng4963/parent/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/repo/org/apache/maven/its/mng4963/parent/0.1/parent-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4963/settings-template.xml (with props) 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=1180662r1=1180661r2=1180662view=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 Sun Oct 9 17:40:30 2011 @@ -93,6 +93,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng4975ProfileInjectedPluginExecutionOrderTest.class ); suite.addTestSuite( MavenITmng4973ExtensionVisibleToPluginInReactorTest.class ); suite.addTestSuite( MavenITmng4966AbnormalUrlPreservationTest.class ); +suite.addTestSuite( MavenITmng4963ParentResolutionFromMirrorTest.class ); suite.addTestSuite( MavenITmng4960MakeLikeReactorResumeTest.class ); suite.addTestSuite( MavenITmng4955LocalVsRemoteSnapshotResolutionTest.class ); suite.addTestSuite( MavenITmng4952MetadataReleaseInfoUpdateTest.class ); @@ -268,7 +269,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng4196ExclusionOnPluginDepTest.class ); suite.addTestSuite( MavenITmng4193UniqueRepoIdTest.class ); suite.addTestSuite( MavenITmng4190MirrorRepoMergingTest.class ); -suite.addTestSuite( MavenITmng4189UniqueVersionSnapshotTest.class ); +suite.addTestSuite( MavenITmng4189UniqueVersionSnapshotTest.class ); suite.addTestSuite( MavenITmng4180PerDependencyExclusionsTest.class ); suite.addTestSuite( MavenITmng4172EmptyDependencySetTest.class ); suite.addTestSuite( MavenITmng4166HideCoreCommonsCliTest.class ); @@ -404,7 +405,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3535SelfReferentialPropertiesTest.class ); suite.addTestSuite( MavenITmng3530DynamicPOMInterpolationTest.class ); suite.addTestSuite( MavenITmng3529QuotedCliArgTest.class ); -suite.addTestSuite( MavenITmng3506ArtifactHandlersFromPluginsTest.class); +suite.addTestSuite( MavenITmng3506ArtifactHandlersFromPluginsTest.class ); suite.addTestSuite( MavenITmng3503Xpp3ShadingTest.class ); suite.addTestSuite( MavenITmng3498ForkToOtherMojoTest.class ); suite.addTestSuite( MavenITmng3485OverrideWagonExtensionTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven
svn commit: r1180669 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4987/ resources/mng-4987/repo-1/ resources/mng-4987/repo-1/org/ resource
Author: bentmann Date: Sun Oct 9 17:50:45 2011 New Revision: 1180669 URL: http://svn.apache.org/viewvc?rev=1180669view=rev Log: [MNG-4987] [regression] LATEST, RELEASE or SNAPSHOT version picked from wrong repository when resolution order does not match timestamp order o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/maven/its/mng4987/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/maven/its/mng4987/dep/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/maven/its/mng4987/dep/0.1-SNAPSHOT/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-1/org/apache/maven/its/mng4987/dep/0.1-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/maven/its/mng4987/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/maven/its/mng4987/dep/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/maven/its/mng4987/dep/0.1-SNAPSHOT/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-2/org/apache/maven/its/mng4987/dep/0.1-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/maven/its/mng4987/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/maven/its/mng4987/dep/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/maven/its/mng4987/dep/0.1-SNAPSHOT/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-3/org/apache/maven/its/mng4987/dep/0.1-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-4/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-4/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-4/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-4/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-4/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4987/repo-4/org/apache/maven/its/mng4987/ (with props) maven
svn commit: r1180673 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4991/ resources/mng-4991/repo/ resources/mng-4991/repo/org/ resources/mn
Author: bentmann Date: Sun Oct 9 17:58:27 2011 New Revision: 1180673 URL: http://svn.apache.org/viewvc?rev=1180673view=rev Log: [MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't evaluate non-proxy hosts o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/dep/0.1/dep-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/parent/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/parent/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/repo/org/apache/maven/its/mng4991/parent/0.1/parent-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4991/settings-template.xml (with props) 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=1180673r1=1180672r2=1180673view=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 Sun Oct 9 17:58:27 2011 @@ -90,6 +90,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5009AggregationCycleTest.class ); suite.addTestSuite( MavenITmng5000ChildPathAwareUrlInheritanceTest.class ); suite.addTestSuite( MavenITmng4992MapStylePropertiesParamConfigTest.class ); +suite.addTestSuite( MavenITmng4991NonProxyHostsTest.class ); suite.addTestSuite( MavenITmng4987TimestampBasedSnapshotSelectionTest.class ); suite.addTestSuite( MavenITmng4975ProfileInjectedPluginExecutionOrderTest.class ); suite.addTestSuite( MavenITmng4973ExtensionVisibleToPluginInReactorTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java?rev=1180673view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java Sun Oct 9 17:58:27 2011 @@ -0,0 +1,104 @@ +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
svn commit: r1180677 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5006/ resources/mng-5006/repo-1/ resources/mng-5006/repo-1/org/ resource
Author: bentmann Date: Sun Oct 9 18:18:19 2011 New Revision: 1180677 URL: http://svn.apache.org/viewvc?rev=1180677view=rev Log: [MNG-5006] [regression] Resolution of parent POMs for dependency using version range does not consider all configured repositories o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/0.1/a-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-1/org/apache/maven/its/mng5006/a/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/b/0.1/b-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/parent/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/parent/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/repo-2/org/apache/maven/its/mng5006/parent/0.1/parent-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5006/settings-template.xml (with props) 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=1180677r1=1180676r2=1180677view=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 Sun Oct 9 18:18:19 2011 @@ -88,6 +88,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng5012CollectionVsArrayParamCoercionTest.class ); suite.addTestSuite( MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class
svn commit: r1180679 - in /maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal: DefaultArtifactDescriptorReader.java DefaultVersionRangeResolver.java DefaultVe
Author: bentmann
Date: Sun Oct 9 18:22:20 2011
New Revision: 1180679
URL: http://svn.apache.org/viewvc?rev=1180679view=rev
Log:
o Dispatched repository events via dedicated component
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java?rev=1180679r1=1180678r2=1180679view=diff
==
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
Sun Oct 9 18:22:20 2011
@@ -47,7 +47,6 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositoryEvent.EventType;
import org.sonatype.aether.RepositoryException;
-import org.sonatype.aether.RepositoryListener;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.RequestTrace;
import org.sonatype.aether.artifact.Artifact;
@@ -58,6 +57,7 @@ import org.sonatype.aether.graph.Exclusi
import org.sonatype.aether.impl.ArtifactDescriptorReader;
import org.sonatype.aether.impl.ArtifactResolver;
import org.sonatype.aether.impl.RemoteRepositoryManager;
+import org.sonatype.aether.impl.RepositoryEventDispatcher;
import org.sonatype.aether.impl.VersionResolver;
import org.sonatype.aether.transfer.ArtifactNotFoundException;
import org.sonatype.aether.util.DefaultRequestTrace;
@@ -102,6 +102,9 @@ public class DefaultArtifactDescriptorRe
private ArtifactResolver artifactResolver;
@Requirement
+private RepositoryEventDispatcher repositoryEventDispatcher;
+
+@Requirement
private ModelBuilder modelBuilder;
public void initService( ServiceLocator locator )
@@ -110,6 +113,7 @@ public class DefaultArtifactDescriptorRe
setRemoteRepositoryManager( locator.getService(
RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) );
+setRepositoryEventDispatcher( locator.getService(
RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null )
{
@@ -153,6 +157,16 @@ public class DefaultArtifactDescriptorRe
return this;
}
+public DefaultArtifactDescriptorReader setRepositoryEventDispatcher(
RepositoryEventDispatcher repositoryEventDispatcher )
+{
+if ( repositoryEventDispatcher == null )
+{
+throw new IllegalArgumentException( repository event dispatcher
has not been specified );
+}
+this.repositoryEventDispatcher = repositoryEventDispatcher;
+return this;
+}
+
public DefaultArtifactDescriptorReader setModelBuilder( ModelBuilder
modelBuilder )
{
if ( modelBuilder == null )
@@ -407,29 +421,23 @@ public class DefaultArtifactDescriptorRe
private void missingDescriptor( RepositorySystemSession session,
RequestTrace trace, Artifact artifact,
Exception exception )
{
-RepositoryListener listener = session.getRepositoryListener();
-if ( listener != null )
-{
-DefaultRepositoryEvent event =
-new DefaultRepositoryEvent(
EventType.ARTIFACT_DESCRIPTOR_MISSING, session, trace );
-event.setArtifact( artifact );
-event.setException( exception );
-listener.artifactDescriptorMissing( event );
-}
+DefaultRepositoryEvent event =
+new DefaultRepositoryEvent( EventType.ARTIFACT_DESCRIPTOR_MISSING,
session, trace );
+event.setArtifact( artifact );
+event.setException( exception );
+
+repositoryEventDispatcher.dispatch( event );
}
private void invalidDescriptor( RepositorySystemSession session,
RequestTrace trace, Artifact artifact,
Exception exception )
{
-RepositoryListener listener = session.getRepositoryListener();
-if ( listener != null )
-{
-DefaultRepositoryEvent event =
-new DefaultRepositoryEvent
svn commit: r1180680 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5019/ resources/mng-5019/repo/ resources/mng-5019/repo/org/ resources/mn
Author: bentmann Date: Sun Oct 9 18:33:51 2011 New Revision: 1180680 URL: http://svn.apache.org/viewvc?rev=1180680view=rev Log: [MNG-5019] [regression] String-based component lookups performed by report mojos fail with ClassCastException o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/its/mng5019/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/its/mng5019/maven-it-plugin/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/its/mng5019/maven-it-plugin/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/its/mng5019/maven-it-plugin/0.1/maven-it-plugin-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/repo/org/apache/maven/its/mng5019/maven-it-plugin/0.1/maven-it-plugin-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5019/settings-template.xml (with props) 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=1180680r1=1180679r2=1180680view=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 Sun Oct 9 18:33:51 2011 @@ -84,6 +84,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class ); +suite.addTestSuite( MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class ); suite.addTestSuite( MavenITmng5013ConfigureParamBeanFromScalarValueTest.class ); suite.addTestSuite( MavenITmng5012CollectionVsArrayParamCoercionTest.class ); suite.addTestSuite( MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java?rev=1180680view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java Sun Oct 9 18:33:51 2011 @@ -0,0 +1,63 @@ +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
svn commit: r1180683 - /maven/core-integration-testing/trunk/core-it-suite/pom.xml
Author: bentmann
Date: Sun Oct 9 18:37:01 2011
New Revision: 1180683
URL: http://svn.apache.org/viewvc?rev=1180683view=rev
Log:
o Increased perm gen mem for embedded tests
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=1180683r1=1180682r2=1180683view=diff
==
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Sun Oct 9
18:37:01 2011
@@ -63,7 +63,7 @@ under the License.
--
properties
-surefireMemory-Xmx384m -XX:MaxPermSize=128m/surefireMemory
+surefireMemory-Xmx384m -XX:MaxPermSize=192m/surefireMemory
!-- The original Maven distribution to test. --
mavenHome${maven.home}/mavenHome
!-- The (possibly instrumented copy of the) Maven distribution we
actually use for the tests. --
svn commit: r1180684 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5096/ resources/mng-5096/repo/ resources/mng-5096/repo/org/ resources/mn
Author: bentmann Date: Sun Oct 9 18:53:37 2011 New Revision: 1180684 URL: http://svn.apache.org/viewvc?rev=1180684view=rev Log: [MNG-5096] exclusion on dependency with typetest-jar/type doesn't work in maven 3 o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/a/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/a/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/a/0.1/a-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/a/0.1/a-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/b/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/b/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/b/0.1/b-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/b/0.1/b-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/c/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/c/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/c/0.1/c-0.1-tests.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/repo/org/apache/maven/its/mng5096/c/0.1/c-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5096/settings-template.xml (with props) 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=1180684r1=1180683r2=1180684view=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 Sun Oct 9 18:53:37 2011 @@ -83,6 +83,7 @@ public class IntegrationTestSuite // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class ); suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class ); suite.addTestSuite( MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class ); suite.addTestSuite( MavenITmng5013ConfigureParamBeanFromScalarValueTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java?rev=1180684view=auto
svn commit: r1180695 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5135/ resources/mng-5135/module/ resources/mng-5135/repo/ resources/mng-
Author: bentmann Date: Sun Oct 9 19:19:38 2011 New Revision: 1180695 URL: http://svn.apache.org/viewvc?rev=1180695view=rev Log: [MNG-5135] Regression: in some cases aggregator mojo is unable to resolve dependencies with custom packaging o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/module/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/module/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/its/mng5135/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/its/mng5135/dep/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/its/mng5135/dep/0.1/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/its/mng5135/dep/0.1/dep-0.1-it.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/repo/org/apache/maven/its/mng5135/dep/0.1/dep-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5135/settings-template.xml (with props) 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=1180695r1=1180694r2=1180695view=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 Sun Oct 9 19:19:38 2011 @@ -83,6 +83,7 @@ public class IntegrationTestSuite // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class ); suite.addTestSuite( MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class ); suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class ); suite.addTestSuite( MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java?rev=1180695view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java Sun Oct 9 19:19:38 2011 @@ -0,0 +1,66 @@ +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
svn commit: r1180698 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5137/ resources/mng-5137/consumer/ resources/mng-5137/producer/
Author: bentmann
Date: Sun Oct 9 19:32:10 2011
New Revision: 1180698
URL: http://svn.apache.org/viewvc?rev=1180698view=rev
Log:
[MNG-5137] Reactor resolution does not work for forked multi module builds
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5137/
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5137/consumer/
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5137/consumer/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5137/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5137/producer/
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5137/producer/pom.xml
(with props)
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=1180698r1=1180697r2=1180698view=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
Sun Oct 9 19:32:10 2011
@@ -83,6 +83,7 @@ public class IntegrationTestSuite
//
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite(
MavenITmng5137ReactorResolutionInForkedBuildTest.class );
suite.addTestSuite(
MavenITmng5135AggregatorDepResolutionModuleExtensionTest.class );
suite.addTestSuite(
MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.class );
suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java?rev=1180698view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java
Sun Oct 9 19:32:10 2011
@@ -0,0 +1,68 @@
+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.ResourceExtractor;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-5137;MNG-5137/a.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng5137ReactorResolutionInForkedBuildTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5137ReactorResolutionInForkedBuildTest()
+{
+super( [3.0.4,) );
+}
+
+/**
+ * Verify that reactor resolution also works within a forked multi-module
lifecycle, i.e. a lifecycle fork caused
+ * by an aggregator mojo. Here, reactor resolution needs to search the
forked project instances for build output,
+ * not the project instances from the main build.
+ */
+public void testit()
+throws Exception
+{
+File testDir
svn commit: r1179704 [3/3] - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/ test/java/org/apache/maven/shared/release/phase/ test/remote-repository
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject2/pom.xml -- svn:eol-style = native Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject2/pom.xml -- svn:keywords = Author Date Id Revision Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/ -- bugtraq:number = true Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/expected-pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/expected-pom.xml?rev=1179704view=auto == --- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/expected-pom.xml (added) +++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/expected-pom.xml Thu Oct 6 16:49:14 2011 @@ -0,0 +1,49 @@ +!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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 + modelVersion4.0.0/modelVersion + parent +groupIdgroupId/groupId +artifactIdartifactId/artifactId +version1.0/version + /parent + + artifactIdsubproject3/artifactId + + build +plugins + plugin +groupIdexternal/groupId +artifactIdplugin-artifactId/artifactId +version1.0/version +dependencies + dependency +!-- Test different release version remains the same -- +groupIdgroupId/groupId +artifactIdsubproject1/artifactId +version0.5/version + /dependency + dependency +groupIdgroupId/groupId +artifactIdsubproject2/artifactId +version1.0/version + /dependency +/dependencies + /plugin +/plugins + /build +/project Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/expected-pom.xml -- svn:eol-style = native Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/expected-pom.xml -- svn:keywords = Author Date Id Revision Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/pom.xml?rev=1179704view=auto == --- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/pom.xml (added) +++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/internal-snapshot-plugin-deps/subproject3/pom.xml Thu Oct 6 16:49:14 2011 @@ -0,0 +1,49 @@ +!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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
svn commit: r1179710 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ mav
Author: bentmann Date: Thu Oct 6 17:13:18 2011 New Revision: 1179710 URL: http://svn.apache.org/viewvc?rev=1179710view=rev Log: o Set svn:eol-style=native Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java (props changed) maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java (props changed) maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/external/artifactId/1.1-SNAPSHOT/maven-metadata.xml (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/groupId/artifactId2/1.0-SNAPSHOT/maven-metadata.xml (props changed) maven/release/trunk/maven-release-manager/src/test/remote-repository/groupId/artifactId2/maven-metadata.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/pomfinder/pom1.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/multimodule-external-snapshot-dependencies/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/multimodule-external-snapshot-dependencies/subproject1/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/multimodule-external-snapshot-dependencies/subproject2/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/check-dependencies/no-snapshot-range-dependencies/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-ejb-client-dep/ejb/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-property-dependency-coordinate/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-property-dependency-coordinate/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-property-dependency-coordinate/subproject1-3.4/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-property-dependency-coordinate/subproject1-3.4/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-property-dependency-coordinate/subproject2/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/pom-with-property-dependency-coordinate/subproject2/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-property-dependency-coordinate/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-property-dependency-coordinate/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-property-dependency-coordinate/subproject1-3.4/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-property-dependency-coordinate/subproject1-3.4/pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-property-dependency-coordinate/subproject2/expected-pom.xml (props changed) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/pom-with-property-dependency-coordinate/subproject2/pom.xml (props changed) maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-458/verify.bsh (props changed) maven/release/trunk/maven-release-plugin/src/it/projects/prepare/completion-goals/verify.bsh (props changed) maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareWithPomReleaseMojo.java (props changed) Propchange: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java -- svn:eol-style = native Propchange: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
svn commit: r1176402 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelBuilder.java validation/DefaultModelValidator.java
Author: bentmann
Date: Tue Sep 27 14:37:20 2011
New Revision: 1176402
URL: http://svn.apache.org/viewvc?rev=1176402view=rev
Log:
[MNG-5157] NPE stemming from DefaultModelBuilder.containsCoordinates
o Revised original fix to prevent duplicate emission of error msg
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=1176402r1=1176401r2=1176402view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Tue Sep 27 14:37:20 2011
@@ -909,6 +909,18 @@ public class DefaultModelBuilder
String artifactId = dependency.getArtifactId();
String version = dependency.getVersion();
+if ( groupId == null || groupId.length() = 0 )
+{
+problems.add( Severity.ERROR,
'dependencyManagement.dependencies.dependency.groupId' for
++ dependency.getManagementKey() + is missing.,
dependency.getLocation( ), null );
+continue;
+}
+if ( artifactId == null || artifactId.length() = 0 )
+{
+problems.add( Severity.ERROR,
'dependencyManagement.dependencies.dependency.artifactId' for
++ dependency.getManagementKey() + is missing.,
dependency.getLocation( ), null );
+continue;
+}
if ( version == null || version.length() = 0 )
{
problems.add( Severity.ERROR,
'dependencyManagement.dependencies.dependency.version' for
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=1176402r1=1176401r2=1176402view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Tue Sep 27 14:37:20 2011
@@ -356,12 +356,6 @@ public class DefaultModelValidator
{
String key = dependency.getManagementKey();
-validateStringNotEmpty( prefix + .groupId, problems,
Severity.ERROR, dependency.getGroupId(), key,
-dependency );
-
-validateStringNotEmpty( prefix + .artifactId, problems,
Severity.ERROR, dependency.getArtifactId(), key,
-dependency );
-
if ( import.equals( dependency.getScope() ) )
{
if ( !pom.equals( dependency.getType() ) )
svn commit: r1176414 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/project/ maven-core/src/test/java/org/apache/maven/project/ maven-core/src/test/java/org/apache/maven/reposito
Author: bentmann
Date: Tue Sep 27 14:55:56 2011
New Revision: 1176414
URL: http://svn.apache.org/viewvc?rev=1176414view=rev
Log:
[MNG-5073] ProjectBuilder.build(File,ProjectBuildingRequest) returns null
project if dependency version info is missing
Added:
maven/maven-3/trunk/maven-core/src/test/resources/projects/bad-dependency.xml
(with props)
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=1176414r1=1176413r2=1176414view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Tue Sep 27 14:55:56 2011
@@ -18,6 +18,7 @@ package org.apache.maven.project;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
@@ -119,6 +120,7 @@ public class DefaultProjectBuilder
MavenProject project = configuration.getProject();
ListModelProblem modelProblems = null;
+Throwable error = null;
if ( project == null )
{
@@ -141,7 +143,13 @@ public class DefaultProjectBuilder
}
catch ( ModelBuildingException e )
{
-throw new ProjectBuildingException( e.getModelId(),
e.getMessage(), pomFile, e );
+result = e.getResult();
+if ( result == null || result.getEffectiveModel() == null )
+{
+throw new ProjectBuildingException( e.getModelId(),
e.getMessage(), pomFile, e );
+}
+// validation error, continue project building and delay
failing to help IDEs
+error = e;
}
modelProblems = result.getProblems();
@@ -158,39 +166,19 @@ public class DefaultProjectBuilder
if ( configuration.isResolveDependencies() )
{
-try
-{
-DefaultDependencyResolutionRequest resolution =
-new DefaultDependencyResolutionRequest( project,
config.session );
-resolutionResult = dependencyResolver.resolve( resolution
);
-}
-catch ( DependencyResolutionException e )
-{
-resolutionResult = e.getResult();
-}
+resolutionResult = resolveDependencies( project,
config.session );
+}
-SetArtifact artifacts = new LinkedHashSetArtifact();
-if ( resolutionResult.getDependencyGraph() != null )
-{
-RepositoryUtils.toArtifacts( artifacts,
resolutionResult.getDependencyGraph().getChildren(),
- Collections.singletonList(
project.getArtifact().getId() ), null );
+ProjectBuildingResult result = new DefaultProjectBuildingResult(
project, modelProblems, resolutionResult );
-// Maven 2.x quirk: an artifact always points at the local
repo, regardless whether resolved or not
-LocalRepositoryManager lrm =
config.session.getLocalRepositoryManager();
-for ( Artifact artifact : artifacts )
-{
-if ( !artifact.isResolved() )
-{
-String path = lrm.getPathForLocalArtifact(
RepositoryUtils.toArtifact( artifact ) );
-artifact.setFile( new File(
lrm.getRepository().getBasedir(), path
svn commit: r1166637 - in /maven/maven-3/trunk: maven-core/pom.xml pom.xml
Author: bentmann Date: Thu Sep 8 11:46:46 2011 New Revision: 1166637 URL: http://svn.apache.org/viewvc?rev=1166637view=rev Log: o Updated to buildnumber-maven-plugin:1.0 Modified: maven/maven-3/trunk/maven-core/pom.xml maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=1166637r1=1166636r2=1166637view=diff == --- maven/maven-3/trunk/maven-core/pom.xml (original) +++ maven/maven-3/trunk/maven-core/pom.xml Thu Sep 8 11:46:46 2011 @@ -143,7 +143,6 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdbuildnumber-maven-plugin/artifactId -version1.0-beta-4/version executions execution phasegenerate-resources/phase @@ -175,7 +174,6 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdbuildnumber-maven-plugin/artifactId -version1.0-beta-1/version executions execution phasegenerate-resources/phase Modified: maven/maven-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1166637r1=1166636r2=1166637view=diff == --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Thu Sep 8 11:46:46 2011 @@ -442,6 +442,11 @@ artifactIdmaven-assembly-plugin/artifactId version2.2-beta-5/version /plugin +plugin + groupIdorg.codehaus.mojo/groupId + artifactIdbuildnumber-maven-plugin/artifactId + version1.0/version +/plugin /plugins /pluginManagement plugins
svn commit: r1166129 - /maven/maven-3/trunk/apache-maven/pom.xml
Author: bentmann
Date: Wed Sep 7 11:39:32 2011
New Revision: 1166129
URL: http://svn.apache.org/viewvc?rev=1166129view=rev
Log:
o Cleaned up POM
Modified:
maven/maven-3/trunk/apache-maven/pom.xml
Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=1166129r1=1166128r2=1166129view=diff
==
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Wed Sep 7 11:39:32 2011
@@ -31,7 +31,7 @@
descriptionModule to build the Maven distribution, source and binary, in
zip and tar.gz formats./description
properties
-distributionNameapache-maven/distributionName
+
distributionFileName${distributionId}-${project.version}/distributionFileName
/properties
dependencies
@@ -71,7 +71,7 @@
/dependencies
build
-finalName${distributionId}-${project.version}/finalName
+finalName${distributionFileName}/finalName
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
@@ -127,23 +127,6 @@
/build
profiles
- profile
- idstandard/id
- activation
-activeByDefaulttrue/activeByDefault
- /activation
- build
-plugins
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-surefire-plugin/artifactId
-configuration
- forkModeonce/forkMode
-/configuration
- /plugin
-/plugins
- /build
-/profile
profile
idapache-release/id
build
@@ -169,21 +152,5 @@
/plugins
/build
/profile
-profile
- !-- Single Test --
- idst/id
- build
-plugins
- plugin
-artifactIdmaven-surefire-plugin/artifactId
-configuration
- includes
-include**/MavenEmbedderTest.java/include
- /includes
-/configuration
- /plugin
-/plugins
- /build
-/profile
/profiles
/project
svn commit: r1164990 - /maven/core-integration-testing/trunk/pom.xml
Author: bentmann Date: Sun Sep 4 11:15:37 2011 New Revision: 1164990 URL: http://svn.apache.org/viewvc?rev=1164990view=rev Log: o Inherited from released maven-parent:21 Modified: maven/core-integration-testing/trunk/pom.xml Modified: maven/core-integration-testing/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/pom.xml?rev=1164990r1=1164989r2=1164990view=diff == --- maven/core-integration-testing/trunk/pom.xml (original) +++ maven/core-integration-testing/trunk/pom.xml Sun Sep 4 11:15:37 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version21-SNAPSHOT/version +version21/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r1164993 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Author: bentmann
Date: Sun Sep 4 11:17:27 2011
New Revision: 1164993
URL: http://svn.apache.org/viewvc?rev=1164993view=rev
Log:
[MNG-5163] MavenProject.getPluginRepositories misimplemented
Submitted by: Jesse Glick
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=1164993r1=1164992r2=1164993view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Sun Sep 4 11:17:27 2011
@@ -1379,7 +1379,7 @@ public class MavenProject
public ListRepository getPluginRepositories()
{
-return getModel().getRepositories();
+return getModel().getPluginRepositories();
}
public ListRemoteRepository getRemoteProjectRepositories()
svn commit: r1164995 - /maven/maven-3/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
Author: bentmann Date: Sun Sep 4 11:19:31 2011 New Revision: 1164995 URL: http://svn.apache.org/viewvc?rev=1164995view=rev Log: [MNG-5164] Odd name of central in superpom Modified: maven/maven-3/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml Modified: maven/maven-3/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml?rev=1164995r1=1164994r2=1164995view=diff == --- maven/maven-3/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml Sun Sep 4 11:19:31 2011 @@ -26,7 +26,7 @@ under the License. repositories repository idcentral/id - nameMaven Repository Switchboard/name + nameCentral Repository/name urlhttp://repo1.maven.apache.org/maven2/url layoutdefault/layout snapshots @@ -38,7 +38,7 @@ under the License. pluginRepositories pluginRepository idcentral/id - nameMaven Plugin Repository/name + nameCentral Repository/name urlhttp://repo1.maven.apache.org/maven2/url layoutdefault/layout snapshots
svn commit: r1159520 - /maven/maven-3/trunk/apache-maven/src/bin/m2.conf
Author: bentmann
Date: Fri Aug 19 07:27:11 2011
New Revision: 1159520
URL: http://svn.apache.org/viewvc?rev=1159520view=rev
Log:
[MNG-5158] Make loading of extensions from lib/ext more robust with regard to
existence of ext directory
Modified:
maven/maven-3/trunk/apache-maven/src/bin/m2.conf
Modified: maven/maven-3/trunk/apache-maven/src/bin/m2.conf
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/m2.conf?rev=1159520r1=1159519r2=1159520view=diff
==
--- maven/maven-3/trunk/apache-maven/src/bin/m2.conf (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/m2.conf Fri Aug 19 07:27:11 2011
@@ -3,5 +3,5 @@ main is org.apache.maven.cli.MavenCli fr
set maven.home default ${user.home}/m2
[plexus.core]
-load ${maven.home}/lib/ext/*.jar
-load ${maven.home}/lib/*.jar
+optionally ${maven.home}/lib/ext/*.jar
+load ${maven.home}/lib/*.jar
svn commit: r1159534 - in /maven/maven-3/trunk/maven-settings-builder/src: main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java test/java/org/apache/maven/settings/validation/D
Author: bentmann
Date: Fri Aug 19 08:10:58 2011
New Revision: 1159534
URL: http://svn.apache.org/viewvc?rev=1159534view=rev
Log:
[MNG-5159] Extend validation of settings.xml to check for uniqueness of id
elements
Modified:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
Modified:
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java?rev=1159534r1=1159533r2=1159534view=diff
==
---
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
(original)
+++
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
Fri Aug 19 08:10:58 2011
@@ -19,7 +19,9 @@ package org.apache.maven.settings.valida
* under the License.
*/
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Profile;
@@ -77,11 +79,19 @@ public class DefaultSettingsValidator
if ( servers != null )
{
+SetString serverIds = new HashSetString();
+
for ( int i = 0; i servers.size(); i++ )
{
Server server = servers.get( i );
validateStringNotEmpty( problems, servers.server[ + i +
].id, server.getId(), null );
+
+if ( !serverIds.add( server.getId() ) )
+{
+addViolation( problems, Severity.WARNING,
servers.server.id, null,
+ must be unique but found duplicate server
with id + server.getId() );
+}
}
}
@@ -113,17 +123,29 @@ public class DefaultSettingsValidator
if ( profiles != null )
{
+SetString profileIds = new HashSetString();
+
for ( Profile profile : profiles )
{
-validateRepositories( problems, profile.getRepositories(),
repositories.repository );
-validateRepositories( problems,
profile.getPluginRepositories(),
- pluginRepositories.pluginRepository );
+if ( !profileIds.add( profile.getId() ) )
+{
+addViolation( problems, Severity.WARNING,
profiles.profile.id, null,
+ must be unique but found duplicate profile
with id + profile.getId() );
+}
+
+String prefix = profiles.profile[ + profile.getId() + ].;
+
+validateRepositories( problems, profile.getRepositories(),
prefix + repositories.repository );
+validateRepositories( problems,
profile.getPluginRepositories(), prefix
++ pluginRepositories.pluginRepository );
}
}
}
private void validateRepositories( SettingsProblemCollector problems,
ListRepository repositories, String prefix )
{
+SetString repoIds = new HashSetString();
+
for ( Repository repository : repositories )
{
validateStringNotEmpty( problems, prefix + .id,
repository.getId(), repository.getUrl() );
@@ -138,6 +160,12 @@ public class DefaultSettingsValidator
+ , using it for other repositories will corrupt your
repository metadata. );
}
+if ( !repoIds.add( repository.getId() ) )
+{
+addViolation( problems, Severity.WARNING, prefix + .id, null,
+ must be unique but found duplicate repository
with id + repository.getId() );
+}
+
validateStringNotEmpty( problems, prefix + .url,
repository.getUrl(), repository.getId() );
if ( legacy.equals( repository.getLayout() ) )
Modified:
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java?rev=1159534r1=1159533r2=1159534view=diff
==
---
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
(original)
+++
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
svn commit: r1159625 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Author: bentmann
Date: Fri Aug 19 13:17:41 2011
New Revision: 1159625
URL: http://svn.apache.org/viewvc?rev=1159625view=rev
Log:
[MNG-5155] 'inherited' flag of report sets ignored
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=1159625r1=1159624r2=1159625view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Fri Aug 19 13:17:41 2011
@@ -551,6 +551,40 @@ public class MavenModelMerger
}
@Override
+protected void mergeReportPlugin_ReportSets( ReportPlugin target,
ReportPlugin source, boolean sourceDominant,
+ MapObject, Object context )
+{
+ListReportSet src = source.getReportSets();
+if ( !src.isEmpty() )
+{
+ListReportSet tgt = target.getReportSets();
+MapObject, ReportSet merged = new LinkedHashMapObject,
ReportSet( ( src.size() + tgt.size() ) * 2 );
+
+for ( ReportSet element : src )
+{
+if ( sourceDominant || ( element.getInherited() != null ?
element.isInherited() : source.isInherited() ) )
+{
+Object key = getReportSetKey( element );
+merged.put( key, element );
+}
+}
+
+for ( ReportSet element : tgt )
+{
+Object key = getReportSetKey( element );
+ReportSet existing = merged.get( key );
+if ( existing != null )
+{
+mergeReportSet( element, existing, sourceDominant, context
);
+}
+merged.put( key, element );
+}
+
+target.setReportSets( new ArrayListReportSet( merged.values() )
);
+}
+}
+
+@Override
protected Object getDependencyKey( Dependency dependency )
{
return dependency.getManagementKey();
svn commit: r1158623 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelBuilder.java validation/DefaultModelValidator.java
Author: bentmann
Date: Wed Aug 17 11:02:03 2011
New Revision: 1158623
URL: http://svn.apache.org/viewvc?rev=1158623view=rev
Log:
[MNG-5157] NPE stemming from DefaultModelBuilder.containsCoordinates
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=1158623r1=1158622r2=1158623view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Wed Aug 17 11:02:03 2011
@@ -909,6 +909,13 @@ public class DefaultModelBuilder
String artifactId = dependency.getArtifactId();
String version = dependency.getVersion();
+if ( version == null || version.length() = 0 )
+{
+problems.add( Severity.ERROR,
'dependencyManagement.dependencies.dependency.version' for
++ dependency.getManagementKey() + is missing.,
dependency.getLocation( ), null );
+continue;
+}
+
String imported = groupId + ':' + artifactId + ':' + version;
if ( importIds.contains( imported ) )
@@ -1045,8 +1052,9 @@ public class DefaultModelBuilder
private boolean containsCoordinates( String message, String groupId,
String artifactId, String version )
{
-return message != null message.contains( groupId )
message.contains( artifactId )
- message.contains( version );
+return message != null ( groupId == null || message.contains(
groupId ) )
+ ( artifactId == null || message.contains( artifactId ) )
+ ( version == null || message.contains( version ) );
}
}
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=1158623r1=1158622r2=1158623view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Wed Aug 17 11:02:03 2011
@@ -356,6 +356,12 @@ public class DefaultModelValidator
{
String key = dependency.getManagementKey();
+validateStringNotEmpty( prefix + .groupId, problems,
Severity.ERROR, dependency.getGroupId(), key,
+dependency );
+
+validateStringNotEmpty( prefix + .artifactId, problems,
Severity.ERROR, dependency.getArtifactId(), key,
+dependency );
+
if ( import.equals( dependency.getScope() ) )
{
if ( !pom.equals( dependency.getType() ) )
svn commit: r1156671 - /maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Author: bentmann
Date: Thu Aug 11 16:45:55 2011
New Revision: 1156671
URL: http://svn.apache.org/viewvc?rev=1156671view=rev
Log:
[MNG-5153] ModelMerger omits relativ path
Modified:
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Modified:
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=1156671r1=1156670r2=1156671view=diff
==
---
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
(original)
+++
maven/maven-3/trunk/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Thu Aug 11 16:45:55 2011
@@ -161,6 +161,7 @@ public class ModelMerger
if ( tgt == null )
{
tgt = new Parent();
+tgt.setRelativePath( null );
target.setParent( tgt );
}
mergeParent( tgt, src, sourceDominant, context );
@@ -430,6 +431,7 @@ public class ModelMerger
if ( tgt == null )
{
tgt = new Scm();
+tgt.setTag( null );
target.setScm( tgt );
}
mergeScm( tgt, src, sourceDominant, context );
@@ -462,6 +464,7 @@ public class ModelMerger
if ( tgt == null )
{
tgt = new Prerequisites();
+tgt.setMaven( null );
target.setPrerequisites( tgt );
}
mergePrerequisites( tgt, src, sourceDominant, context );
svn commit: r1155293 - in /maven/plugins/trunk: .gitignore maven-changes-plugin/pom.xml maven-changes-plugin/src/site/xdoc/
Author: bentmann Date: Tue Aug 9 10:01:02 2011 New Revision: 1155293 URL: http://svn.apache.org/viewvc?rev=1155293view=rev Log: o Moved generated xdoc output to target/generated-site/xdoc Removed: maven/plugins/trunk/maven-changes-plugin/src/site/xdoc/ Modified: maven/plugins/trunk/.gitignore (contents, props changed) maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/.gitignore URL: http://svn.apache.org/viewvc/maven/plugins/trunk/.gitignore?rev=1155293r1=1155292r2=1155293view=diff == --- maven/plugins/trunk/.gitignore (original) +++ maven/plugins/trunk/.gitignore Tue Aug 9 10:01:02 2011 @@ -3,4 +3,3 @@ target .project .settings *.iml -maven-changes-plugin/src/site/xdoc/changes.xml Propchange: maven/plugins/trunk/.gitignore -- svn:eol-style = native Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1155293r1=1155292r2=1155293view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Aug 9 10:01:02 2011 @@ -357,9 +357,6 @@ under the License. goals goalxdoc/goal /goals -configuration - outputDirectorysrc/site/xdoc//outputDirectory -/configuration /execution execution idstandard/id
svn commit: r1154138 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Author: bentmann
Date: Fri Aug 5 09:26:18 2011
New Revision: 1154138
URL: http://svn.apache.org/viewvc?rev=1154138view=rev
Log:
[MNG-5149] DefaultArtifactRepositoryFactory.createArtifactRepository overload
w/ layoutId passes wrong (repo) id
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=1154138r1=1154137r2=1154138view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Fri Aug 5 09:26:18 2011
@@ -73,7 +73,7 @@ public class DefaultArtifactRepositoryFa
ArtifactRepositoryPolicy releases )
throws UnknownRepositoryLayoutException
{
-return injectSession( factory.createArtifactRepository( layoutId, url,
layoutId, snapshots, releases ), true );
+return injectSession( factory.createArtifactRepository( id, url,
layoutId, snapshots, releases ), true );
}
public ArtifactRepository createArtifactRepository( String id, String url,
svn commit: r1154333 - in /maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs: empty-directory-child/empty-child/.gitignore empty-directory/.gitignore
Author: bentmann Date: Fri Aug 5 18:17:57 2011 New Revision: 1154333 URL: http://svn.apache.org/viewvc?rev=1154333view=rev Log: o Added dummy file to make directory non-empty for git Added: maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory-child/empty-child/.gitignore (with props) maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory/.gitignore (with props) Added: maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory-child/empty-child/.gitignore URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory-child/empty-child/.gitignore?rev=1154333view=auto == --- maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory-child/empty-child/.gitignore (added) +++ maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory-child/empty-child/.gitignore Fri Aug 5 18:17:57 2011 @@ -0,0 +1 @@ +# just here to make the directory non-empty Propchange: maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory-child/empty-child/.gitignore -- svn:eol-style = native Added: maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory/.gitignore URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory/.gitignore?rev=1154333view=auto == --- maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory/.gitignore (added) +++ maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory/.gitignore Fri Aug 5 18:17:57 2011 @@ -0,0 +1 @@ +# just here to make the directory non-empty Propchange: maven/shared/trunk/maven-filtering/src/test/units-files/includeEmptyDirs/empty-directory/.gitignore -- svn:eol-style = native
svn commit: r1154360 - /maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Author: bentmann
Date: Fri Aug 5 19:27:02 2011
New Revision: 1154360
URL: http://svn.apache.org/viewvc?rev=1154360view=rev
Log:
o Fixed test to account for missing default excludes in scanner
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java?rev=1154360r1=1154359r2=1154360view=diff
==
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Fri Aug 5 19:27:02 2011
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -617,6 +618,7 @@ public class DefaultMavenResourcesFilter
{
{
setDirectory( getBasedir() +
/src/test/units-files/includeEmptyDirs );
+setExcludes( Arrays.asList( new String[] { **/.gitignore } )
);
}
} );
MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution( resources, outputDirectory, mavenProject,
svn commit: r1152164 - /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java
Author: bentmann Date: Fri Jul 29 11:03:59 2011 New Revision: 1152164 URL: http://svn.apache.org/viewvc?rev=1152164view=rev Log: o Fixed svn:keywords Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java (contents, props changed) Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java?rev=1152164r1=1152163r2=1152164view=diff == --- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java (original) +++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java Fri Jul 29 11:03:59 2011 @@ -25,7 +25,7 @@ import org.apache.maven.doxia.logging.Lo * Wrap a Mojo logger into a Doxia logger. * * @author a href=mailto:vincent.sive...@gmail.com;Vincent Siveton/a - * @version $Id:$ + * @version $Id$ * @since 1.1 * @see org.apache.maven.plugin.logging.Log */ Propchange: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/MojoLogWrapper.java -- --- svn:keywords (original) +++ svn:keywords Fri Jul 29 11:03:59 2011 @@ -1 +1 @@ -Author Date Id Revision +Author Date Id Revision
svn commit: r1152165 - in /maven/shared/trunk: .gitignore maven-doxia-tools/src/main/resources/site-tool_gl.properties
Author: bentmann Date: Fri Jul 29 11:07:21 2011 New Revision: 1152165 URL: http://svn.apache.org/viewvc?rev=1152165view=rev Log: o Set svn:eol-style=native Modified: maven/shared/trunk/.gitignore (contents, props changed) maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_gl.properties (props changed) Modified: maven/shared/trunk/.gitignore URL: http://svn.apache.org/viewvc/maven/shared/trunk/.gitignore?rev=1152165r1=1152164r2=1152165view=diff == --- maven/shared/trunk/.gitignore (original) +++ maven/shared/trunk/.gitignore Fri Jul 29 11:07:21 2011 @@ -8,3 +8,4 @@ target .project .settings build +.svn/ \ No newline at end of file Propchange: maven/shared/trunk/.gitignore -- svn:eol-style = native Propchange: maven/shared/trunk/maven-doxia-tools/src/main/resources/site-tool_gl.properties -- svn:eol-style = native
svn commit: r1151417 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-5064/ core-it-suite/src/test/resources/mng-5064/r
Author: bentmann Date: Wed Jul 27 10:26:37 2011 New Revision: 1151417 URL: http://svn.apache.org/viewvc?rev=1151417view=rev Log: [MNG-5064] mvn -nsu (--no-snapshot-updates) should not download snapshots (and break local builds) o Fixed IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/ (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/dep-0.1-20110726.105319-1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/dep-0.1-20110726.105319-1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/repo/org/apache/maven/its/mng5064/dep/0.1-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/settings-template.xml (with props) Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/src/ Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5064/pom.xml maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/resources/META-INF/plexus/components.xml 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=1151417r1=1151416r2=1151417view=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 Wed Jul 27 10:26:37 2011 @@ -83,6 +83,7 @@ public class IntegrationTestSuite // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng5064SuppressSnapshotUpdatesTest.class ); suite.addTestSuite( MavenITmng5013ConfigureParamBeanFromScalarValueTest.class ); suite.addTestSuite( MavenITmng5012CollectionVsArrayParamCoercionTest.class ); suite.addTestSuite( MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java?rev=1151417view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java Wed Jul 27 10:26:37 2011 @@ -0,0 +1,131 @@ +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
svn commit: r1151418 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Author: bentmann
Date: Wed Jul 27 10:28:41 2011
New Revision: 1151418
URL: http://svn.apache.org/viewvc?rev=1151418view=rev
Log:
[MNG-5064] mvn -nsu (--no-snapshot-updates) should not download snapshots (and
break local builds)
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=1151418r1=1151417r2=1151418view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Wed Jul 27 10:28:41 2011
@@ -344,7 +344,18 @@ public class DefaultMaven
session.setOffline( request.isOffline() );
session.setChecksumPolicy( request.getGlobalChecksumPolicy() );
-session.setUpdatePolicy( request.isUpdateSnapshots() ?
RepositoryPolicy.UPDATE_POLICY_ALWAYS : null );
+if ( request.isNoSnapshotUpdates() )
+{
+session.setUpdatePolicy( RepositoryPolicy.UPDATE_POLICY_NEVER );
+}
+else if ( request.isUpdateSnapshots() )
+{
+session.setUpdatePolicy( RepositoryPolicy.UPDATE_POLICY_ALWAYS );
+}
+else
+{
+session.setUpdatePolicy( null );
+}
session.setNotFoundCachingEnabled( request.isCacheNotFound() );
session.setTransferErrorCachingEnabled( request.isCacheTransferError()
);
svn commit: r1151420 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
Author: bentmann
Date: Wed Jul 27 10:36:18 2011
New Revision: 1151420
URL: http://svn.apache.org/viewvc?rev=1151420view=rev
Log:
[MNG-5113] NullPointerException on javadoc site generation
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java?rev=1151420r1=1151419r2=1151420view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
Wed Jul 27 10:36:18 2011
@@ -116,8 +116,8 @@ public class DefaultReportingConverter
reportPlugins.addChild( reportPlugin );
if ( !reporting.isExcludeDefaults()
!hasMavenProjectInfoReportsPlugin
- org.apache.maven.plugins.equals( reportPlugin.getChild(
groupId ).getValue() )
- maven-project-info-reports-plugin.equals(
reportPlugin.getChild( artifactId ).getValue() ) )
+ org.apache.maven.plugins.equals( plugin.getGroupId() )
+ maven-project-info-reports-plugin.equals(
plugin.getArtifactId() ) )
{
hasMavenProjectInfoReportsPlugin = true;
}
svn commit: r1151421 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
Author: bentmann
Date: Wed Jul 27 10:39:37 2011
New Revision: 1151421
URL: http://svn.apache.org/viewvc?rev=1151421view=rev
Log:
[MNG-5137] Reactor resolution does not work for forked multi module builds
Submitted by: Stuart McCulloch
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java?rev=1151421r1=1151420r2=1151421view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorReader.java
Wed Jul 27 10:39:37 2011
@@ -222,7 +222,12 @@ class ReactorReader
if ( project != null )
{
-return find( project, artifact );
+File file = find( project, artifact );
+if ( file == null project != project.getExecutionProject() )
+{
+file = find( project.getExecutionProject(), artifact );
+}
+return file;
}
return null;
svn commit: r1151423 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
Author: bentmann
Date: Wed Jul 27 10:45:43 2011
New Revision: 1151423
URL: http://svn.apache.org/viewvc?rev=1151423view=rev
Log:
[MNG-5096] exclusion on dependency with typetest-jar/type doesn't work
in maven 3
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java?rev=1151423r1=1151422r2=1151423view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
Wed Jul 27 10:45:43 2011
@@ -36,6 +36,7 @@ import org.codehaus.plexus.logging.Logge
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.RequestTrace;
+import org.sonatype.aether.artifact.ArtifactType;
import org.sonatype.aether.artifact.ArtifactTypeRegistry;
import org.sonatype.aether.collection.CollectRequest;
import org.sonatype.aether.collection.DependencyCollectionException;
@@ -92,7 +93,18 @@ public class DefaultProjectDependenciesR
MapString, Dependency dependencies = new HashMapString,
Dependency();
for ( Dependency dependency : project.getDependencies() )
{
-String key = dependency.getManagementKey();
+String classifier = dependency.getClassifier();
+if ( classifier == null )
+{
+ArtifactType type = stereotypes.get( dependency.getType()
);
+if ( type != null )
+{
+classifier = type.getClassifier();
+}
+}
+String key =
+ArtifacIdUtils.toVersionlessId( dependency.getGroupId(),
dependency.getArtifactId(),
+dependency.getType(),
classifier );
dependencies.put( key, dependency );
}
for ( Artifact artifact : project.getDependencyArtifacts() )
svn commit: r1151424 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
Author: bentmann
Date: Wed Jul 27 10:48:35 2011
New Revision: 1151424
URL: http://svn.apache.org/viewvc?rev=1151424view=rev
Log:
[MNG-5135] Regression: in some cases aggregator mojo is unable to resolve
dependencies with custom packaging
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java?rev=1151424r1=1151423r2=1151424view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
Wed Jul 27 10:48:35 2011
@@ -93,42 +93,56 @@ public class LifecycleDependencyResolver
boolean aggregating, SetArtifact
projectArtifacts )
throws LifecycleExecutionException
{
-if ( project.getDependencyArtifacts() == null )
+ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+try
{
-try
+ClassLoader projectRealm = project.getClassRealm();
+if ( projectRealm != null projectRealm != tccl )
{
-project.setDependencyArtifacts( project.createArtifacts(
artifactFactory, null, null ) );
+Thread.currentThread().setContextClassLoader( projectRealm );
}
-catch ( InvalidDependencyVersionException e )
+
+if ( project.getDependencyArtifacts() == null )
{
-throw new LifecycleExecutionException( e );
+try
+{
+project.setDependencyArtifacts( project.createArtifacts(
artifactFactory, null, null ) );
+}
+catch ( InvalidDependencyVersionException e )
+{
+throw new LifecycleExecutionException( e );
+}
}
-}
-SetArtifact artifacts =
-getDependencies( project, scopesToCollect, scopesToResolve,
session, aggregating, projectArtifacts );
+SetArtifact artifacts =
+getDependencies( project, scopesToCollect, scopesToResolve,
session, aggregating, projectArtifacts );
-project.setResolvedArtifacts( artifacts );
+project.setResolvedArtifacts( artifacts );
-MapString, Artifact map = new HashMapString, Artifact();
-for ( Artifact artifact : artifacts )
-{
-map.put( artifact.getDependencyConflictId(), artifact );
-}
-for ( Artifact artifact : project.getDependencyArtifacts() )
-{
-if ( artifact.getFile() == null )
+MapString, Artifact map = new HashMapString, Artifact();
+for ( Artifact artifact : artifacts )
{
-Artifact resolved = map.get(
artifact.getDependencyConflictId() );
-if ( resolved != null )
+map.put( artifact.getDependencyConflictId(), artifact );
+}
+for ( Artifact artifact : project.getDependencyArtifacts() )
+{
+if ( artifact.getFile() == null )
{
-artifact.setFile( resolved.getFile() );
-artifact.setDependencyTrail( resolved.getDependencyTrail()
);
-artifact.setResolvedVersion( resolved.getVersion() );
-artifact.setResolved( true );
+Artifact resolved = map.get(
artifact.getDependencyConflictId() );
+if ( resolved != null )
+{
+artifact.setFile( resolved.getFile() );
+artifact.setDependencyTrail(
resolved.getDependencyTrail() );
+artifact.setResolvedVersion( resolved.getVersion() );
+artifact.setResolved( true );
+}
}
}
}
+finally
+{
+Thread.currentThread().setContextClassLoader( tccl );
+}
}
private SetArtifact getDependencies( MavenProject project,
CollectionString scopesToCollect,
svn commit: r1151426 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Author: bentmann
Date: Wed Jul 27 10:56:26 2011
New Revision: 1151426
URL: http://svn.apache.org/viewvc?rev=1151426view=rev
Log:
o Avoided corruption of local repository when installing a snapshot artifact
that was already deployed and as such has a timestamped version, this happens
in the wild when using invoker:install during a build that deploys its output
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java?rev=1151426r1=1151425r2=1151426view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Wed Jul 27 10:56:26 2011
@@ -112,12 +112,12 @@ public class LegacyLocalRepositoryManage
public String getPathForLocalArtifact( Artifact artifact )
{
-return delegate.pathOf( RepositoryUtils.toArtifact( artifact ) );
+return delegate.pathOf( RepositoryUtils.toArtifact(
artifact.setVersion( artifact.getBaseVersion() ) ) );
}
public String getPathForRemoteArtifact( Artifact artifact,
RemoteRepository repository, String context )
{
-return getPathForLocalArtifact( artifact );
+return delegate.pathOf( RepositoryUtils.toArtifact( artifact ) );
}
public String getPathForLocalMetadata( Metadata metadata )
svn commit: r1151430 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Author: bentmann Date: Wed Jul 27 11:22:07 2011 New Revision: 1151430 URL: http://svn.apache.org/viewvc?rev=1151430view=rev Log: o Improved POM location tracking Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=1151430r1=1151429r2=1151430view=diff == --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Wed Jul 27 11:22:07 2011 @@ -962,6 +962,7 @@ public class DefaultModelBuilder importRequest.setModelCache( request.getModelCache() ); importRequest.setSystemProperties( request.getSystemProperties() ); importRequest.setUserProperties( request.getUserProperties() ); +importRequest.setLocationTracking( request.isLocationTracking() ); } importRequest.setModelSource( importSource );
svn commit: r1151459 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java resources/mng-4112/pom.xml
Author: bentmann
Date: Wed Jul 27 13:28:42 2011
New Revision: 1151459
URL: http://svn.apache.org/viewvc?rev=1151459view=rev
Log:
o Decoupled from production plugin
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java?rev=1151459r1=1151458r2=1151459view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java
Wed Jul 27 13:28:42 2011
@@ -29,30 +29,33 @@ import java.util.Properties;
public class MavenITmng4112MavenVersionPropertyTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng4112MavenVersionPropertyTest()
{
super( (3.0.3,) );
}
/**
- * Test simple POM interpolation
+ * Test for ${maven.version} and ${maven.build.version} property
*/
-public void testitMNG4112()
+public void testit()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-4112 );
+
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( target );
-verifier.executeGoal( package );
+verifier.executeGoal( validate );
-Properties props = verifier.loadProperties( target/build.properties
);
+Properties props = verifier.loadProperties( target/pom.properties );
-String testMavenVersion = props.getProperty( maven.version );
-assertFalse( testMavenVersion.contains( $ ) );
+String testMavenVersion = props.getProperty(
project.properties.simpleVersion, );
+assertFalse( testMavenVersion, testMavenVersion.contains( $ ) );
+assertTrue( testMavenVersion, testMavenVersion.matches(
[0-9]+\\.[0-9]+.* ) );
-String testMavenBuildVersion = props.getProperty(
maven.build.version );
-assertTrue( testMavenBuildVersion.contains( testMavenVersion ) );
+String testMavenBuildVersion = props.getProperty(
project.properties.fullVersion, );
+assertTrue( testMavenBuildVersion, testMavenBuildVersion.contains(
testMavenVersion ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml?rev=1151459r1=1151458r2=1151459view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4112/pom.xml
Wed Jul 27 13:28:42 2011
@@ -1,32 +1,61 @@
+?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
modelVersion4.0.0/modelVersion
- nameMaven Integration Test :: MNG-4112/name
+
groupIdorg.apache.maven.its.mgn4112/groupId
- artifactIdmaven-it-mng4112/artifactId
- descriptionTest for ${maven.version} property/description
+ artifactIdtest/artifactId
packagingpom/packaging
version1.0/version
+
+ nameMaven Integration Test :: MNG-4112/name
+ description
+Test for ${maven.version} and ${maven.build.version} property
+ /description
+
+ properties
+simpleVersion${maven.version}/simpleVersion
+fullVersion${maven.build.version}/fullVersion
+ /properties
+
build
plugins
plugin
-groupIdorg.apache.maven.plugins/groupId
svn commit: r1150636 - in /maven/core-integration-testing/trunk: .gitattributes .gitignore
Author: bentmann Date: Mon Jul 25 11:33:23 2011 New Revision: 1150636 URL: http://svn.apache.org/viewvc?rev=1150636view=rev Log: o Set svn:eol-style=native Modified: maven/core-integration-testing/trunk/.gitattributes (contents, props changed) maven/core-integration-testing/trunk/.gitignore (props changed) Modified: maven/core-integration-testing/trunk/.gitattributes URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/.gitattributes?rev=1150636r1=1150635r2=1150636view=diff == --- maven/core-integration-testing/trunk/.gitattributes (original) +++ maven/core-integration-testing/trunk/.gitattributes Mon Jul 25 11:33:23 2011 @@ -1,2 +1,2 @@ -*.java ident -*.jar -text -crlf +*.java ident +*.jar -text -crlf Propchange: maven/core-integration-testing/trunk/.gitattributes -- svn:eol-style = native Propchange: maven/core-integration-testing/trunk/.gitignore -- svn:eol-style = native
svn commit: r1125500 - /maven/pom/trunk/maven/pom.xml
Author: bentmann Date: Fri May 20 18:45:18 2011 New Revision: 1125500 URL: http://svn.apache.org/viewvc?rev=1125500view=rev Log: o Updated my role Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1125500r1=1125499r2=1125500view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Fri May 20 18:45:18 2011 @@ -68,16 +68,6 @@ under the License. /roles /developer developer - idbentmann/id - nameBenjamin Bentmann/name - emailbentm...@apache.org/email - organizationSonatype/organization - roles -rolePMC Member/role - /roles - timezone+1/timezone -/developer -developer idbrett/id nameBrett Porter/name emailbr...@apache.org/email @@ -305,6 +295,16 @@ under the License. /roles /developer developer + idbentmann/id + nameBenjamin Bentmann/name + emailbentm...@apache.org/email + organizationSonatype/organization + roles +roleCommitter/role + /roles + timezone+1/timezone +/developer +developer idcstamas/id nameTamas Cservenak/name organizationSonatype/organization
svn commit: r1086984 - /maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
Author: bentmann
Date: Wed Mar 30 15:10:46 2011
New Revision: 1086984
URL: http://svn.apache.org/viewvc?rev=1086984view=rev
Log:
o Extended API docs
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java?rev=1086984r1=1086983r2=1086984view=diff
==
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
Wed Mar 30 15:10:46 2011
@@ -54,7 +54,9 @@ public class MavenRepositorySystemSessio
/**
* Creates a new Maven-like repository system session by initializing the
session with values typical for
- * Maven-based resolution.
+ * Maven-based resolution. In more detail, this constructor configures
settings relevant for the processing of
+ * dependency graphs, most other settings remain at their generic default
value. Use the various setters to further
+ * configure the session with authentication, mirror, proxy and other
information required for your environment.
*/
public MavenRepositorySystemSession()
{
svn commit: r1084807 [3/3] - in /maven/maven-3/trunk: ./ apache-maven/src/test/java/org/apache/maven/settings/ maven-artifact/src/main/java/org/apache/maven/artifact/handler/ maven-artifact/src/main/j
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java?rev=1084807r1=1084806r2=1084807view=diff
==
---
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
(original)
+++
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
Wed Mar 23 23:30:11 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
* Tests {@code DependencyManagement}.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class DependencyManagementTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java?rev=1084807r1=1084806r2=1084807view=diff
==
---
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
(original)
+++
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
Wed Mar 23 23:30:11 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
* Tests {@code Dependency}.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class DependencyTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java?rev=1084807r1=1084806r2=1084807view=diff
==
---
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
(original)
+++
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
Wed Mar 23 23:30:11 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
* Tests {@code DeploymentRepository}.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class DeploymentRepositoryTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java?rev=1084807r1=1084806r2=1084807view=diff
==
---
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
(original)
+++
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
Wed Mar 23 23:30:11 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
* Tests {@code Developer}.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class DeveloperTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java?rev=1084807r1=1084806r2=1084807view=diff
==
---
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
(original)
+++
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
Wed Mar 23 23:30:11 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
* Tests {@code DistributionManagement}.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class DistributionManagementTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java?rev=1084807r1=1084806r2=1084807view=diff
==
---
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
(original)
+++
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
Wed Mar 23 23:30:11 2011
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
* Tests {@code Exclusion}.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class ExclusionTest
extends TestCase
Modified:
maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java?rev=1084807r1=1084806r2
svn commit: r1082727 - /maven/plugins/trunk/maven-remote-resources-plugin/src/site/apt/index.apt
Author: bentmann
Date: Thu Mar 17 22:17:17 2011
New Revision: 1082727
URL: http://svn.apache.org/viewvc?rev=1082727view=rev
Log:
o Fixed bad link
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/site/apt/index.apt
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/site/apt/index.apt?rev=1082727r1=1082726r2=1082727view=diff
==
--- maven/plugins/trunk/maven-remote-resources-plugin/src/site/apt/index.apt
(original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/site/apt/index.apt
Thu Mar 17 22:17:17 2011
@@ -53,7 +53,7 @@ Maven Remote Resources Plugin
If you need help using some of the more advanced features of the plugin,
check out the advanced help pages:
- * {{{supplemental-models.html}Patching Bad POMs with Supplemental Models}}
+ * {{{./supplemental-models.html}Patching Bad POMs with Supplemental Models}}
[]
svn commit: r1076750 - in /maven/site/trunk/src/site/apt/docs/3.0.3: ./ release-notes.apt.vm release-notes.txt
Author: bentmann
Date: Thu Mar 3 19:38:36 2011
New Revision: 1076750
URL: http://svn.apache.org/viewvc?rev=1076750view=rev
Log:
o Added release notes for apache-maven:3.0.3
Added:
maven/site/trunk/src/site/apt/docs/3.0.3/
- copied from r1076743, maven/site/trunk/src/site/apt/docs/3.0.2/
Modified:
maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.apt.vm
maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.txt
Modified: maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.apt.vm
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.apt.vm?rev=1076750r1=1076743r2=1076750view=diff
==
--- maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.apt.vm (original)
+++ maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.apt.vm Thu Mar 3
19:38:36 2011
@@ -1,5 +1,5 @@
--
-Release Notes - Maven 3.0.2
+Release Notes - Maven 3.0.3
--
Brett Porter
--
@@ -26,11 +26,11 @@ Brett Porter
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven 3.0.2
+Maven 3.0.3
- The Apache Maven team would like to announce the release of Maven 3.0.2.
+ The Apache Maven team would like to announce the release of Maven 3.0.3.
- Maven 3.0.2 is {{{../../download.html} available for download}}.
+ Maven 3.0.3 is {{{../../download.html} available for download}}.
Maven is a software project management and comprehension tool. Based on the
concept of a project object model
(POM), Maven can manage a project's build, reporting and documentation from
a central place.
Modified: maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.txt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.txt?rev=1076750r1=1076743r2=1076750view=diff
==
--- maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.txt (original)
+++ maven/site/trunk/src/site/apt/docs/3.0.3/release-notes.txt Thu Mar 3
19:38:36 2011
@@ -1,10 +1,10 @@
-* Maven 3.0.2 Release Notes
+* Maven 3.0.3 Release Notes
- Maven 3.0.2 is a maintenance release to address various regressions/bugs and
to deliver other minor improvements.
- The new version 3.0.2 is a recommended update for anybody currently using
Maven 3.0.
+ Maven 3.0.3 is a maintenance release to address various regressions/bugs and
to deliver other minor improvements.
+ The new version 3.0.3 is a recommended update for anybody currently using
Maven 3.0.x.
The full list of changes can be found in our
-
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500version=16952}issue
management system}},
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500version=17061}issue
management system}},
and is reproduced below.
** Known Incompatibilities with Maven 2
@@ -12,66 +12,72 @@
Please refer to the following
{{{http://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html}
compatibility notes}}
before reporting any issues regarding changed build behavior in Maven 3.x.
-** Release Notes - Maven - Version 3.0.2 (since 3.0.1 only)
+** Release Notes - Maven - Version 3.0.3 (since 3.0.2 only)
** Bug
-* [MNG-4840] - Prerequisites is not working on m3
+* [MNG-4551] - List parameter in a mojo has strange behaviour
-* [MNG-4913] - [regression] User properties override equally named POM
properties of transitive dependencies
+* [MNG-4956] - Cygwin mvn script modifies CLASSPATH environment variable
-* [MNG-4915] - Versions in pom.xml are not checked for invalid characters
+* [MNG-4962] - MavenProject.getParent fails to build when parent POM, in
reactor, references BOM also in reactor
-* [MNG-4918] - MavenProject#clone() doubles active profiles
+* [MNG-4963] - [regression] Parent POM not downloaded when settings define
global mirror and one snapshot repo but no other release repository
-* [MNG-4919] - Plugin execution contributed by lifecycle mapping gets lost
when same goal is bound multiple times
+* [MNG-4973] - [regression] Build extensions are invisible to plugins in
multi module build
-* [MNG-4923] - [regression] java.lang.ClassNotFoundException:
org.apache.maven.artifact.ArtifactStatus
+* [MNG-4975] - [regression] plugin executions injected from profile run
before instead of after existing executions in the POM
-* [MNG-4925] - Mismanagement of container lookup realm can cause type
incompatibilities for plugins looking up components by string
+* [MNG-4982] - [regression] Cycle between transitive dependencies causes
bad effective dependency scope
-* [MNG-4933] - With a resource directory as . maven raise an
java.lang.StringIndexOutOfBoundsException:217
+* [MNG-4987] - [regression] LATEST, RELEASE or SNAPSHOT version picked
from wrong
svn commit: r1076862 - /maven/maven-3/trunk/doap_Maven.rdf
Author: bentmann Date: Thu Mar 3 22:49:45 2011 New Revision: 1076862 URL: http://svn.apache.org/viewvc?rev=1076862view=rev Log: o Removed links to non-existent .bz2 distros from DOAP file Modified: maven/maven-3/trunk/doap_Maven.rdf Modified: maven/maven-3/trunk/doap_Maven.rdf URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/doap_Maven.rdf?rev=1076862r1=1076861r2=1076862view=diff == --- maven/maven-3/trunk/doap_Maven.rdf (original) +++ maven/maven-3/trunk/doap_Maven.rdf Thu Mar 3 22:49:45 2011 @@ -37,7 +37,6 @@ under the License. revision3.0.2/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.2-bin.zip/file-release file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.2-bin.tar.gz/file-release - file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.2-bin.tar.bz2/file-release /Version /release release @@ -47,7 +46,6 @@ under the License. revision3.0.1/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.1-bin.zip/file-release file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.1-bin.tar.gz/file-release - file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.1-bin.tar.bz2/file-release /Version /release release @@ -57,7 +55,6 @@ under the License. revision3.0/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0-bin.zip/file-release file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0-bin.tar.gz/file-release - file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0-bin.tar.bz2/file-release /Version /release release
svn commit: r1076865 - /maven/maven-3/trunk/doap_Maven.rdf
Author: bentmann Date: Thu Mar 3 22:54:47 2011 New Revision: 1076865 URL: http://svn.apache.org/viewvc?rev=1076865view=rev Log: o Added source downloads to DOAP Modified: maven/maven-3/trunk/doap_Maven.rdf Modified: maven/maven-3/trunk/doap_Maven.rdf URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/doap_Maven.rdf?rev=1076865r1=1076864r2=1076865view=diff == --- maven/maven-3/trunk/doap_Maven.rdf (original) +++ maven/maven-3/trunk/doap_Maven.rdf Thu Mar 3 22:54:47 2011 @@ -37,6 +37,8 @@ under the License. revision3.0.2/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.2-bin.zip/file-release file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.2-bin.tar.gz/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0.2-src.zip/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0.2-src.tar.gz/file-release /Version /release release @@ -46,6 +48,8 @@ under the License. revision3.0.1/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.1-bin.zip/file-release file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.1-bin.tar.gz/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0.1-src.zip/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0.1-src.tar.gz/file-release /Version /release release @@ -55,6 +59,8 @@ under the License. revision3.0/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0-bin.zip/file-release file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0-bin.tar.gz/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0-src.zip/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0-src.tar.gz/file-release /Version /release release
svn commit: r1076867 - /maven/maven-3/trunk/doap_Maven.rdf
Author: bentmann Date: Thu Mar 3 22:57:28 2011 New Revision: 1076867 URL: http://svn.apache.org/viewvc?rev=1076867view=rev Log: o Added apache-maven:3.0.3 to DOAP Modified: maven/maven-3/trunk/doap_Maven.rdf Modified: maven/maven-3/trunk/doap_Maven.rdf URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/doap_Maven.rdf?rev=1076867r1=1076866r2=1076867view=diff == --- maven/maven-3/trunk/doap_Maven.rdf (original) +++ maven/maven-3/trunk/doap_Maven.rdf Thu Mar 3 22:57:28 2011 @@ -33,6 +33,17 @@ under the License. release Version nameLatest stable release/name +created2011-03-03/created +revision3.0.3/revision + file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.3-bin.zip/file-release + file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.3-bin.tar.gz/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0.3-src.zip/file-release + file-releasehttp://archive.apache.org/dist/maven/source/apache-maven-3.0.3-src.tar.gz/file-release + /Version +/release +release + Version +nameApache Maven 3.0.2/name created2011-01-12/created revision3.0.2/revision file-releasehttp://archive.apache.org/dist/maven/binaries/apache-maven-3.0.2-bin.zip/file-release
svn commit: r1076870 - /maven/site/trunk/pom.xml
Author: bentmann Date: Thu Mar 3 23:05:33 2011 New Revision: 1076870 URL: http://svn.apache.org/viewvc?rev=1076870view=rev Log: o Updated download section to point at Maven 3.0.3 Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1076870r1=1076869r2=1076870view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Thu Mar 3 23:05:33 2011 @@ -271,10 +271,10 @@ current20xReleaseDate25 Feb 2010/current20xReleaseDate current22xVersion2.2.1/current22xVersion current22xReleaseDate11 August 2009/current22xReleaseDate -currentStableVersion3.0.2/currentStableVersion -currentStableReleaseDate12 January 2011/currentStableReleaseDate +currentStableVersion3.0.3/currentStableVersion +currentStableReleaseDate3 March 2011/currentStableReleaseDate versions2x2.2.1,2.2.0,2.1.0,2.0.11,2.0.10,2.0.9,2.0.8,2.0.7,2.0.6,2.0.5,2.0.4,2.0.3,2.0.2,2.0.1,2.0/versions2x - versions3x3.0.2,3.0.1,3.0,3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3/versions3x + versions3x3.0.3,3.0.2,3.0.1,3.0,3.0-beta-3,3.0-beta-2,3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3/versions3x site.deploy.urlscp://people.apache.org/www/maven.apache.org//site.deploy.url /properties
svn commit: r1075309 - in /maven/maven-3/trunk: maven-compat/src/main/java/org/apache/maven/artifact/repository/ maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ maven-compat/sr
Author: bentmann
Date: Mon Feb 28 12:07:53 2011
New Revision: 1075309
URL: http://svn.apache.org/viewvc?rev=1075309view=rev
Log:
o Restored runtime compatibility with plugins that implement custom
ArtifactRepositoryLayouts (e.g. appassembler-maven-plugin). The method getId()
was added in 3.0 and as such is not implemented by those custom impls. The
refactoring done in r1073990 for MNG-4991 eventually made this discrepancy show
up during plugin execution.
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java?rev=1075309r1=1075308r2=1075309view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
Mon Feb 28 12:07:53 2011
@@ -180,7 +180,7 @@ public class DefaultArtifactRepository
sb.append(id: ).append( getId() ).append( \n );
sb.append( url: ).append( getUrl() ).append( \n );
-sb.append(layout: ).append( layout != null ? layout.getId() :
none ).append( \n );
+sb.append(layout: ).append( layout != null ? layout : none
).append( \n );
if ( snapshots != null )
{
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java?rev=1075309r1=1075308r2=1075309view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
Mon Feb 28 12:07:53 2011
@@ -83,4 +83,11 @@ public class FlatRepositoryLayout
{
return pathOfRepositoryMetadata( metadata.getRemoteFilename() );
}
+
+@Override
+public String toString()
+{
+return getId();
+}
+
}
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java?rev=1075309r1=1075308r2=1075309view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
Mon Feb 28 12:07:53 2011
@@ -23,6 +23,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
+import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.settings.Mirror;
import org.codehaus.plexus.component.annotations.Component;
@@ -143,7 +144,7 @@ public class DefaultMirrorSelector
static boolean matchesLayout( ArtifactRepository repository, Mirror mirror
)
{
-return matchesLayout( repository.getLayout().getId(),
mirror.getMirrorOfLayouts() );
+return matchesLayout( RepositoryUtils.getLayout( repository ),
mirror.getMirrorOfLayouts() );
}
/**
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=1075309r1=1075308r2=1075309view=diff
==
---
maven/maven-3/trunk
svn commit: r1075437 - /maven/maven-3/tags/maven-3.0.3/
Author: bentmann Date: Mon Feb 28 17:25:59 2011 New Revision: 1075437 URL: http://svn.apache.org/viewvc?rev=1075437view=rev Log: [maven-scm] copy for tag maven-3.0.3 Added: maven/maven-3/tags/maven-3.0.3/ (props changed) - copied from r1075436, maven/maven-3/trunk/ Propchange: maven/maven-3/tags/maven-3.0.3/ -- bugtraq:append = true Propchange: maven/maven-3/tags/maven-3.0.3/ -- bugtraq:label = Enter issue ID: Propchange: maven/maven-3/tags/maven-3.0.3/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/maven-3/tags/maven-3.0.3/ -- bugtraq:number = false Propchange: maven/maven-3/tags/maven-3.0.3/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/maven-3/tags/maven-3.0.3/ -- --- svn:ignore (added) +++ svn:ignore Mon Feb 28 17:25:59 2011 @@ -0,0 +1,15 @@ +release.properties +deleteme.version.properties +bootstrap +target +.classpath +.project +.settings +*.iml +*.iws +*.ipr +log.txt +dependencies.xml +.git +.gitignore +.idea Propchange: maven/maven-3/tags/maven-3.0.3/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Feb 28 17:25:59 2011 @@ -0,0 +1,8 @@ +/maven/components/branches/MNG-3932-1:746145-746157 +/maven/components/branches/maven-2.0.10-RC:680477 +/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523,768817 +/maven/components/branches/sisbell-plugin-manager:738973-739966 +/maven/components/sisbell-plugin-manager:738757-738972 +/maven/components/trunk:751453-767358,767708-768832 +/maven/maven-2/branches/maven-2.2.x:795521 Propchange: maven/maven-3/tags/maven-3.0.3/ -- svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
svn commit: r1075438 - in /maven/maven-3/trunk: ./ apache-maven/ maven-aether-provider/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ ma
Author: bentmann Date: Mon Feb 28 17:26:44 2011 New Revision: 1075438 URL: http://svn.apache.org/viewvc?rev=1075438view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/maven-3/trunk/apache-maven/pom.xml maven/maven-3/trunk/maven-aether-provider/pom.xml maven/maven-3/trunk/maven-artifact/pom.xml maven/maven-3/trunk/maven-compat/pom.xml maven/maven-3/trunk/maven-core/pom.xml maven/maven-3/trunk/maven-embedder/pom.xml maven/maven-3/trunk/maven-model-builder/pom.xml maven/maven-3/trunk/maven-model/pom.xml maven/maven-3/trunk/maven-plugin-api/pom.xml maven/maven-3/trunk/maven-repository-metadata/pom.xml maven/maven-3/trunk/maven-settings-builder/pom.xml maven/maven-3/trunk/maven-settings/pom.xml maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/apache-maven/pom.xml (original) +++ maven/maven-3/trunk/apache-maven/pom.xml Mon Feb 28 17:26:44 2011 @@ -21,7 +21,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/maven-3/trunk/maven-aether-provider/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/maven-aether-provider/pom.xml (original) +++ maven/maven-3/trunk/maven-aether-provider/pom.xml Mon Feb 28 17:26:44 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-aether-provider/artifactId Modified: maven/maven-3/trunk/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/maven-artifact/pom.xml (original) +++ maven/maven-3/trunk/maven-artifact/pom.xml Mon Feb 28 17:26:44 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-artifact/artifactId Modified: maven/maven-3/trunk/maven-compat/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/maven-compat/pom.xml (original) +++ maven/maven-3/trunk/maven-compat/pom.xml Mon Feb 28 17:26:44 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-compat/artifactId Modified: maven/maven-3/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/maven-core/pom.xml (original) +++ maven/maven-3/trunk/maven-core/pom.xml Mon Feb 28 17:26:44 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-core/artifactId Modified: maven/maven-3/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/maven-embedder/pom.xml (original) +++ maven/maven-3/trunk/maven-embedder/pom.xml Mon Feb 28 17:26:44 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-embedder/artifactId Modified: maven/maven-3/trunk/maven-model-builder/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/pom.xml?rev=1075438r1=1075437r2=1075438view=diff == --- maven/maven-3/trunk/maven-model-builder/pom.xml (original) +++ maven/maven-3/trunk/maven-model-builder/pom.xml Mon Feb 28 17:26:44 2011 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0.3/version +version3.0.4-SNAPSHOT/version /parent artifactIdmaven-model-builder
svn commit: r1074131 - /maven/maven-3/trunk/pom.xml
Author: bentmann Date: Thu Feb 24 13:06:53 2011 New Revision: 1074131 URL: http://svn.apache.org/viewvc?rev=1074131view=rev Log: [MNG-4982] [regression] Cycle between transitive dependencies causes bad effective dependency scope [MNG-5006] [regression] Resolution of parent POMs for dependency using version range does not consider all configured repositories Modified: maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1074131r1=1074130r2=1074131view=diff == --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Thu Feb 24 13:06:53 2011 @@ -50,7 +50,7 @@ cipherVersion1.4/cipherVersion modelloVersion1.4.1/modelloVersion jxpathVersion1.3/jxpathVersion -aetherVersion1.9/aetherVersion +aetherVersion1.11/aetherVersion maven.test.redirectTestOutputToFiletrue/maven.test.redirectTestOutputToFile /properties
svn commit: r1074184 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/apache/maven/plugin/internal/ maven-embedder/src/main/java/org/apache/mav
Author: bentmann
Date: Thu Feb 24 15:12:30 2011
New Revision: 1074184
URL: http://svn.apache.org/viewvc?rev=1074184view=rev
Log:
[MNG-5019] [regression] String-based component lookups performed by report
mojos fail with ClassCastException
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java?rev=1074184r1=1074183r2=1074184view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
Thu Feb 24 15:12:30 2011
@@ -24,7 +24,6 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -40,9 +39,6 @@ public class DefaultBuildPluginManager
{
@Requirement
-private PlexusContainer container;
-
-@Requirement
private MavenPluginManager mavenPluginManager;
@Requirement
@@ -86,8 +82,6 @@ public class DefaultBuildPluginManager
throw new PluginExecutionException( mojoExecution, project, e );
}
-ClassRealm oldLookupRealm = container.setLookupRealm( pluginRealm );
-
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader( pluginRealm );
@@ -159,7 +153,6 @@ public class DefaultBuildPluginManager
mavenPluginManager.releaseMojo( mojo, mojoExecution );
Thread.currentThread().setContextClassLoader( oldClassLoader );
-container.setLookupRealm( oldLookupRealm );
legacySupport.setSession( oldSession );
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java?rev=1074184r1=1074183r2=1074184view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
Thu Feb 24 15:12:30 2011
@@ -109,16 +109,16 @@ public class DefaultPluginManager
throw new PluginManagerException( plugin, e.getMessage(), e );
}
-ClassRealm oldRealm = container.getLookupRealm();
+ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
-container.setLookupRealm( pluginDescriptor.getClassRealm() );
+Thread.currentThread().setContextClassLoader(
pluginDescriptor.getClassRealm() );
return container.lookup( role, roleHint );
}
finally
{
-container.setLookupRealm( oldRealm );
+Thread.currentThread().setContextClassLoader( oldClassLoader );
}
}
@@ -141,16 +141,16 @@ public class DefaultPluginManager
throw new PluginManagerException( plugin, e.getMessage(), e );
}
-ClassRealm oldRealm = container.getLookupRealm();
+ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
-container.setLookupRealm( pluginDescriptor.getClassRealm() );
+Thread.currentThread().setContextClassLoader(
pluginDescriptor.getClassRealm() );
return container.lookupMap( role );
}
finally
{
-container.setLookupRealm( oldRealm );
+Thread.currentThread().setContextClassLoader( oldClassLoader );
}
}
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=1074184r1=1074183r2=1074184view=diff
==
---
maven/maven-3/trunk
svn commit: r1074195 - in /maven/maven-3/trunk: maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ maven-compat/src/main/java/org/apache/maven/artifact/deployer/ maven-compat/sr
Author: bentmann
Date: Thu Feb 24 16:06:26 2011
New Revision: 1074195
URL: http://svn.apache.org/viewvc?rev=1074195view=rev
Log:
o Enabled request tracing for repository events to provide more context for
event spies
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java?rev=1074195r1=1074194r2=1074195view=diff
==
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
Thu Feb 24 16:06:26 2011
@@ -49,6 +49,7 @@ import org.sonatype.aether.RepositoryEve
import org.sonatype.aether.RepositoryException;
import org.sonatype.aether.RepositoryListener;
import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.RequestTrace;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.artifact.ArtifactType;
import org.sonatype.aether.artifact.ArtifactTypeRegistry;
@@ -59,6 +60,7 @@ import org.sonatype.aether.impl.Artifact
import org.sonatype.aether.impl.RemoteRepositoryManager;
import org.sonatype.aether.impl.VersionResolver;
import org.sonatype.aether.transfer.ArtifactNotFoundException;
+import org.sonatype.aether.util.DefaultRequestTrace;
import org.sonatype.aether.util.artifact.ArtifactProperties;
import org.sonatype.aether.util.artifact.DefaultArtifact;
import org.sonatype.aether.util.artifact.DefaultArtifactType;
@@ -224,6 +226,8 @@ public class DefaultArtifactDescriptorRe
ArtifactDescriptorResult result )
throws ArtifactDescriptorException
{
+RequestTrace trace = DefaultRequestTrace.newChild( request.getTrace(),
request );
+
SetString visited = new LinkedHashSetString();
for ( Artifact artifact = request.getArtifact();; )
{
@@ -231,6 +235,7 @@ public class DefaultArtifactDescriptorRe
{
VersionRequest versionRequest =
new VersionRequest( artifact, request.getRepositories(),
request.getRequestContext() );
+versionRequest.setTrace( trace );
VersionResult versionResult = versionResolver.resolveVersion(
session, versionRequest );
artifact = artifact.setVersion( versionResult.getVersion() );
@@ -245,7 +250,7 @@ public class DefaultArtifactDescriptorRe
{
RepositoryException exception =
new RepositoryException( Artifact relocations form a
cycle: + visited );
-invalidDescriptor( session, artifact, exception );
+invalidDescriptor( session, trace, artifact, exception );
if ( session.isIgnoreInvalidArtifactDescriptor() )
{
return null;
@@ -265,6 +270,7 @@ public class DefaultArtifactDescriptorRe
{
ArtifactRequest resolveRequest =
new ArtifactRequest( pomArtifact,
request.getRepositories(), request.getRequestContext() );
+resolveRequest.setTrace( trace );
resolveResult = artifactResolver.resolveArtifact
svn commit: r1074222 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
Author: bentmann
Date: Thu Feb 24 17:22:48 2011
New Revision: 1074222
URL: http://svn.apache.org/viewvc?rev=1074222view=rev
Log:
o Extended debug logging for project dependency graph to include source
location of dependency management
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java?rev=1074222r1=1074221r2=1074222view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
Thu Feb 24 17:22:48 2011
@@ -28,6 +28,8 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.InputLocation;
+import org.apache.maven.model.InputSource;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -43,6 +45,8 @@ import org.sonatype.aether.graph.Depende
import org.sonatype.aether.resolution.ArtifactResult;
import org.sonatype.aether.resolution.DependencyRequest;
import org.sonatype.aether.util.DefaultRequestTrace;
+import org.sonatype.aether.util.artifact.ArtifacIdUtils;
+import org.sonatype.aether.util.artifact.ArtifactProperties;
import org.sonatype.aether.util.artifact.JavaScopes;
/**
@@ -194,6 +198,8 @@ public class DefaultProjectDependenciesR
private String indent = ;
+private MapString, Dependency managed;
+
public GraphLogger( MavenProject project )
{
this.project = project;
@@ -213,12 +219,16 @@ public class DefaultProjectDependenciesR
if ( node.getPremanagedScope() != null
!node.getPremanagedScope().equals( dep.getScope() ) )
{
-buffer.append( (scope managed from ).append(
node.getPremanagedScope() ).append( ) );
+buffer.append( (scope managed from ).append(
node.getPremanagedScope() );
+appendManagementSource( buffer, art, scope );
+buffer.append( ) );
}
if ( node.getPremanagedVersion() != null
!node.getPremanagedVersion().equals( art.getVersion() ) )
{
-buffer.append( (version managed from ).append(
node.getPremanagedVersion() ).append( ) );
+buffer.append( (version managed from ).append(
node.getPremanagedVersion() );
+appendManagementSource( buffer, art, version );
+buffer.append( ) );
}
}
else
@@ -240,6 +250,41 @@ public class DefaultProjectDependenciesR
return true;
}
+private void appendManagementSource( StringBuilder buffer,
org.sonatype.aether.artifact.Artifact artifact,
+ String field )
+{
+if ( managed == null )
+{
+managed = new HashMapString, Dependency();
+if ( project.getDependencyManagement() != null )
+{
+for ( Dependency dep :
project.getDependencyManagement().getDependencies() )
+{
+managed.put( dep.getManagementKey(), dep );
+}
+}
+}
+
+String key =
+ArtifacIdUtils.toVersionlessId( artifact.getGroupId(),
artifact.getArtifactId(),
+artifact.getProperty(
ArtifactProperties.TYPE, jar ),
+artifact.getClassifier() );
+
+Dependency dependency = managed.get( key );
+if ( dependency != null )
+{
+InputLocation location = dependency.getLocation( field );
+if ( location != null )
+{
+InputSource source = location.getSource();
+if ( source != null )
+{
+buffer.append( by ).append( source.getModelId() );
+}
+}
+}
+}
+
}
}
svn commit: r1074258 - /maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
Author: bentmann
Date: Thu Feb 24 19:06:19 2011
New Revision: 1074258
URL: http://svn.apache.org/viewvc?rev=1074258view=rev
Log:
[MNG-5023] Wrong calculation of Build Total time
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java?rev=1074258r1=1074257r2=1074258view=diff
==
---
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
(original)
+++
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/ExecutionEventLogger.java
Thu Feb 24 19:06:19 2011
@@ -19,10 +19,7 @@ package org.apache.maven.cli;
* under the License.
*/
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.TimeZone;
import org.apache.maven.execution.AbstractExecutionListener;
import org.apache.maven.execution.BuildFailure;
@@ -71,22 +68,28 @@ public class ExecutionEventLogger
private static String getFormattedTime( long time )
{
-String pattern = s.SSS's';
+// NOTE: DateFormat is not suitable to format timespans of 24h+
-if ( time / 6L 0 )
-{
-pattern = m:s + pattern;
+long h = time / ( 60 * 60 * 1000 );
+long m = ( time - h * 60 * 60 * 1000 ) / ( 60 * 1000 );
+long s = ( time - h * 60 * 60 * 1000 - m * 60 * 1000 ) / 1000;
+long ms = time % 1000;
-if ( time / 360L 0 )
-{
-pattern = H:m + pattern;
-}
+String format;
+if ( h 0 )
+{
+format = %1$d:%2$02d:%3$02d.%4$03ds;
+}
+else if ( m 0 )
+{
+format = %2$d:%3$02d.%4$03ds;
+}
+else
+{
+format = %3$d.%4$03ds;
}
-DateFormat fmt = new SimpleDateFormat( pattern );
-fmt.setTimeZone( TimeZone.getTimeZone( UTC ) );
-
-return fmt.format( new Date( time ) );
+return String.format( format, h, m, s, ms );
}
@Override
svn commit: r1074273 - in /maven/maven-3/trunk/apache-maven/src/bin: mvn mvnDebug mvnyjp
Author: bentmann Date: Thu Feb 24 19:47:42 2011 New Revision: 1074273 URL: http://svn.apache.org/viewvc?rev=1074273view=rev Log: [MNG-5020] JAVA_HOME auto discovery Submitted by: Maciej Mazur o Extended original patch to other run scripts as well Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn maven/maven-3/trunk/apache-maven/src/bin/mvnDebug maven/maven-3/trunk/apache-maven/src/bin/mvnyjp Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvn?rev=1074273r1=1074272r2=1074273view=diff == --- maven/maven-3/trunk/apache-maven/src/bin/mvn (original) +++ maven/maven-3/trunk/apache-maven/src/bin/mvn Thu Feb 24 19:47:42 2011 @@ -114,6 +114,21 @@ if $mingw ; then # TODO classpath? fi +if [ -z $JAVA_HOME ]; then + javaExecutable=`which javac` + if [ -n $javaExecutable -a ! `expr \$javaExecutable\ : '\([^ ]*\)'` = no ]; then +# readlink(1) is not available as standard on Solaris 10. +readLink=`which readlink` +if [ ! `expr $readLink : '\([^ ]*\)'` = no ]; then + javaExecutable=`readlink -f \$javaExecutable\` + javaHome=`dirname \$javaExecutable\` + javaHome=`expr $javaHome : '\(.*\)/bin'` + JAVA_HOME=$javaHome + export JAVA_HOME +fi + fi +fi + if [ -z $JAVACMD ] ; then if [ -n $JAVA_HOME ] ; then if [ -x $JAVA_HOME/jre/sh/java ] ; then Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnDebug URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnDebug?rev=1074273r1=1074272r2=1074273view=diff == --- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug (original) +++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug Thu Feb 24 19:47:42 2011 @@ -118,6 +118,21 @@ if $mingw ; then # TODO classpath? fi +if [ -z $JAVA_HOME ]; then + javaExecutable=`which javac` + if [ -n $javaExecutable -a ! `expr \$javaExecutable\ : '\([^ ]*\)'` = no ]; then +# readlink(1) is not available as standard on Solaris 10. +readLink=`which readlink` +if [ ! `expr $readLink : '\([^ ]*\)'` = no ]; then + javaExecutable=`readlink -f \$javaExecutable\` + javaHome=`dirname \$javaExecutable\` + javaHome=`expr $javaHome : '\(.*\)/bin'` + JAVA_HOME=$javaHome + export JAVA_HOME +fi + fi +fi + if [ -z $JAVACMD ] ; then if [ -n $JAVA_HOME ] ; then if [ -x $JAVA_HOME/jre/sh/java ] ; then Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnyjp URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnyjp?rev=1074273r1=1074272r2=1074273view=diff == --- maven/maven-3/trunk/apache-maven/src/bin/mvnyjp (original) +++ maven/maven-3/trunk/apache-maven/src/bin/mvnyjp Thu Feb 24 19:47:42 2011 @@ -126,6 +126,21 @@ if $mingw ; then # TODO classpath? fi +if [ -z $JAVA_HOME ]; then + javaExecutable=`which javac` + if [ -n $javaExecutable -a ! `expr \$javaExecutable\ : '\([^ ]*\)'` = no ]; then +# readlink(1) is not available as standard on Solaris 10. +readLink=`which readlink` +if [ ! `expr $readLink : '\([^ ]*\)'` = no ]; then + javaExecutable=`readlink -f \$javaExecutable\` + javaHome=`dirname \$javaExecutable\` + javaHome=`expr $javaHome : '\(.*\)/bin'` + JAVA_HOME=$javaHome + export JAVA_HOME +fi + fi +fi + if [ -z $JAVACMD ] ; then if [ -n $JAVA_HOME ] ; then if [ -x $JAVA_HOME/jre/sh/java ] ; then
svn commit: r1074292 - /maven/maven-3/trunk/apache-maven/NOTICE.txt
Author: bentmann Date: Thu Feb 24 21:15:31 2011 New Revision: 1074292 URL: http://svn.apache.org/viewvc?rev=1074292view=rev Log: o Updated copyright year Modified: maven/maven-3/trunk/apache-maven/NOTICE.txt Modified: maven/maven-3/trunk/apache-maven/NOTICE.txt URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/NOTICE.txt?rev=1074292r1=1074291r2=1074292view=diff == --- maven/maven-3/trunk/apache-maven/NOTICE.txt (original) +++ maven/maven-3/trunk/apache-maven/NOTICE.txt Thu Feb 24 21:15:31 2011 @@ -5,7 +5,7 @@ = Apache Maven -Copyright 2001-2010 The Apache Software Foundation +Copyright 2001-2011 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
svn commit: r1074315 - in /maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it: ./ support/
Author: bentmann Date: Thu Feb 24 22:11:36 2011 New Revision: 1074315 URL: http://svn.apache.org/viewvc?rev=1074315view=rev Log: o Added license headers Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/BootstrapInstaller.java maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/support/TestUtils.java Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java?rev=1074315r1=1074314r2=1074315view=diff == --- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java Thu Feb 24 22:11:36 2011 @@ -1,5 +1,24 @@ 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.plugin.resources.remote.it.support.BootstrapInstaller; import junit.framework.TestCase; Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.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_CustomFilterDelimiter.java?rev=1074315r1=1074314r2=1074315view=diff == --- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_CustomFilterDelimiter.java Thu Feb 24 22:11:36 2011 @@ -1,5 +1,24 @@ 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; Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote
svn commit: r1074327 - in /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly: artifact/DefaultDependencyResolverTest.java testutils/ConfigSourceStub.java
Author: bentmann Date: Thu Feb 24 22:29:48 2011 New Revision: 1074327 URL: http://svn.apache.org/viewvc?rev=1074327view=rev Log: o Added license headers Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1074327r1=1074326r2=1074327view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Thu Feb 24 22:29:48 2011 @@ -1,5 +1,24 @@ package org.apache.maven.plugin.assembly.artifact; +/* + * 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.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java?rev=1074327r1=1074326r2=1074327view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java Thu Feb 24 22:29:48 2011 @@ -1,5 +1,24 @@ package org.apache.maven.plugin.assembly.testutils; +/* + * 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.archiver.MavenArchiveConfiguration; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession;
svn commit: r1073703 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
Author: bentmann
Date: Wed Feb 23 11:47:12 2011
New Revision: 1073703
URL: http://svn.apache.org/viewvc?rev=1073703view=rev
Log:
o Refactored code
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=1073703r1=1073702r2=1073703view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
Wed Feb 23 11:47:12 2011
@@ -461,17 +461,7 @@ public class LegacyRepositorySystem
for ( ArtifactRepository repository : repositories )
{
Mirror mirror = getMirror( repository, mirrors );
-
-if ( mirror != null )
-{
-repository.setId( mirror.getId() );
-repository.setUrl( mirror.getUrl() );
-
-if ( StringUtils.isNotEmpty( mirror.getLayout() ) )
-{
-repository.setLayout( getLayout( mirror.getLayout() )
);
-}
-}
+injectMirror( repository, mirror );
}
}
}
@@ -504,17 +494,21 @@ public class LegacyRepositorySystem
for ( ArtifactRepository repository : repositories )
{
Mirror mirror = getMirror( session, repository );
+injectMirror( repository, mirror );
+}
+}
+}
-if ( mirror != null )
-{
-repository.setId( mirror.getId() );
-repository.setUrl( mirror.getUrl() );
+private void injectMirror( ArtifactRepository repository, Mirror mirror )
+{
+if ( mirror != null )
+{
+repository.setId( mirror.getId() );
+repository.setUrl( mirror.getUrl() );
-if ( StringUtils.isNotEmpty( mirror.getLayout() ) )
-{
-repository.setLayout( getLayout( mirror.getLayout() )
);
-}
-}
+if ( StringUtils.isNotEmpty( mirror.getLayout() ) )
+{
+repository.setLayout( getLayout( mirror.getLayout() ) );
}
}
}
svn commit: r1073714 - in /maven/maven-3/trunk: maven-artifact/src/main/java/org/apache/maven/artifact/repository/ maven-compat/src/main/java/org/apache/maven/artifact/repository/ maven-compat/src/mai
Author: bentmann
Date: Wed Feb 23 12:06:20 2011
New Revision: 1073714
URL: http://svn.apache.org/viewvc?rev=1073714view=rev
Log:
[MNG-4963] [regression] Parent POM not downloaded when settings define global
mirror and one snapshot repo but no other release repository
Modified:
maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
Modified:
maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java?rev=1073714r1=1073713r2=1073714view=diff
==
---
maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
(original)
+++
maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
Wed Feb 23 12:06:20 2011
@@ -96,4 +96,8 @@ public interface ArtifactRepository
void setProxy( Proxy proxy );
Proxy getProxy();
+
+ListArtifactRepository getMirroredRepositories();
+void setMirroredRepositories( ListArtifactRepository
mirroredRepositories );
+
}
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java?rev=1073714r1=1073713r2=1073714view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
Wed Feb 23 12:06:20 2011
@@ -53,6 +53,8 @@ public class DefaultArtifactRepository
private Proxy proxy;
+private ListArtifactRepository mirroredRepositories =
Collections.emptyList();
+
/**
* Create a local repository or a test repository.
*
@@ -246,4 +248,21 @@ public class DefaultArtifactRepository
return true;
}
+public ListArtifactRepository getMirroredRepositories()
+{
+return mirroredRepositories;
+}
+
+public void setMirroredRepositories( ListArtifactRepository
mirroredRepositories )
+{
+if ( mirroredRepositories != null )
+{
+this.mirroredRepositories = mirroredRepositories;
+}
+else
+{
+this.mirroredRepositories = Collections.emptyList();
+}
+}
+
}
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java?rev=1073714r1=1073713r2=1073714view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Wed Feb 23 12:06:20 2011
@@ -385,6 +385,16 @@ public class LegacyLocalRepositoryManage
{
return null;
}
+
+public ListArtifactRepository getMirroredRepositories()
+{
+return Collections.emptyList();
+}
+
+public void setMirroredRepositories( ListArtifactRepository
mirroredRepositories )
+{
+}
+
}
}
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=1073714r1=1073713r2=1073714view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository
svn commit: r1073753 - /maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
Author: bentmann Date: Wed Feb 23 14:23:34 2011 New Revision: 1073753 URL: http://svn.apache.org/viewvc?rev=1073753view=rev Log: [MNG-5024] Update default plugin versions Modified: maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml Modified: maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml?rev=1073753r1=1073752r2=1073753view=diff == --- maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml (original) +++ maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml Wed Feb 23 14:23:34 2011 @@ -103,7 +103,7 @@ problem. org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile /test-compile test -org.apache.maven.plugins:maven-surefire-plugin:2.7.1:test +org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test /test package org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar @@ -158,7 +158,7 @@ problem. org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile /test-compile test -org.apache.maven.plugins:maven-surefire-plugin:2.7.1:test +org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test /test package org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb @@ -222,7 +222,7 @@ problem. org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile /test-compile test -org.apache.maven.plugins:maven-surefire-plugin:2.7.1:test +org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test /test package org.apache.maven.plugins:maven-ejb3-plugin:ejb3 @@ -282,7 +282,7 @@ problem. !-- START SNIPPET: maven-plugin-lifecycle -- phases generate-resources -org.apache.maven.plugins:maven-plugin-plugin:2.6:descriptor +org.apache.maven.plugins:maven-plugin-plugin:2.7:descriptor /generate-resources process-resources org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources @@ -297,11 +297,11 @@ problem. org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile /test-compile test -org.apache.maven.plugins:maven-surefire-plugin:2.7.1:test +org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test /test package org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar, - org.apache.maven.plugins:maven-plugin-plugin:2.6:addPluginArtifactMetadata + org.apache.maven.plugins:maven-plugin-plugin:2.7:addPluginArtifactMetadata /package install org.apache.maven.plugins:maven-install-plugin:2.3.1:install @@ -385,7 +385,7 @@ problem. org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile /test-compile test -org.apache.maven.plugins:maven-surefire-plugin:2.7.1:test +org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test /test package org.apache.maven.plugins:maven-war-plugin:2.1.1:war @@ -428,13 +428,13 @@ problem. !-- START SNIPPET: ear-lifecycle -- phases generate-resources - org.apache.maven.plugins:maven-ear-plugin:2.4.2:generate-application-xml + org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml /generate-resources process-resources org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources /process-resources package -org.apache.maven.plugins:maven-ear-plugin:2.4.2:ear +org.apache.maven.plugins:maven-ear-plugin:2.5:ear /package install org.apache.maven.plugins:maven-install-plugin:2.3.1:install @@ -486,7 +486,7 @@ problem. org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile /test-compile test -org.apache.maven.plugins:maven-surefire-plugin:2.7.1:test +org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test /test package org.apache.maven.plugins:maven-rar-plugin:2.2:rar @@ -541,7 +541,7 @@ problem. org.apache.maven.plugins:maven
svn commit: r1073807 - /maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
Author: bentmann
Date: Wed Feb 23 16:25:26 2011
New Revision: 1073807
URL: http://svn.apache.org/viewvc?rev=1073807view=rev
Log:
[MNG-4987] [regression] LATEST, RELEASE or SNAPSHOT version picked from wrong
repository when resolution order does not match timestamp order
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
Modified:
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java?rev=1073807r1=1073806r2=1073807view=diff
==
---
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
(original)
+++
maven/maven-3/trunk/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
Wed Feb 23 16:25:26 2011
@@ -383,6 +383,7 @@ public class DefaultVersionResolver
{
info.version = version;
info.repository = repository;
+info.timestamp = timestamp;
}
}
svn commit: r1073829 - /maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo
Author: bentmann
Date: Wed Feb 23 17:06:41 2011
New Revision: 1073829
URL: http://svn.apache.org/viewvc?rev=1073829view=rev
Log:
o Extended API docs
Modified:
maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo
Modified: maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo?rev=1073829r1=1073828r2=1073829view=diff
==
--- maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo Wed Feb 23 17:06:41
2011
@@ -3568,7 +3568,7 @@
typeString/type
description
![CDATA[
-The identifier of the POM.
+The identifier of the POM in the format {@code
groupId:artifactId:version}.
]]
/description
/field
svn commit: r1073926 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project: DefaultProjectBuilder.java ProjectBuilder.java ProjectModelResolver.java
Author: bentmann
Date: Wed Feb 23 20:22:03 2011
New Revision: 1073926
URL: http://svn.apache.org/viewvc?rev=1073926view=rev
Log:
o Refactored code
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=1073926r1=1073925r2=1073926view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Wed Feb 23 20:22:03 2011
@@ -48,9 +48,10 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.ArtifactResolver;
+import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.impl.RemoteRepositoryManager;
import org.sonatype.aether.repository.LocalRepositoryManager;
+import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.repository.WorkspaceRepository;
import org.sonatype.aether.resolution.ArtifactRequest;
import org.sonatype.aether.resolution.ArtifactResult;
@@ -59,7 +60,7 @@ import org.sonatype.aether.util.artifact
/**
* @version $Id$
*/
-@Component(role = ProjectBuilder.class)
+@Component( role = ProjectBuilder.class )
public class DefaultProjectBuilder
implements ProjectBuilder
{
@@ -80,7 +81,7 @@ public class DefaultProjectBuilder
private RepositorySystem repositorySystem;
@Requirement
-private ArtifactResolver artifactResolver;
+private org.sonatype.aether.RepositorySystem repoSystem;
@Requirement
private RemoteRepositoryManager repositoryManager;
@@ -92,43 +93,45 @@ public class DefaultProjectBuilder
// MavenProjectBuilder Implementation
// --
-public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest
configuration )
+public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest
request )
throws ProjectBuildingException
{
-return build( pomFile, new FileModelSource( pomFile ), configuration );
+return build( pomFile, new FileModelSource( pomFile ), new
InternalConfig( request, null, null ) );
}
-public ProjectBuildingResult build( ModelSource modelSource,
ProjectBuildingRequest configuration )
+public ProjectBuildingResult build( ModelSource modelSource,
ProjectBuildingRequest request )
throws ProjectBuildingException
{
-return build( null, modelSource, configuration );
+return build( null, modelSource, new InternalConfig( request, null,
null ) );
}
-private ProjectBuildingResult build( File pomFile, ModelSource
modelSource, ProjectBuildingRequest configuration )
+private ProjectBuildingResult build( File pomFile, ModelSource
modelSource, InternalConfig config )
throws ProjectBuildingException
{
ClassLoader oldContextClassLoader =
Thread.currentThread().getContextClassLoader();
try
{
+ProjectBuildingRequest configuration = config.request;
+
MavenProject project = configuration.getProject();
ListModelProblem modelProblems = null;
if ( project == null )
{
-ModelBuildingRequest request = getModelBuildingRequest(
configuration, null );
+ModelBuildingRequest request = getModelBuildingRequest( config
);
project = new MavenProject( repositorySystem, this,
configuration, logger );
DefaultModelBuildingListener listener =
new DefaultModelBuildingListener( project,
projectBuildingHelper, configuration );
request.setModelBuildingListener( listener );
-
+
request.setPomFile( pomFile );
request.setModelSource( modelSource );
request.setLocationTracking( true );
-
+
ModelBuildingResult result;
try
{
@@ -205,13 +208,13 @@ public class DefaultProjectBuilder
return ids;
}
-private ModelBuildingRequest getModelBuildingRequest(
ProjectBuildingRequest configuration,
- ReactorModelPool
modelPool )
+private ModelBuildingRequest
svn commit: r1073928 - in /maven/maven-3/trunk: maven-compat/src/main/java/org/apache/maven/artifact/deployer/ maven-compat/src/main/java/org/apache/maven/artifact/installer/ maven-compat/src/main/jav
Author: bentmann
Date: Wed Feb 23 20:25:29 2011
New Revision: 1073928
URL: http://svn.apache.org/viewvc?rev=1073928view=rev
Log:
[MNG-4990] RepositorySystem#resolve(request) uses two different local
repositories
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
- copied, changed from r1073714,
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Removed:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=1073928r1=1073927r2=1073928view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Wed Feb 23 20:25:29 2011
@@ -38,13 +38,12 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.deployment.DeployRequest;
import org.sonatype.aether.deployment.DeployResult;
import org.sonatype.aether.deployment.DeploymentException;
import org.sonatype.aether.metadata.MergeableMetadata;
-import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
import org.sonatype.aether.util.artifact.SubArtifact;
@Component( role = ArtifactDeployer.class, instantiationStrategy =
per-lookup )
@@ -79,9 +78,8 @@ public class DefaultArtifactDeployer
ArtifactRepository localRepository )
throws ArtifactDeploymentException
{
-DefaultRepositorySystemSession session =
-new DefaultRepositorySystemSession(
legacySupport.getRepositorySession() );
-session.setLocalRepositoryManager( LegacyLocalRepositoryManager.wrap(
localRepository, repoSystem ) );
+RepositorySystemSession session =
+LegacyLocalRepositoryManager.overlay( localRepository,
legacySupport.getRepositorySession(), repoSystem );
DeployRequest request = new DeployRequest();
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=1073928r1=1073927r2=1073928view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Wed Feb 23 20:25:29 2011
@@ -37,10 +37,9 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.RepositorySystemSession;
import org.sonatype.aether.installation.InstallRequest;
import org.sonatype.aether.installation.InstallationException;
-import org.sonatype.aether.repository.LocalRepository;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
import org.sonatype.aether.util.artifact.SubArtifact;
/**
@@ -72,9 +71,8 @@ public class DefaultArtifactInstaller
public void install( File source, Artifact artifact, ArtifactRepository
localRepository )
throws ArtifactInstallationException
{
-DefaultRepositorySystemSession session =
-new DefaultRepositorySystemSession(
legacySupport.getRepositorySession() );
-session.setLocalRepositoryManager( LegacyLocalRepositoryManager.wrap(
localRepository, repoSystem ) );
+RepositorySystemSession session
svn commit: r1073948 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Author: bentmann
Date: Wed Feb 23 21:07:42 2011
New Revision: 1073948
URL: http://svn.apache.org/viewvc?rev=1073948view=rev
Log:
o Fixed typos
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=1073948r1=1073947r2=1073948view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Wed Feb 23 21:07:42 2011
@@ -160,7 +160,7 @@ public class DefaultProjectBuilder
try
{
DefaultDependencyResolutionRequest resolution =
-new DefaultDependencyResolutionRequest( project,
configuration.getRepositorySession() );
+new DefaultDependencyResolutionRequest( project,
config.session );
resolutionResult = dependencyResolver.resolve( resolution
);
}
catch ( DependencyResolutionException e )
@@ -175,7 +175,7 @@ public class DefaultProjectBuilder
Collections.singletonList(
project.getArtifact().getId() ), null );
// Maven 2.x quirk: an artifact always points at the local
repo, regardless whether resolved or not
-LocalRepositoryManager lrm =
configuration.getRepositorySession().getLocalRepositoryManager();
+LocalRepositoryManager lrm =
config.session.getLocalRepositoryManager();
for ( Artifact artifact : artifacts )
{
if ( !artifact.isResolved() )
svn commit: r1073990 - in /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven: artifact/repository/DefaultArtifactRepositoryFactory.java project/ProjectUtils.java repository/legacy/Legacy
Author: bentmann
Date: Wed Feb 23 23:47:21 2011
New Revision: 1073990
URL: http://svn.apache.org/viewvc?rev=1073990view=rev
Log:
[MNG-4991] LegacyRepositorySystem#injectProxy(repositories, proxies) doesn't
evaluate non-proxy hosts
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=1073990r1=1073989r2=1073990view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Wed Feb 23 23:47:21 2011
@@ -24,12 +24,11 @@ import java.util.List;
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import org.sonatype.aether.RepositorySystemSession;
/**
* @author jdcasey
@@ -97,24 +96,20 @@ public class DefaultArtifactRepositoryFa
private ArtifactRepository injectSession( ArtifactRepository repository,
boolean mirrors )
{
-MavenSession session = legacySupport.getSession();
+RepositorySystemSession session = legacySupport.getRepositorySession();
if ( session != null repository != null !isLocalRepository(
repository ) )
{
-MavenExecutionRequest request = session.getRequest();
-if ( request != null )
-{
-ListArtifactRepository repositories = Arrays.asList(
repository );
+ListArtifactRepository repositories = Arrays.asList( repository
);
-if ( mirrors )
-{
-repositorySystem.injectMirror( repositories,
request.getMirrors() );
-}
+if ( mirrors )
+{
+repositorySystem.injectMirror( session, repositories );
+}
-repositorySystem.injectProxy( repositories,
request.getProxies() );
+repositorySystem.injectProxy( session, repositories );
-repositorySystem.injectAuthentication( repositories,
request.getServers() );
-}
+repositorySystem.injectAuthentication( session, repositories );
}
return repository;
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java?rev=1073990r1=1073989r2=1073990view=diff
==
---
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
(original)
+++
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
Wed Feb 23 23:47:21 2011
@@ -26,13 +26,13 @@ import java.util.List;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.Repository;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusContainer;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.sonatype.aether.RepositorySystemSession;
// This class needs to stick around because it was exposed the the remote
resources plugin started using it instead of
// getting the repositories from the project.
@@ -75,15 +75,15 @@ public final class ProjectUtils
throws InvalidRepositoryException
{
RepositorySystem repositorySystem = rs( c );
-MavenExecutionRequest executionRequest = er( c );
+RepositorySystemSession session = rss( c );
ArtifactRepository repository
svn commit: r1072612 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5000/ resources/mng-5000/different-from-artifactId/ resources/mng-5000/p
Author: bentmann
Date: Sun Feb 20 15:33:06 2011
New Revision: 1072612
URL: http://svn.apache.org/viewvc?rev=1072612view=rev
Log:
[MNG-5000] [regression] child distributionManagment.site.url not correct in a
flat directory layout when child's artifactId doesn't match its module name
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5000/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5000/different-from-artifactId/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5000/different-from-artifactId/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5000/parent/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5000/parent/pom.xml
(with props)
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=1072612r1=1072611r2=1072612view=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
Sun Feb 20 15:33:06 2011
@@ -87,6 +87,7 @@ public class IntegrationTestSuite
suite.addTestSuite(
MavenITmng5012CollectionVsArrayParamCoercionTest.class );
suite.addTestSuite(
MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.class );
suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
+suite.addTestSuite(
MavenITmng5000ChildPathAwareUrlInheritanceTest.class );
suite.addTestSuite(
MavenITmng4992MapStylePropertiesParamConfigTest.class );
suite.addTestSuite(
MavenITmng4975ProfileInjectedPluginExecutionOrderTest.class );
suite.addTestSuite(
MavenITmng4973ExtensionVisibleToPluginInReactorTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java?rev=1072612view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
Sun Feb 20 15:33:06 2011
@@ -0,0 +1,68 @@
+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.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-5000;MNG-5000/a. Note this is a
subtle
+ * variation and not a duplicate of the test for MNG-2006.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng5000ChildPathAwareUrlInheritanceTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5000ChildPathAwareUrlInheritanceTest()
+{
+super( [2.0.11,2.0.99),[2.2.0,3.0-alpha-1),[3.0.3,) );
+}
+
+/**
+ * Verify that child path aware URL adjustment still works when the
child's artifactId doesn't match the name
+ * of its base directory as given in the parent's module section.
+ */
+public void testit()
+throws Exception
+{
+File testDir
svn commit: r1072613 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
Author: bentmann
Date: Sun Feb 20 15:34:42 2011
New Revision: 1072613
URL: http://svn.apache.org/viewvc?rev=1072613view=rev
Log:
[MNG-5000] [regression] child distributionManagment.site.url not correct in a
flat directory layout when child's artifactId doesn't match its module name
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java?rev=1072613r1=1072612r2=1072613view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
Sun Feb 20 15:34:42 2011
@@ -19,6 +19,7 @@ package org.apache.maven.model.inheritan
* under the License.
*/
+import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -74,7 +75,19 @@ public class DefaultInheritanceAssembler
if ( parent != null )
{
-String childArtifactId = child.getArtifactId();
+String childName = child.getArtifactId();
+
+/*
+ * This logic exists only for the sake of backward-compat with 2.x
(MNG-5000). In generally, it is wrong to
+ * base URL inheritance on the project directory names as this
information is unavailable for POMs in the
+ * repository. In other words, projects where artifactId !=
projectDirName will see different effective URLs
+ * depending on how the POM was constructed.
+ */
+File childDirectory = child.getProjectDirectory();
+if ( childDirectory != null )
+{
+childName = childDirectory.getName();
+}
for ( String module : parent.getModules() )
{
@@ -95,7 +108,7 @@ public class DefaultInheritanceAssembler
moduleName = moduleName.substring( lastSlash + 1 );
-if ( moduleName.equals( childArtifactId ) lastSlash = 0 )
+if ( moduleName.equals( childName ) lastSlash = 0 )
{
adjustment = module.substring( 0, lastSlash );
break;
svn commit: r1072633 - in /maven/core-integration-testing/trunk: .gitattributes .gitignore
Author: bentmann Date: Sun Feb 20 17:00:19 2011 New Revision: 1072633 URL: http://svn.apache.org/viewvc?rev=1072633view=rev Log: o Added git config files Added: maven/core-integration-testing/trunk/.gitattributes maven/core-integration-testing/trunk/.gitignore Added: maven/core-integration-testing/trunk/.gitattributes URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/.gitattributes?rev=1072633view=auto == --- maven/core-integration-testing/trunk/.gitattributes (added) +++ maven/core-integration-testing/trunk/.gitattributes Sun Feb 20 17:00:19 2011 @@ -0,0 +1,2 @@ +*.java ident +*.jar -text -crlf Added: maven/core-integration-testing/trunk/.gitignore URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/.gitignore?rev=1072633view=auto == --- maven/core-integration-testing/trunk/.gitignore (added) +++ maven/core-integration-testing/trunk/.gitignore Sun Feb 20 17:00:19 2011 @@ -0,0 +1,7 @@ +.svn/ +target/ +.project +.classpath +.settings/ +bin/ +*.ipr
svn commit: r1072634 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
Author: bentmann
Date: Sun Feb 20 17:07:56 2011
New Revision: 1072634
URL: http://svn.apache.org/viewvc?rev=1072634view=rev
Log:
o Set svn:eol-style=native
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
(contents, props changed)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java?rev=1072634r1=1072633r2=1072634view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
Sun Feb 20 17:07:56 2011
@@ -1,207 +1,207 @@
-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.ResourceExtractor;
-
-import java.io.File;
-import java.util.Properties;
-
-/**
- * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-3004;MNG-3004/a.
- *
- * @author Dan Fabulich
- * @version $Id: MavenITmng0095ReactorFailureBehaviorTest.java 804194
2009-08-14 12:32:56Z bentmann $
- */
-public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
-extends AbstractMavenIntegrationTestCase
-{
-public MavenITmng3004ReactorFailureBehaviorMultithreadedTest()
-{
-super( (3.0-alpha-3,) );
-}
-
-/**
- * Test fail-fast reactor behavior. Forces an exception to be thrown in
- * the first module and checks that the second third module is not built
and the overall build fails, too.
- */
-public void testitFailFastSingleThread()
-throws Exception
-{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-0095 );
-
-Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-verifier.setAutoclean( false );
-verifier.deleteDirectory( target );
-verifier.deleteDirectory( subproject1/target );
-verifier.deleteDirectory( subproject2/target );
-verifier.deleteDirectory( subproject3/target );
-verifier.getCliOptions().add( --fail-fast );
-verifier.setLogFileName( log-ff-mt1.txt );
-verifier.setSystemProperty( maven.threads.experimental, 1 );
-
-try
-{
-verifier.executeGoal(
org.apache.maven.its.plugins:maven-it-plugin-touch:touch );
-verifier.verifyErrorFreeLog();
-}
-catch ( VerificationException e )
-{
-// expected
-}
-verifier.resetStreams();
-
-verifier.assertFilePresent( target/touch.txt );
-verifier.assertFileNotPresent( subproject1/target/touch.txt );
-verifier.assertFileNotPresent( subproject2/target/touch.txt );
-verifier.assertFileNotPresent( subproject3/target/touch.txt );
-}
-
-/**
- * Test fail-never reactor behavior. Forces an exception to be thrown in
- * the first module, but checks that the second third module is built
and the overall build succeeds.
- */
-public void testitFailNeverSingleThread()
-throws Exception
-{
-File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-0095 );
-
-Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-verifier.setAutoclean( false );
-verifier.deleteDirectory( target );
-verifier.deleteDirectory( subproject1/target );
-verifier.deleteDirectory( subproject2/target );
-verifier.deleteDirectory( subproject3/target );
-verifier.getCliOptions().add( --fail-never );
-verifier.setLogFileName( log-fn-mt1.txt );
-verifier.setSystemProperty( maven.threads.experimental, 1
svn commit: r1072635 - /maven/core-integration-testing/trunk/
Author: bentmann Date: Sun Feb 20 17:10:19 2011 New Revision: 1072635 URL: http://svn.apache.org/viewvc?rev=1072635view=rev Log: o Added git dir to svn:ignore Modified: maven/core-integration-testing/trunk/ (props changed) Propchange: maven/core-integration-testing/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Feb 20 17:10:19 2011 @@ -5,3 +5,4 @@ target .classpath .project .settings +.git
svn commit: r1072638 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/ c
Author: bentmann Date: Sun Feb 20 17:18:22 2011 New Revision: 1072638 URL: http://svn.apache.org/viewvc?rev=1072638view=rev Log: o Set svn:keywords Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java (contents, props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java (props changed) maven/core-integration-testing/trunk/core-it-suite/src
svn commit: r1072641 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java resources/mng-3599/settings-template.xml r
Author: bentmann Date: Sun Feb 20 17:30:26 2011 New Revision: 1072641 URL: http://svn.apache.org/viewvc?rev=1072641view=rev Log: o Used Windows-friendly filename Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings-template.xml (props changed) - copied unchanged from r1072634, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings.xml.template Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings.xml.template Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java?rev=1072641r1=1072640r2=1072641view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java Sun Feb 20 17:30:26 2011 @@ -147,7 +147,7 @@ public class MavenITmng3599useHttpProxyF verifier.verifyErrorFreeLog(); verifier.resetStreams(); -String settings = FileUtils.fileRead( new File( testDir, settings.xml.template ) ); +String settings = FileUtils.fileRead( new File( testDir, settings-template.xml ) ); settings = StringUtils.replace( settings, @port@, Integer.toString( port ) ); String newSettings = StringUtils.replace( settings, @protocol@, http ); @@ -191,7 +191,7 @@ public class MavenITmng3599useHttpProxyF verifier.verifyErrorFreeLog(); verifier.resetStreams(); -String settings = FileUtils.fileRead( new File( testDir, settings.xml.template ) ); +String settings = FileUtils.fileRead( new File( testDir, settings-template.xml ) ); settings = StringUtils.replace( settings, @port@, Integer.toString( port ) ); String newSettings = StringUtils.replace( settings, @protocol@, dav ); Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/settings-template.xml -- svn:eol-style = native
svn commit: r1072642 - /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1349/repo/.gitattributes
Author: bentmann Date: Sun Feb 20 17:36:12 2011 New Revision: 1072642 URL: http://svn.apache.org/viewvc?rev=1072642view=rev Log: o Fixed git attributes Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1349/repo/.gitattributes Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1349/repo/.gitattributes URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1349/repo/.gitattributes?rev=1072642view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1349/repo/.gitattributes (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1349/repo/.gitattributes Sun Feb 20 17:36:12 2011 @@ -0,0 +1,2 @@ +*.pom -text -crlf +*.xml -text -crlf
svn commit: r1072645 - in /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150: a/maven-metadata.xml b/maven-metadata.xml c/maven-metadata.
Author: bentmann Date: Sun Feb 20 17:43:17 2011 New Revision: 1072645 URL: http://svn.apache.org/viewvc?rev=1072645view=rev Log: o Set svn:eol-style=native Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/a/maven-metadata.xml (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/b/maven-metadata.xml (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/c/maven-metadata.xml (props changed) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/d/maven-metadata.xml (props changed) Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/a/maven-metadata.xml -- svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/b/maven-metadata.xml -- svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/c/maven-metadata.xml -- svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4150/repo/org/apache/maven/its/mng4150/d/maven-metadata.xml -- svn:eol-style = native
svn commit: r1072647 - /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3379/repo/.gitattributes
Author: bentmann Date: Sun Feb 20 17:44:00 2011 New Revision: 1072647 URL: http://svn.apache.org/viewvc?rev=1072647view=rev Log: o Fixed git attributes Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3379/repo/.gitattributes Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3379/repo/.gitattributes URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3379/repo/.gitattributes?rev=1072647view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3379/repo/.gitattributes (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3379/repo/.gitattributes Sun Feb 20 17:44:00 2011 @@ -0,0 +1,2 @@ +*.pom -text -crlf +*.xml -text -crlf
svn commit: r1072657 - in /maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441: maven-metadata.xml.md5 maven-metadata.xml.sha1
Author: bentmann Date: Sun Feb 20 17:55:51 2011 New Revision: 1072657 URL: http://svn.apache.org/viewvc?rev=1072657view=rev Log: o Normalized checksums to use canonical format Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.md5 maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.sha1 Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.md5 URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.md5?rev=1072657r1=1072656r2=1072657view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.md5 (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.md5 Sun Feb 20 17:55:51 2011 @@ -1 +1 @@ -MD5(deployment-repository/org/apache/maven/its/mng3341/maven-metadata.xml)= 586c797fc688cda90b7c83f5db2e7f58 +586c797fc688cda90b7c83f5db2e7f58 \ No newline at end of file Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.sha1 URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.sha1?rev=1072657r1=1072656r2=1072657view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.sha1 (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3441/deploy-repo/org/apache/maven/its/mng3441/maven-metadata.xml.sha1 Sun Feb 20 17:55:51 2011 @@ -1 +1 @@ -SHA1(deployment-repository/org/apache/maven/its/mng3341/maven-metadata.xml)= da64f175aae7ebe2af3825759ed1180cb4377e46 +da64f175aae7ebe2af3825759ed1180cb4377e46 \ No newline at end of file
svn commit: r1072705 - in /maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering: DefaultMavenFileFilterTest.java EscapeStringTest.java IncrementalResourceFilteringTest.ja
Author: bentmann
Date: Sun Feb 20 20:09:17 2011
New Revision: 1072705
URL: http://svn.apache.org/viewvc?rev=1072705view=rev
Log:
o Added license header
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java?rev=1072705r1=1072704r2=1072705view=diff
==
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
Sun Feb 20 20:09:17 2011
@@ -1,13 +1,5 @@
package org.apache.maven.shared.filtering;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,6 +19,14 @@ import org.codehaus.plexus.util.FileUtil
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+
/**
* @author a href=mailto:ol...@apache.org;olamy/a
* @version $Id$
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java?rev=1072705r1=1072704r2=1072705view=diff
==
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Sun Feb 20 20:09:17 2011
@@ -1,109 +1,110 @@
-package org.apache.maven.shared.filtering;
-/*
- * 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 java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.maven.model.Resource;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-
-/**
- * @author Olivier Lamy
- *
- */
-public class EscapeStringTest
-extends PlexusTestCase
-{
-
-File outputDirectory = new File( getBasedir(), target/EscapeStringTest );
-
-File unitDirectory = new File( getBasedir(),
src/test/units-files/escape-remove-char );
-
-protected void setUp()
-throws Exception
-{
-super.setUp();
-if ( outputDirectory.exists() )
-{
-FileUtils.forceDelete( outputDirectory );
-}
-outputDirectory.mkdirs();
-}
-
-public void testEscape()
-throws Exception
-{
-File baseDir = new File( c:\\foo\\bar );
-StubMavenProject mavenProject = new StubMavenProject( baseDir );
-mavenProject.setVersion( 1.0 );
-mavenProject.setGroupId( org.apache );
-mavenProject.setName( test project );
-
-Properties projectProperties = new Properties();
-projectProperties.put( foo, bar );
-projectProperties.put( java.version, zloug );
-projectProperties.put( replaceThis, I am the replacement );
-mavenProject.setProperties( projectProperties );
-MavenResourcesFiltering
svn commit: r1072706 - /maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Author: bentmann
Date: Sun Feb 20 20:11:54 2011
New Revision: 1072706
URL: http://svn.apache.org/viewvc?rev=1072706view=rev
Log:
o Removed svn:executable
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
(props changed)
Propchange:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
('svn:executable' removed)
svn commit: r1072718 - in /maven/shared/trunk/maven-filtering/src: main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java test/java/org/apache/maven/shared/f
Author: bentmann
Date: Sun Feb 20 20:42:50 2011
New Revision: 1072718
URL: http://svn.apache.org/viewvc?rev=1072718view=rev
Log:
o Restored Java 1.4 compatibility
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1072718r1=1072717r2=1072718view=diff
==
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
Sun Feb 20 20:42:50 2011
@@ -87,7 +87,7 @@ public class MultiDelimiterInterpolatorF
private boolean supportMultiLineFiltering;
-private Character preserveChar = null;
+private int preserveChar = -1;
/**
* This constructor uses default begin token ${ and default end token }.
@@ -221,10 +221,10 @@ public class MultiDelimiterInterpolatorF
}
return ch;
}
-if ( preserveChar != null )
+if ( preserveChar = 0 )
{
-char copy = Character.valueOf( preserveChar.charValue()
).charValue();
-preserveChar = null;
+int copy = preserveChar;
+preserveChar = -1;
replaceIndex = -1;
return copy;
}
@@ -278,7 +278,7 @@ public class MultiDelimiterInterpolatorF
// so we preserve it
replaceData = key.toString();
replaceIndex = 1;
-preserveChar = Character.valueOf( (char) ch );
+preserveChar = ch;
return replaceData.charAt( 0 );
}
else
Modified:
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java?rev=1072718r1=1072717r2=1072718view=diff
==
---
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
Sun Feb 20 20:42:50 2011
@@ -98,8 +98,8 @@ public class EscapeStringTest
String content = IOUtil.toString( new FileInputStream( new File(
outputDirectory, content.xml ) ) );
System.out.println( content + content );
-assertTrue( content.contains( broken-tagContent with
replacement: I am the replacement !/broken-tag ) );
-assertTrue( content.contains( broken-tagContent with escaped
replacement: Do not ${replaceThis} !/broken-tag) );
+assertTrue( content.indexOf( broken-tagContent with
replacement: I am the replacement !/broken-tag ) = 0 );
+assertTrue( content.indexOf( broken-tagContent with escaped
replacement: Do not ${replaceThis} !/broken-tag ) = 0 );
}
finally
{
svn commit: r1071576 - /maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Author: bentmann
Date: Thu Feb 17 11:16:51 2011
New Revision: 1071576
URL: http://svn.apache.org/viewvc?rev=1071576view=rev
Log:
o Fixed file handle leak
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=1071576r1=1071575r2=1071576view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Thu Feb 17 11:16:51 2011
@@ -26,6 +26,7 @@ import org.apache.maven.plugin.war.Overl
import org.apache.maven.plugin.war.util.PathSet;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.XmlStreamReader;
@@ -291,7 +292,14 @@ public class WarProjectPackagingTask
throws IOException
{
XmlStreamReader xmlReader = new XmlStreamReader( webXml );
-return xmlReader.getEncoding();
+try
+{
+return xmlReader.getEncoding();
+}
+finally
+{
+IOUtil.close( xmlReader );
+}
}
/**
svn commit: r1071796 - /maven/site/trunk/pom.xml
Author: bentmann Date: Thu Feb 17 21:22:17 2011 New Revision: 1071796 URL: http://svn.apache.org/viewvc?rev=1071796view=rev Log: o Used released maven-parent:19 Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1071796r1=1071795r2=1071796view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Thu Feb 17 21:22:17 2011 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version19-SNAPSHOT/version +version19/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r1071797 - in /maven/shared/trunk: maven-filtering/pom.xml maven-osgi/pom.xml
Author: bentmann Date: Thu Feb 17 21:26:17 2011 New Revision: 1071797 URL: http://svn.apache.org/viewvc?rev=1071797view=rev Log: o Used released maven-shared-components:16 Modified: maven/shared/trunk/maven-filtering/pom.xml maven/shared/trunk/maven-osgi/pom.xml Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1071797r1=1071796r2=1071797view=diff == --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Thu Feb 17 21:26:17 2011 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version16-SNAPSHOT/version +version16/version relativePath../maven-shared-components/pom.xml/relativePath /parent Modified: maven/shared/trunk/maven-osgi/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-osgi/pom.xml?rev=1071797r1=1071796r2=1071797view=diff == --- maven/shared/trunk/maven-osgi/pom.xml (original) +++ maven/shared/trunk/maven-osgi/pom.xml Thu Feb 17 21:26:17 2011 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version16-SNAPSHOT/version +version16/version relativePath../maven-shared-components/pom.xml/relativePath /parent
svn commit: r1071027 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
Author: bentmann
Date: Tue Feb 15 19:39:01 2011
New Revision: 1071027
URL: http://svn.apache.org/viewvc?rev=1071027view=rev
Log:
o Improved robustness against incompatible event spies
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java?rev=1071027r1=1071026r2=1071027view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
Tue Feb 15 19:39:01 2011
@@ -85,15 +85,11 @@ public class EventSpyDispatcher
}
catch ( Exception e )
{
-String msg = Failed to initialize spy +
eventSpy.getClass().getName() + : + e.getMessage();
-if ( logger.isDebugEnabled() )
-{
-logger.warn( msg, e );
-}
-else
-{
-logger.warn( msg );
-}
+logError( initialize, e, eventSpy );
+}
+catch ( LinkageError e )
+{
+logError( initialize, e, eventSpy );
}
}
}
@@ -112,15 +108,11 @@ public class EventSpyDispatcher
}
catch ( Exception e )
{
-String msg = Failed to forward event to spy +
eventSpy.getClass().getName() + : + e.getMessage();
-if ( logger.isDebugEnabled() )
-{
-logger.warn( msg, e );
-}
-else
-{
-logger.warn( msg );
-}
+logError( notify, e, eventSpy );
+}
+catch ( LinkageError e )
+{
+logError( notify, e, eventSpy );
}
}
}
@@ -139,16 +131,26 @@ public class EventSpyDispatcher
}
catch ( Exception e )
{
-String msg = Failed to close spy +
eventSpy.getClass().getName() + : + e.getMessage();
-if ( logger.isDebugEnabled() )
-{
-logger.warn( msg, e );
-}
-else
-{
-logger.warn( msg );
-}
+logError( close, e, eventSpy );
}
+catch ( LinkageError e )
+{
+logError( close, e, eventSpy );
+}
+}
+}
+
+private void logError( String action, Throwable e, EventSpy spy )
+{
+String msg = Failed to + action + spy +
spy.getClass().getName() + : + e.getMessage();
+
+if ( logger.isDebugEnabled() )
+{
+logger.warn( msg, e );
+}
+else
+{
+logger.warn( msg );
}
}
svn commit: r1070588 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
Author: bentmann
Date: Mon Feb 14 17:34:09 2011
New Revision: 1070588
URL: http://svn.apache.org/viewvc?rev=1070588view=rev
Log:
o Fixed typo
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java?rev=1070588r1=1070587r2=1070588view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
Mon Feb 14 17:34:09 2011
@@ -43,7 +43,7 @@ class DefaultDependencyResolutionResult
private ListDependency unresolvedDependencies = new
ArrayListDependency();
-private ListException collectionErros = new ArrayListException();
+private ListException collectionErrors = new ArrayListException();
private MapDependency, ListException resolutionErrors = new
IdentityHashMapDependency, ListException();
@@ -80,18 +80,18 @@ class DefaultDependencyResolutionResult
public ListException getCollectionErrors()
{
-return collectionErros;
+return collectionErrors;
}
public void setCollectionErrors( ListException exceptions )
{
if ( exceptions != null )
{
-this.collectionErros = exceptions;
+this.collectionErrors = exceptions;
}
else
{
-this.collectionErros = new ArrayListException();
+this.collectionErrors = new ArrayListException();
}
}
svn commit: r1070241 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java resources/mng-4318/pom.xml
Author: bentmann
Date: Sun Feb 13 14:26:12 2011
New Revision: 1070241
URL: http://svn.apache.org/viewvc?rev=1070241view=rev
Log:
[MNG-5014] [regression] MavenProject.getParent().isExecutionRoot() not properly
set
o Strengthened related IT
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java?rev=1070241r1=1070240r2=1070241view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
Sun Feb 13 14:26:12 2011
@@ -26,7 +26,8 @@ import java.io.File;
import java.util.Properties;
/**
- * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-4318;MNG-4318/a.
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-4318;MNG-4318/a and
+ * a href=http://jira.codehaus.org/browse/MNG-5014;MNG-5014/a.
*
* @author Benjamin Bentmann
*/
@@ -36,7 +37,7 @@ public class MavenITmng4318ProjectExecut
public MavenITmng4318ProjectExecutionRootTest()
{
-super( ALL_MAVEN_VERSIONS );
+super( [2.0.4,3.0-alpha-1),[3.0.3,) );
}
/**
@@ -64,12 +65,16 @@ public class MavenITmng4318ProjectExecut
props = verifier.loadProperties( sub-1/target/project.properties );
assertEquals( false, props.getProperty( project.executionRoot ) );
+assertEquals( true, props.getProperty(
project.parent.executionRoot ) );
props = verifier.loadProperties( sub-2/target/project.properties );
assertEquals( false, props.getProperty( project.executionRoot ) );
+assertEquals( true, props.getProperty(
project.parent.executionRoot ) );
props = verifier.loadProperties(
sub-2/sub-3/target/project.properties );
assertEquals( false, props.getProperty( project.executionRoot ) );
+assertEquals( false, props.getProperty(
project.parent.executionRoot ) );
+assertEquals( true, props.getProperty(
project.parent.parent.executionRoot ) );
}
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml?rev=1070241r1=1070240r2=1070241view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
Sun Feb 13 14:26:12 2011
@@ -47,6 +47,8 @@ under the License.
outputFiletarget/project.properties/outputFile
expressions
expressionproject/executionRoot/expression
+expressionproject/parent/executionRoot/expression
+expressionproject/parent/parent/executionRoot/expression
/expressions
/configuration
executions
svn commit: r1070242 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Author: bentmann
Date: Sun Feb 13 14:26:57 2011
New Revision: 1070242
URL: http://svn.apache.org/viewvc?rev=1070242view=rev
Log:
[MNG-5014] [regression] MavenProject.getParent().isExecutionRoot() not properly
set
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=1070242r1=1070241r2=1070242view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Sun Feb 13 14:26:57 2011
@@ -141,7 +141,8 @@ public class DefaultProjectBuilder
modelProblems = result.getProblems();
-initProject( project, result, new HashMapFile, Boolean() );
+initProject( project, Collections.String, MavenProject
emptyMap(), result,
+ new HashMapFile, Boolean() );
}
else if ( configuration.isResolveDependencies() )
{
@@ -302,9 +303,11 @@ public class DefaultProjectBuilder
ReactorModelCache modelCache = new ReactorModelCache();
+MapString, MavenProject projectIndex = new HashMapString,
MavenProject( 256 );
+
boolean noErrors =
-build( results, interimResults, pomFiles, new
LinkedHashSetFile(), true, recursive, config, modelPool,
- modelCache );
+build( results, interimResults, projectIndex, pomFiles, new
LinkedHashSetFile(), true, recursive, config,
+ modelPool, modelCache );
populateReactorModelPool( modelPool, interimResults );
@@ -313,8 +316,8 @@ public class DefaultProjectBuilder
try
{
noErrors =
-build( results, new ArrayListMavenProject(), interimResults,
config, new HashMapFile, Boolean() )
- noErrors;
+build( results, new ArrayListMavenProject(), projectIndex,
interimResults, config,
+ new HashMapFile, Boolean() ) noErrors;
}
finally
{
@@ -330,9 +333,9 @@ public class DefaultProjectBuilder
}
private boolean build( ListProjectBuildingResult results,
ListInterimResult interimResults,
- ListFile pomFiles, SetFile aggregatorFiles,
boolean isRoot, boolean recursive,
- ProjectBuildingRequest config, ReactorModelPool
reactorModelPool,
- ReactorModelCache modelCache )
+ MapString, MavenProject projectIndex, ListFile
pomFiles, SetFile aggregatorFiles,
+ boolean isRoot, boolean recursive,
ProjectBuildingRequest config,
+ ReactorModelPool reactorModelPool,
ReactorModelCache modelCache )
{
boolean noErrors = true;
@@ -340,7 +343,7 @@ public class DefaultProjectBuilder
{
aggregatorFiles.add( pomFile );
-if ( !build( results, interimResults, pomFile, aggregatorFiles,
isRoot, recursive, config,
+if ( !build( results, interimResults, projectIndex, pomFile,
aggregatorFiles, isRoot, recursive, config,
reactorModelPool, modelCache ) )
{
noErrors = false;
@@ -352,8 +355,9 @@ public class DefaultProjectBuilder
return noErrors;
}
-private boolean build( ListProjectBuildingResult results,
ListInterimResult interimResults, File pomFile,
- SetFile aggregatorFiles, boolean isRoot, boolean
recursive, ProjectBuildingRequest config,
+private boolean build( ListProjectBuildingResult results,
ListInterimResult interimResults,
+ MapString, MavenProject projectIndex, File
pomFile, SetFile aggregatorFiles,
+ boolean isRoot, boolean recursive,
ProjectBuildingRequest config,
ReactorModelPool reactorModelPool,
ReactorModelCache modelCache )
{
boolean noErrors = true;
@@ -377,6 +381,8 @@ public class DefaultProjectBuilder
Model model = result.getEffectiveModel();
+projectIndex.put( result.getModelIds().get( 0 ), project );
+
InterimResult interimResult = new InterimResult( pomFile, request,
result, listener, isRoot );
interimResults.add( interimResult );
@@ -456,8 +462,8 @@ public class DefaultProjectBuilder
interimResult.modules = new ArrayListInterimResult();
-if ( !build( results, interimResult.modules, moduleFiles,
aggregatorFiles
svn commit: r1070247 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Author: bentmann
Date: Sun Feb 13 15:02:27 2011
New Revision: 1070247
URL: http://svn.apache.org/viewvc?rev=1070247view=rev
Log:
o Revised error handling to properly notify caller of some serious trouble
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=1070247r1=1070246r2=1070247view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Sun Feb 13 15:02:27 2011
@@ -360,10 +360,7 @@ public class MavenProject
}
catch ( ProjectBuildingException e )
{
-if ( logger != null )
-{
-logger.debug( Failed to build parent project for +
getId(), e );
-}
+throw new IllegalStateException( Failed to build parent
project for + getId(), e );
}
}
else if ( model.getParent() != null )
@@ -378,10 +375,7 @@ public class MavenProject
}
catch ( ProjectBuildingException e )
{
-if ( logger != null )
-{
-logger.debug( Failed to build parent project for +
getId(), e );
-}
+throw new IllegalStateException( Failed to build parent
project for + getId(), e );
}
}
}
@@ -1856,10 +1850,8 @@ public class MavenProject
}
catch ( InvalidRepositoryException e )
{
-if ( logger != null )
-{
-logger.debug( Failed to create release distribution
repository for + getId(), e );
-}
+throw new IllegalStateException( Failed to create release
distribution repository for + getId(),
+ e );
}
}
}
@@ -1886,10 +1878,9 @@ public class MavenProject
}
catch ( InvalidRepositoryException e )
{
-if ( logger != null )
-{
-logger.debug( Failed to create snapshot distribution
repository for + getId(), e );
-}
+throw new IllegalStateException(
+ Failed to create
snapshot distribution repository for + getId(),
+ e );
}
}
}
svn commit: r1070064 - /maven/maven-3/trunk/pom.xml
Author: bentmann Date: Sat Feb 12 12:45:05 2011 New Revision: 1070064 URL: http://svn.apache.org/viewvc?rev=1070064view=rev Log: o Updated to plexus-utils:2.0.6 Modified: maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1070064r1=1070063r2=1070064view=diff == --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Sat Feb 12 12:45:05 2011 @@ -43,7 +43,7 @@ junitVersion3.8.2/junitVersion plexusVersion1.5.5/plexusVersion plexusInterpolationVersion1.14/plexusInterpolationVersion -plexusUtilsVersion2.0.4/plexusUtilsVersion +plexusUtilsVersion2.0.6/plexusUtilsVersion sisuInjectVersion1.4.3.1/sisuInjectVersion wagonVersion1.0-beta-7/wagonVersion securityDispatcherVersion1.3/securityDispatcherVersion
svn commit: r1070069 - /maven/maven-3/trunk/pom.xml
Author: bentmann Date: Sat Feb 12 13:01:32 2011 New Revision: 1070069 URL: http://svn.apache.org/viewvc?rev=1070069view=rev Log: o Updated to modello:1.4.1 Modified: maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1070069r1=1070068r2=1070069view=diff == --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Sat Feb 12 13:01:32 2011 @@ -48,7 +48,7 @@ wagonVersion1.0-beta-7/wagonVersion securityDispatcherVersion1.3/securityDispatcherVersion cipherVersion1.4/cipherVersion -modelloVersion1.4/modelloVersion +modelloVersion1.4.1/modelloVersion jxpathVersion1.3/jxpathVersion aetherVersion1.9/aetherVersion maven.test.redirectTestOutputToFiletrue/maven.test.redirectTestOutputToFile
svn commit: r1070081 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-5009/
Author: bentmann
Date: Sat Feb 12 13:51:31 2011
New Revision: 1070081
URL: http://svn.apache.org/viewvc?rev=1070081view=rev
Log:
[MNG-5009] StackOverflowError in DefaultProjectBuilder.build when module
points at current aggregator POM
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5009/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5009/pom-2.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5009/pom.xml
(with props)
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=1070081r1=1070080r2=1070081view=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
Sat Feb 12 13:51:31 2011
@@ -83,6 +83,7 @@ public class IntegrationTestSuite
//
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng5009AggregationCycleTest.class );
// suite.addTestSuite(
MavenITmng4992MapStylePropertiesParamConfigTest.class );
suite.addTestSuite(
MavenITmng4975ProfileInjectedPluginExecutionOrderTest.class );
suite.addTestSuite(
MavenITmng4973ExtensionVisibleToPluginInReactorTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java?rev=1070081view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java
Sat Feb 12 13:51:31 2011
@@ -0,0 +1,67 @@
+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.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-5009;MNG-5009/a.
+ */
+public class MavenITmng5009AggregationCycleTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5009AggregationCycleTest()
+{
+super( [3.0.3,) );
+}
+
+/**
+ * Verify that aggregators POMs forming a cycle fail gracefully with a
proper error message.
+ */
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-5009 );
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.deleteDirectory( target );
+try
+{
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+fail( Build did not fail despite cycle in POM aggregation );
+}
+catch ( Exception e )
+{
+verifier.verifyTextInLog( cycle );
+}
+finally
+{
+verifier.resetStreams();
+}
+}
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java
