svn commit: r768721 - in /maven/components/branches/MNG-2766: ./ maven-compat/src/main/java/org/apache/maven/artifact/manager/ maven-compat/src/main/java/org/apache/maven/artifact/resolver/ maven-comp
Author: jvanzyl
Date: Sun Apr 26 16:34:19 2009
New Revision: 768721
URL: http://svn.apache.org/viewvc?rev=768721view=rev
Log:
o the component discovery is not exposed outside the plexus core
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml
maven/components/branches/MNG-2766/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/branches/MNG-2766/pom.xml
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=768721r1=768720r2=768721view=diff
==
---
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java
Sun Apr 26 16:34:19 2009
@@ -44,7 +44,6 @@
extends AbstractLogEnabled
implements UpdateCheckManager
{
-
public DefaultUpdateCheckManager()
{
@@ -75,6 +74,8 @@
// release-artifact short circuit above.
ArtifactRepositoryPolicy policy = repository.getSnapshots();
+System.out.println( snappies +
repository.getSnapshots().getUpdatePolicy() );
+
return isUpdateRequired( artifact, repository, policy );
}
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=768721r1=768720r2=768721view=diff
==
---
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Sun Apr 26 16:34:19 2009
@@ -93,7 +93,7 @@
private ArtifactRepositoryFactory repositoryFactory;
@Requirement(role = Wagon.class)
-private Map wagons;
+private MapString,Wagon wagons;
//@Requirement
private CredentialsDataSource credentialsDataSource;
@@ -324,11 +324,6 @@
public void getArtifact( Artifact artifact, ListArtifactRepository
remoteRepositories, TransferListener downloadMonitor, boolean force )
throws TransferFailedException, ResourceDoesNotExistException
{
- if(remoteRepositories == null)
- {
- throw new IllegalArgumentException(remoteRepositories: null);
- }
-
for ( ArtifactRepository repository : remoteRepositories )
{
try
@@ -351,8 +346,8 @@
{
logger.debug( Unable to get resource ' + artifact.getId() +
' from repository + repository.getId() + ( + repository.getUrl() + ), e
);
}
-}
-
+}
+
// if it already exists locally we were just trying to force it -
ignore the update
if ( !artifact.getFile().exists() )
{
@@ -370,11 +365,15 @@
throws TransferFailedException, ResourceDoesNotExistException
{
String remotePath = repository.pathOf( artifact );
-
+
ArtifactRepositoryPolicy policy
svn commit: r768722 - /maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: jvanzyl
Date: Sun Apr 26 16:39:27 2009
New Revision: 768722
URL: http://svn.apache.org/viewvc?rev=768722view=rev
Log:
o get rid of debug output
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=768722r1=768721r2=768722view=diff
==
---
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Sun Apr 26 16:39:27 2009
@@ -142,8 +142,6 @@
}
else if ( !artifact.isResolved() )
{
-System.out.println( looking! );
-
//
--
// Check for the existence of the artifact in the specified local
// ArtifactRepository. If it is present then simply return as the
@@ -152,7 +150,6 @@
String localPath = localRepository.pathOf( artifact );
-System.out.println( 3 + localPath );
artifact.setFile( new File( localRepository.getBasedir(),
localPath ) );
transformationManager.transformForResolve( artifact,
remoteRepositories, localRepository );
@@ -161,9 +158,6 @@
destination = artifact.getFile();
-System.out.println( 4 + destination );
-System.out.println( 5 + destination.exists() );
-
boolean resolved = false;
// There are three conditions in which we'll go after the artifact
here:
@@ -189,7 +183,6 @@
}
else
{
-System.out.println( trying to get artifact.);
wagonManager.getArtifact( artifact,
remoteRepositories, downloadMonitor, force );
}
svn commit: r768724 - /maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
Author: jvanzyl
Date: Sun Apr 26 16:41:46 2009
New Revision: 768724
URL: http://svn.apache.org/viewvc?rev=768724view=rev
Log:
o remove debug output
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=768724r1=768723r2=768724view=diff
==
---
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
Sun Apr 26 16:41:46 2009
@@ -217,8 +217,6 @@
{
Artifact artifact = createArtifact( artifactId, version );
-System.out.println( 1 + artifact );
-
createArtifact( artifact, remoteRepository() );
return artifact;
@@ -243,8 +241,6 @@
File artifactFile = new File( repository.getBasedir(), path );
-System.out.println( 2 + artifactFile.getParentFile() );
-
if ( !artifactFile.getParentFile().exists() )
{
artifactFile.getParentFile().mkdirs();
svn commit: r768733 - in /maven/components/branches/MNG-2766/maven-core/src/test: java/org/apache/maven/plugin/ projects/lifecycle-executor/project-with-additional-lifecycle-elements/ projects/lifecyc
Author: jvanzyl
Date: Sun Apr 26 17:57:04 2009
New Revision: 768733
URL: http://svn.apache.org/viewvc?rev=768733view=rev
Log:
o resetting plexus version, will turn them into integration tests now
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
maven/components/branches/MNG-2766/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=768733r1=768732r2=768733view=diff
==
---
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
Sun Apr 26 17:57:04 2009
@@ -13,6 +13,8 @@
@Requirement
private PluginManager pluginManager;
+private String plexusVersion = 1.0-beta-3.0.7-SNAPSHOT;
+
protected void setUp()
throws Exception
{
@@ -32,7 +34,7 @@
Plugin plugin = new Plugin();
plugin.setGroupId( org.codehaus.plexus );
plugin.setArtifactId( plexus-component-metadata );
-plugin.setVersion( 1.0-beta-3.0.6 );
+plugin.setVersion( plexusVersion );
PluginDescriptor pluginDescriptor = pluginManager.loadPlugin( plugin,
session.getCurrentProject(), session );
assertNotNull( pluginDescriptor );
assertNotNull( pluginDescriptor.getClassRealm() );
@@ -46,7 +48,7 @@
Plugin plugin = new Plugin();
plugin.setGroupId( org.codehaus.plexus );
plugin.setArtifactId( plexus-component-metadata );
-plugin.setVersion( 1.0-beta-3.0.6 );
+plugin.setVersion( plexusVersion );
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor(
plugin, goal, session );
assertNotNull( mojoDescriptor );
@@ -58,7 +60,7 @@
assertNotNull( pluginDescriptor );
assertEquals( org.codehaus.plexus, pluginDescriptor.getGroupId() );
assertEquals( plexus-component-metadata,
pluginDescriptor.getArtifactId() );
-assertEquals( 1.0-beta-3.0.6, pluginDescriptor.getVersion() );
+assertEquals( plexusVersion, pluginDescriptor.getVersion() );
assertNotNull( pluginDescriptor.getClassRealm() );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml?rev=768733r1=768732r2=768733view=diff
==
---
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml
Sun Apr 26 17:57:04 2009
@@ -20,7 +20,7 @@
plugin
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-component-metadata/artifactId
-version1.0-beta-3.0.6/version
+version1.0-beta-3.0.7-SNAPSHOT/version
executions
execution
goals
Modified:
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml?rev=768733r1=768732r2=768733view=diff
==
---
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
Sun Apr 26 17:57:04 2009
@@ -54,7 +54,7 @@
doxiaVersion1.0-alpha-9/doxiaVersion
easyMockVersion1.2_Java1.3/easyMockVersion
junitVersion3.8.1/junitVersion
-plexusVersion1.0-beta-3.0.6/plexusVersion
+plexusVersion1.0-beta-3.0.7-SNAPSHOT/plexusVersion
plexusInteractivityVersion1.0-alpha-6/plexusInteractivityVersion
plexusInterpolationVersion1.1/plexusInterpolationVersion
svn commit: r768751 - in /maven/components/branches/maven-2.1.x: maven-repository-metadata/pom.xml maven-toolchain/src/main/mdo/toolchains.xml
Author: hboutemy Date: Sun Apr 26 19:28:46 2009 New Revision: 768751 URL: http://svn.apache.org/viewvc?rev=768751view=rev Log: fixed typos Modified: maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml?rev=768751r1=768750r2=768751view=diff == --- maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml (original) +++ maven/components/branches/maven-2.1.x/maven-repository-metadata/pom.xml Sun Apr 26 19:28:46 2009 @@ -29,7 +29,7 @@ artifactIdmaven-repository-metadata/artifactId nameMaven Repository Metadata Model/name - descriptionMaven Plugin Mapping/description + descriptionPer-directory repository metadata./description dependencies dependency Modified: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml?rev=768751r1=768750r2=768751view=diff == --- maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml (original) +++ maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml Sun Apr 26 19:28:46 2009 @@ -38,7 +38,7 @@ class rootElement=true xml.tagName=toolchains xsd.compositor=sequence namePersistedToolchains/name description![CDATA[ - The codelt;projectgt;/code element is the root of the descriptor. + The codelt;toolchainsgt;/code element is the root of the descriptor. The following table lists all of the possible child elements. ]]/description version1.0.0+/version
svn commit: r768752 - in /maven/components/trunk: apache-maven/pom.xml maven-core/pom.xml maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java maven-mercury/ maven-repos
Author: jvanzyl
Date: Sun Apr 26 19:30:15 2009
New Revision: 768752
URL: http://svn.apache.org/viewvc?rev=768752view=rev
Log:
o mercury will be pursued entirely on a branch
Removed:
maven/components/trunk/maven-mercury/
maven/components/trunk/maven-repository-mercury/
Modified:
maven/components/trunk/apache-maven/pom.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/pom.xml?rev=768752r1=768751r2=768752view=diff
==
--- maven/components/trunk/apache-maven/pom.xml (original)
+++ maven/components/trunk/apache-maven/pom.xml Sun Apr 26 19:30:15 2009
@@ -74,19 +74,6 @@
groupIdorg.apache.maven.wagon/groupId
artifactIdwagon-file/artifactId
/dependency
-!--Mercury MP3--
-dependency
- groupIdorg.sonatype.mercury/groupId
- artifactIdmercury-mp3-cli/artifactId
-/dependency
-dependency
- !--
- FIXME: org.sonatype.mercury:mercury-mp3:1.0-alpha-1:pom depends on a
snapshot version of mercury-event.
- --
- groupIdorg.apache.maven.mercury/groupId
- artifactIdmercury-event/artifactId
- version${mercuryVersion}/version
-/dependency
/dependencies
build
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=768752r1=768751r2=768752view=diff
==
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Apr 26 19:30:15 2009
@@ -98,18 +98,6 @@
artifactIdplexus-plugin-manager/artifactId
/dependency
dependency
- !--
- NOTE: This is originally a transitive dependency of
plexus-plugin-manager. However, unless we specify this
- artifact as a direct dependency of ourselves, Maven's project sorter
will not detect the (indirect) dependency
- of maven-core on maven-mercury. Proper detection of this dependency is
crucial to ensure that maven-mercury is
- built before maven-core. Otherwise, Maven would query the repos instead
of the reactor cache for maven-mercury
- when building maven-core, happily using out-dated snapshots and
potentially failing the build.
- --
- groupIdorg.apache.maven/groupId
- artifactIdmaven-mercury/artifactId
- version${project.version}/version
-/dependency
-dependency
groupIdorg.sonatype.plexus/groupId
artifactIdplexus-sec-dispatcher/artifactId
/dependency
@@ -117,19 +105,6 @@
groupIdcommons-jxpath/groupId
artifactIdcommons-jxpath/artifactId
/dependency
-
-dependency
- groupIdorg.apache.maven.mercury/groupId
- artifactIdmercury-repo-remote-m2/artifactId
- version${mercuryVersion}/version
- scopetest/scope
-/dependency
-dependency
- groupIdorg.apache.maven.mercury/groupId
- artifactIdmercury-transport-http/artifactId
- version${mercuryVersion}/version
- scopetest/scope
-/dependency
/dependencies
build
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java?rev=768752r1=768751r2=768752view=diff
==
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
Sun Apr 26 19:30:15 2009
@@ -27,6 +27,7 @@
public void testBuildExtensionListener()
throws Exception
{
+/*
BuildExtensionListener listener = (BuildExtensionListener) lookup(
MavenModelEventListener.class, extensions );
Extension extension = new Extension();
@@ -58,7 +59,9 @@
// Now we should be able to find the extension.
lookup( Wagon.class, dav );
-}
+
+*/
+}
private MavenSession newMavenSession()
throws CycleDetectedException, DuplicateProjectException
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=768752r1=768751r2=768752view=diff
==
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sun Apr 26 19:30:15 2009
@@ -130,7 +130,9 @@
modulemaven-project/module
modulemaven-reporting-api/module
svn commit: r768753 - /maven/components/trunk/pom.xml
Author: jvanzyl Date: Sun Apr 26 19:31:02 2009 New Revision: 768753 URL: http://svn.apache.org/viewvc?rev=768753view=rev Log: o remove mercury modules from the parent pom Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=768753r1=768752r2=768753view=diff == --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Sun Apr 26 19:31:02 2009 @@ -130,9 +130,6 @@ modulemaven-project/module modulemaven-reporting-api/module modulemaven-model-builder/module -!-- -modulemaven-mercury/module --- modulemaven-embedder/module modulemaven-toolchain/module modulemaven-compat/module @@ -176,9 +173,6 @@ plexusWebdavVersion1.0/plexusWebdavVersion wagonVersion1.0-beta-5/wagonVersion modelBuilderVersion1.8/modelBuilderVersion -!-- -mercuryVersion1.0-alpha-7-SNAPSHOT/mercuryVersion⨠mercuryMp3Version1.0-alpha-1/mercuryMp3Version --- securityDispatcherVersion1.2/securityDispatcherVersion woodstoxVersion3.2.6/woodstoxVersion modelloVersion1.0.1/modelloVersion
svn commit: r768754 - in /maven/components/branches/maven-2.2.x: maven-repository-metadata/pom.xml maven-toolchain/src/main/mdo/toolchains.xml
Author: hboutemy Date: Sun Apr 26 19:31:06 2009 New Revision: 768754 URL: http://svn.apache.org/viewvc?rev=768754view=rev Log: fixed typos (merged from 2.1.x branch r768751) Modified: maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml?rev=768754r1=768753r2=768754view=diff == --- maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml (original) +++ maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml Sun Apr 26 19:31:06 2009 @@ -28,7 +28,7 @@ artifactIdmaven-repository-metadata/artifactId nameMaven Repository Metadata Model/name - descriptionMaven Plugin Mapping/description + descriptionPer-directory repository metadata./description dependencies dependency Modified: maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.xml?rev=768754r1=768753r2=768754view=diff == --- maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.xml (original) +++ maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.xml Sun Apr 26 19:31:06 2009 @@ -38,7 +38,7 @@ class rootElement=true xml.tagName=toolchains xsd.compositor=sequence namePersistedToolchains/name description![CDATA[ - The codelt;projectgt;/code element is the root of the descriptor. + The codelt;toolchainsgt;/code element is the root of the descriptor. The following table lists all of the possible child elements. ]]/description version1.0.0+/version
svn commit: r768755 - /maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml
Author: hboutemy Date: Sun Apr 26 19:31:44 2009 New Revision: 768755 URL: http://svn.apache.org/viewvc?rev=768755view=rev Log: fixed typos (merged from 2.1.x branch r768751) Modified: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml?rev=768755r1=768754r2=768755view=diff == --- maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml (original) +++ maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml Sun Apr 26 19:31:44 2009 @@ -38,7 +38,7 @@ class rootElement=true xml.tagName=toolchains xsd.compositor=sequence namePersistedToolchains/name description![CDATA[ - The codelt;projectgt;/code element is the root of the descriptor. + The codelt;toolchainsgt;/code element is the root of the descriptor. The following table lists all of the possible child elements. ]]/description version1.0.0+/version
svn commit: r768756 - /maven/mercury/trunk/mercury-core/
Author: hboutemy Date: Sun Apr 26 19:44:31 2009 New Revision: 768756 URL: http://svn.apache.org/viewvc?rev=768756view=rev Log: updated svn:ignore Modified: maven/mercury/trunk/mercury-core/ (props changed) Propchange: maven/mercury/trunk/mercury-core/ -- --- svn:ignore (added) +++ svn:ignore Sun Apr 26 19:44:31 2009 @@ -0,0 +1,8 @@ +.settings +target +.classpath +.project +bin +*.iml +*.ipr +*.iws
svn commit: r768762 - in /maven/components/branches/maven-2.1.x/maven-toolchain: pom.xml src/main/mdo/toolchains.mdo src/main/mdo/toolchains.xml
Author: hboutemy Date: Sun Apr 26 20:00:39 2009 New Revision: 768762 URL: http://svn.apache.org/viewvc?rev=768762view=rev Log: renamed toolchains Modello descriptor to toolchains.mdo Added: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo (props changed) - copied unchanged from r768751, maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml Removed: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml Modified: maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml?rev=768762r1=768761r2=768762view=diff == --- maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml (original) +++ maven/components/branches/maven-2.1.x/maven-toolchain/pom.xml Sun Apr 26 20:00:39 2009 @@ -65,7 +65,7 @@ version1.0.0/version packageWithVersionfalse/packageWithVersion models -modelsrc/main/mdo/toolchains.xml/model +modelsrc/main/mdo/toolchains.mdo/model /models /configuration /plugin Propchange: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo -- svn:eol-style = native Propchange: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo -- svn:keywords = Author Date Id Revision Propchange: maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo -- svn:mergeinfo =
svn commit: r768763 - in /maven/components/branches/maven-2.2.x/maven-toolchain: pom.xml src/main/mdo/toolchains.mdo src/main/mdo/toolchains.xml
Author: hboutemy Date: Sun Apr 26 20:01:42 2009 New Revision: 768763 URL: http://svn.apache.org/viewvc?rev=768763view=rev Log: renamed toolchains Modello descriptor to toolchains.mdo (merged from 2.1.x branch r768762) Added: maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo - copied unchanged from r768762, maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo Removed: maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml Modified: maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml?rev=768763r1=768762r2=768763view=diff == --- maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml (original) +++ maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml Sun Apr 26 20:01:42 2009 @@ -64,7 +64,7 @@ version1.0.0/version packageWithVersionfalse/packageWithVersion models -modelsrc/main/mdo/toolchains.xml/model +modelsrc/main/mdo/toolchains.mdo/model /models /configuration /plugin
svn commit: r768764 - in /maven/components/trunk/maven-toolchain: pom.xml src/main/mdo/toolchains.mdo src/main/mdo/toolchains.xml
Author: hboutemy Date: Sun Apr 26 20:03:30 2009 New Revision: 768764 URL: http://svn.apache.org/viewvc?rev=768764view=rev Log: renamed toolchains Modello descriptor to toolchains.mdo (merged from 2.1.x branch r768762) Added: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo - copied unchanged from r768762, maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo Removed: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/trunk/maven-toolchain/pom.xml Modified: maven/components/trunk/maven-toolchain/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=768764r1=768763r2=768764view=diff == --- maven/components/trunk/maven-toolchain/pom.xml (original) +++ maven/components/trunk/maven-toolchain/pom.xml Sun Apr 26 20:03:30 2009 @@ -69,7 +69,7 @@ version1.0.0/version packageWithVersionfalse/packageWithVersion models -modelsrc/main/mdo/toolchains.xml/model +modelsrc/main/mdo/toolchains.mdo/model /models /configuration /plugin
svn commit: r768770 - in /maven/components/trunk/apache-maven/src: .cd/ main/assembly/bin.xml
Author: jvanzyl Date: Sun Apr 26 20:32:43 2009 New Revision: 768770 URL: http://svn.apache.org/viewvc?rev=768770view=rev Log: o git rid of .cd directory, auto provisioning is a feature not discussed Removed: maven/components/trunk/apache-maven/src/.cd/ Modified: maven/components/trunk/apache-maven/src/main/assembly/bin.xml Modified: maven/components/trunk/apache-maven/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/main/assembly/bin.xml?rev=768770r1=768769r2=768770view=diff == --- maven/components/trunk/apache-maven/src/main/assembly/bin.xml (original) +++ maven/components/trunk/apache-maven/src/main/assembly/bin.xml Sun Apr 26 20:32:43 2009 @@ -60,12 +60,6 @@ excludeorg.apache.maven.mercury:mercury-crypto-basic/exclude /excludes /dependencySet -dependencySet - outputDirectorybin/.cd/bin/outputDirectory - includes -includeorg.sonatype.mercury:mercury-mp3-cli/include - /includes -/dependencySet /dependencySets fileSets fileSet
svn commit: r768778 - in /maven/components/branches/maven-2.1.x: maven-repository-metadata/src/main/mdo/ maven-repository-metadata/src/site/apt/ maven-toolchain/src/main/mdo/ maven-toolchain/src/site/
Author: hboutemy
Date: Sun Apr 26 20:49:59 2009
New Revision: 768778
URL: http://svn.apache.org/viewvc?rev=768778view=rev
Log:
added links to model documentation
Added:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
(with props)
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt
(with props)
Modified:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
Modified:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=768778r1=768777r2=768778view=diff
==
---
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Sun Apr 26 20:49:59 2009
@@ -22,7 +22,7 @@
xsd.namespace=http://maven.apache.org/METADATA/${version};
xml.schemaLocation=http://maven.apache.org/xsd/metadata-${version}.xsd;
idrepository-metadata/id
- nameMetadata/name
+ nameRepository Metadata/name
descriptionPer-directory repository metadata./description
defaults
default
Added:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt?rev=768778view=auto
==
---
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
(added)
+++
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
Sun Apr 26 20:49:59 2009
@@ -0,0 +1,17 @@
+ -
+ Maven Repository Metadata Model
+ -
+ Hervé Boutemy
+ -
+ 2009-04-26
+ -
+
+Maven Repository Metadata Model
+
+ This is strictly the model for Maven Repository Metadata, so really just
plain objects.
+
+ The following are generated from this model:
+
+ * {{{apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3
XML parser, to read and write maven-metadata(-*).xml files
+
+ * A {{{repository-metadata.html}Descriptor Reference}}
Propchange:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
--
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
--
svn:keywords = Author Date Id Revision
Modified:
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo?rev=768778r1=768777r2=768778view=diff
==
---
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
(original)
+++
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
Sun Apr 26 20:49:59 2009
@@ -23,8 +23,8 @@
xsi:schemaLocation=http://modello.codehaus.org/MODELLO/1.0.0
http://modello.codehaus.org/xsd/modello-1.0.0.xsd;
xml.namespace=http://maven.apache.org/TOOLCHAINS/${version};
xml.schemaLocation=http://maven.apache.org/xsd/toolchains-${version}.xsd;
-idmaven-toolchains/id
-nameMavenToolchains/name
+idtoolchains/id
+nameMaven Toolchains/name
description![CDATA[
]]/description
Added:
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt?rev=768778view=auto
==
---
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt
(added)
+++
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt
Sun Apr 26 20:49:59 2009
@@ -0,0 +1,17 @@
+ -
+ Maven Toolchains
+ -
+ Hervé Boutemy
+ -
+ 2009-04-26
+ -
+
+Maven Toolchains
+
+ This is strictly the model for Maven Toolchains, so really just plain objects.
+
+ The following are generated from this model:
+
+ * {{{apidocs/index.html}Java sources}} with Reader for the Xpp3 XML parser,
to read toolchains.xml file
+
+ * A {{{toolchains.html}Descriptor Reference}}
Propchange:
svn commit: r768779 - in /maven/components/branches/maven-2.2.x: maven-repository-metadata/src/main/mdo/ maven-repository-metadata/src/site/apt/ maven-toolchain/src/main/mdo/ maven-toolchain/src/site/
Author: hboutemy
Date: Sun Apr 26 20:51:58 2009
New Revision: 768779
URL: http://svn.apache.org/viewvc?rev=768779view=rev
Log:
added links to model documentation (merged from 2.1.x branch r768778)
Added:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/site/apt/
- copied from r768778,
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/site/apt/index.apt
- copied unchanged from r768778,
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/site/apt/index.apt
maven/components/branches/maven-2.2.x/maven-toolchain/src/site/apt/
- copied from r768778,
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/
maven/components/branches/maven-2.2.x/maven-toolchain/src/site/apt/index.apt
- copied unchanged from r768778,
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt
Modified:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
(contents, props changed)
Modified:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=768779r1=768778r2=768779view=diff
==
---
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Sun Apr 26 20:51:58 2009
@@ -22,7 +22,7 @@
xsd.namespace=http://maven.apache.org/METADATA/${version};
xml.schemaLocation=http://maven.apache.org/xsd/metadata-${version}.xsd;
idrepository-metadata/id
- nameMetadata/name
+ nameRepository Metadata/name
descriptionPer-directory repository metadata./description
defaults
default
Modified:
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo?rev=768779r1=768778r2=768779view=diff
==
---
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
(original)
+++
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
Sun Apr 26 20:51:58 2009
@@ -23,8 +23,8 @@
xsi:schemaLocation=http://modello.codehaus.org/MODELLO/1.0.0
http://modello.codehaus.org/xsd/modello-1.0.0.xsd;
xml.namespace=http://maven.apache.org/TOOLCHAINS/${version};
xml.schemaLocation=http://maven.apache.org/xsd/toolchains-${version}.xsd;
-idmaven-toolchains/id
-nameMavenToolchains/name
+idtoolchains/id
+nameMaven Toolchains/name
description![CDATA[
]]/description
Propchange:
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 20:51:58 2009
@@ -0,0 +1 @@
+/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778
svn commit: r768784 - in /maven/components/trunk/maven-toolchain/src: main/mdo/toolchains.mdo site/apt/ site/apt/index.apt
Author: hboutemy
Date: Sun Apr 26 20:56:38 2009
New Revision: 768784
URL: http://svn.apache.org/viewvc?rev=768784view=rev
Log:
added links to model documentation (merged from 2.1.x branch r768778)
Added:
maven/components/trunk/maven-toolchain/src/site/apt/
- copied from r768778,
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/
maven/components/trunk/maven-toolchain/src/site/apt/index.apt
- copied unchanged from r768778,
maven/components/branches/maven-2.1.x/maven-toolchain/src/site/apt/index.apt
Modified:
maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
(contents, props changed)
Modified: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo?rev=768784r1=768783r2=768784view=diff
==
--- maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
(original)
+++ maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo Sun Apr
26 20:56:38 2009
@@ -23,8 +23,8 @@
xsi:schemaLocation=http://modello.codehaus.org/MODELLO/1.0.0
http://modello.codehaus.org/xsd/modello-1.0.0.xsd;
xml.namespace=http://maven.apache.org/TOOLCHAINS/${version};
xml.schemaLocation=http://maven.apache.org/xsd/toolchains-${version}.xsd;
-idmaven-toolchains/id
-nameMavenToolchains/name
+idtoolchains/id
+nameMaven Toolchains/name
description![CDATA[
]]/description
Propchange: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 20:56:38 2009
@@ -0,0 +1 @@
+/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778
svn commit: r768796 - in /maven/components/branches/maven-2.1.x: maven-repository-metadata/src/main/mdo/metadata.mdo maven-toolchain/src/main/mdo/toolchains.mdo
Author: hboutemy
Date: Sun Apr 26 21:17:48 2009
New Revision: 768796
URL: http://svn.apache.org/viewvc?rev=768796view=rev
Log:
fixed a typo
Modified:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
Modified:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=768796r1=768795r2=768796view=diff
==
---
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Sun Apr 26 21:17:48 2009
@@ -22,7 +22,7 @@
xsd.namespace=http://maven.apache.org/METADATA/${version};
xml.schemaLocation=http://maven.apache.org/xsd/metadata-${version}.xsd;
idrepository-metadata/id
- nameRepository Metadata/name
+ nameRepositoryMetadata/name
descriptionPer-directory repository metadata./description
defaults
default
Modified:
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo?rev=768796r1=768795r2=768796view=diff
==
---
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
(original)
+++
maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo
Sun Apr 26 21:17:48 2009
@@ -24,7 +24,7 @@
xml.namespace=http://maven.apache.org/TOOLCHAINS/${version};
xml.schemaLocation=http://maven.apache.org/xsd/toolchains-${version}.xsd;
idtoolchains/id
-nameMaven Toolchains/name
+nameMavenToolchains/name
description![CDATA[
]]/description
svn commit: r768797 - in /maven/components/branches/maven-2.2.x: maven-repository-metadata/src/main/mdo/metadata.mdo maven-toolchain/src/main/mdo/toolchains.mdo
Author: hboutemy
Date: Sun Apr 26 21:19:07 2009
New Revision: 768797
URL: http://svn.apache.org/viewvc?rev=768797view=rev
Log:
fixed a typo (merged from 2.1.x branch r768796)
Modified:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
(contents, props changed)
Modified:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=768797r1=768796r2=768797view=diff
==
---
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Sun Apr 26 21:19:07 2009
@@ -22,7 +22,7 @@
xsd.namespace=http://maven.apache.org/METADATA/${version};
xml.schemaLocation=http://maven.apache.org/xsd/metadata-${version}.xsd;
idrepository-metadata/id
- nameRepository Metadata/name
+ nameRepositoryMetadata/name
descriptionPer-directory repository metadata./description
defaults
default
Modified:
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo?rev=768797r1=768796r2=768797view=diff
==
---
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
(original)
+++
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
Sun Apr 26 21:19:07 2009
@@ -24,7 +24,7 @@
xml.namespace=http://maven.apache.org/TOOLCHAINS/${version};
xml.schemaLocation=http://maven.apache.org/xsd/toolchains-${version}.xsd;
idtoolchains/id
-nameMaven Toolchains/name
+nameMavenToolchains/name
description![CDATA[
]]/description
Propchange:
maven/components/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 21:19:07 2009
@@ -1 +1 @@
-/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778
+/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796
svn commit: r768798 - /maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
Author: hboutemy
Date: Sun Apr 26 21:20:36 2009
New Revision: 768798
URL: http://svn.apache.org/viewvc?rev=768798view=rev
Log:
fixed a typo (merged from 2.1.x branch r768796)
Modified:
maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
(contents, props changed)
Modified: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo?rev=768798r1=768797r2=768798view=diff
==
--- maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
(original)
+++ maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo Sun Apr
26 21:20:36 2009
@@ -24,7 +24,7 @@
xml.namespace=http://maven.apache.org/TOOLCHAINS/${version};
xml.schemaLocation=http://maven.apache.org/xsd/toolchains-${version}.xsd;
idtoolchains/id
-nameMaven Toolchains/name
+nameMavenToolchains/name
description![CDATA[
]]/description
Propchange: maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 21:20:36 2009
@@ -1 +1 @@
-/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778
+/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796
svn commit: r768800 - /maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Author: hboutemy
Date: Sun Apr 26 21:22:37 2009
New Revision: 768800
URL: http://svn.apache.org/viewvc?rev=768800view=rev
Log:
fixed one more typo :(
Modified:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Modified:
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=768800r1=768799r2=768800view=diff
==
---
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++
maven/components/branches/maven-2.1.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Sun Apr 26 21:22:37 2009
@@ -22,7 +22,7 @@
xsd.namespace=http://maven.apache.org/METADATA/${version};
xml.schemaLocation=http://maven.apache.org/xsd/metadata-${version}.xsd;
idrepository-metadata/id
- nameRepositoryMetadata/name
+ nameMetadata/name
descriptionPer-directory repository metadata./description
defaults
default
svn commit: r768801 - /maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Author: hboutemy
Date: Sun Apr 26 21:23:43 2009
New Revision: 768801
URL: http://svn.apache.org/viewvc?rev=768801view=rev
Log:
fixed one more typo :( (merged from 2.1.x branch r768800)
Modified:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Modified:
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=768801r1=768800r2=768801view=diff
==
---
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
(original)
+++
maven/components/branches/maven-2.2.x/maven-repository-metadata/src/main/mdo/metadata.mdo
Sun Apr 26 21:23:43 2009
@@ -22,7 +22,7 @@
xsd.namespace=http://maven.apache.org/METADATA/${version};
xml.schemaLocation=http://maven.apache.org/xsd/metadata-${version}.xsd;
idrepository-metadata/id
- nameRepositoryMetadata/name
+ nameMetadata/name
descriptionPer-directory repository metadata./description
defaults
default
svn commit: r768812 - in /maven/sandbox/trunk/plugins/maven-jarsigner-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/jav
Author: bentmann Date: Sun Apr 26 22:16:23 2009 New Revision: 768812 URL: http://svn.apache.org/viewvc?rev=768812view=rev Log: [MSANDBOX-46] Import maven-jarsigner-plugin Submitted by: Christian Schulte (via MJAVADOC-228) Added: maven/sandbox/trunk/plugins/maven-jarsigner-plugin/ (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/pom.xml (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/maven/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/maven/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/maven/plugins/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/maven/plugins/jarsigner/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.properties (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo_de.properties (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/main/resources/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo_en.properties (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/apt/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/apt/examples/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/apt/examples/sign-and-verify-project.apt (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/apt/index.apt (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/apt/usage.apt (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/fml/ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/fml/faq.fml (with props) maven/sandbox/trunk/plugins/maven-jarsigner-plugin/src/site/site.xml (with props) Propchange: maven/sandbox/trunk/plugins/maven-jarsigner-plugin/ -- --- svn:ignore (added) +++ svn:ignore Sun Apr 26 22:16:23 2009 @@ -0,0 +1,8 @@ +target +.classpath +.settings +.project +bin +*.iml +*.ipr +*.iws Added: maven/sandbox/trunk/plugins/maven-jarsigner-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-jarsigner-plugin/pom.xml?rev=768812view=auto == --- maven/sandbox/trunk/plugins/maven-jarsigner-plugin/pom.xml (added) +++ maven/sandbox/trunk/plugins/maven-jarsigner-plugin/pom.xml Sun Apr 26 22:16:23 2009 @@ -0,0 +1,92 @@ +?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 xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
svn commit: r768813 - in /maven/components/trunk: bs build-mercury.xml maven-core/pom.xml maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java mercury-ant-tasks-1.0-alpha-6-
Author: jvanzyl
Date: Sun Apr 26 22:18:28 2009
New Revision: 768813
URL: http://svn.apache.org/viewvc?rev=768813view=rev
Log:
o remove the plugin manager that required mercury and i'll use the repository
system inside maven for new, keep more of the features that creeped in out
o try and remove all traces of mercury and keep them in a branch
Removed:
maven/components/trunk/bs
maven/components/trunk/build-mercury.xml
maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=768813r1=768812r2=768813view=diff
==
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Apr 26 22:18:28 2009
@@ -18,11 +18,8 @@
artifactIdmaven/artifactId
version3.0-SNAPSHOT/version
/parent
-
artifactIdmaven-core/artifactId
-
nameMaven Core/name
-
dependencies
dependency
groupIdorg.apache.maven/groupId
@@ -95,10 +92,6 @@
/dependency
dependency
groupIdorg.sonatype.plexus/groupId
- artifactIdplexus-plugin-manager/artifactId
-/dependency
-dependency
- groupIdorg.sonatype.plexus/groupId
artifactIdplexus-sec-dispatcher/artifactId
/dependency
dependency
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=768813r1=768812r2=768813view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
Sun Apr 26 22:18:28 2009
@@ -9,15 +9,8 @@
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.ProjectUri;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.component.repository.ComponentDescriptor;
-import org.sonatype.plexus.plugin.manager.PlexusPluginManager;
-import org.sonatype.plexus.plugin.manager.PluginMetadata;
-import org.sonatype.plexus.plugin.manager.PluginResolutionRequest;
-import org.sonatype.plexus.plugin.manager.PluginResolutionResult;
/**
* This listener has two parts: the collection of the extension elements which
happens during POM construction,
@@ -36,8 +29,8 @@
@Configuration(value = true)
private boolean inBuild = true;
-@Requirement
-PlexusPluginManager pluginManager;
+//@Requirement
+//PlexusPluginManager pluginManager;
private ListExtension buildExtensions = new ArrayListExtension();
@@ -69,6 +62,7 @@
for ( Extension be : buildExtensions )
{
+ /*
PluginResolutionRequest request = new PluginResolutionRequest()
.setPluginMetadata( new PluginMetadata( be.getGroupId(),
be.getArtifactId(), be.getVersion() ) )
.addLocalRepository(
session.getRequest().getLocalRepositoryPath() )
@@ -90,6 +84,7 @@
{
e.printStackTrace();
}
+*/
}
}
svn commit: r768817 - /maven/components/branches/maven-2.1.x/build.xml
Author: bentmann Date: Sun Apr 26 22:28:48 2009 New Revision: 768817 URL: http://svn.apache.org/viewvc?rev=768817view=rev Log: o Updated bootstrap due to r768762 Modified: maven/components/branches/maven-2.1.x/build.xml Modified: maven/components/branches/maven-2.1.x/build.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/build.xml?rev=768817r1=768816r2=768817view=diff == --- maven/components/branches/maven-2.1.x/build.xml (original) +++ maven/components/branches/maven-2.1.x/build.xml Sun Apr 26 22:28:48 2009 @@ -151,7 +151,7 @@ modello file=maven-profile/src/main/mdo/profiles.mdo/ modello file=maven-settings/src/main/mdo/settings.mdo/ modello file=maven-repository-metadata/src/main/mdo/metadata.mdo/ -modello file=maven-toolchain/src/main/mdo/toolchains.xml/ +modello file=maven-toolchain/src/main/mdo/toolchains.mdo/ /target
svn commit: r768818 - /maven/components/branches/maven-2.2.x/build.xml
Author: bentmann Date: Sun Apr 26 22:33:25 2009 New Revision: 768818 URL: http://svn.apache.org/viewvc?rev=768818view=rev Log: o Updated bootstrap due to r768763 Modified: maven/components/branches/maven-2.2.x/build.xml Modified: maven/components/branches/maven-2.2.x/build.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/build.xml?rev=768818r1=768817r2=768818view=diff == --- maven/components/branches/maven-2.2.x/build.xml (original) +++ maven/components/branches/maven-2.2.x/build.xml Sun Apr 26 22:33:25 2009 @@ -151,7 +151,7 @@ modello file=maven-profile/src/main/mdo/profiles.mdo/ modello file=maven-settings/src/main/mdo/settings.mdo/ modello file=maven-repository-metadata/src/main/mdo/metadata.mdo/ -modello file=maven-toolchain/src/main/mdo/toolchains.xml/ +modello file=maven-toolchain/src/main/mdo/toolchains.mdo/ /target
svn commit: r768820 - in /maven/components/trunk: maven-core/ maven-core/src/main/java/org/apache/maven/plugin/ maven-embedder/src/main/java/org/apache/maven/embedder/
Author: jvanzyl
Date: Sun Apr 26 22:41:53 2009
New Revision: 768820
URL: http://svn.apache.org/viewvc?rev=768820view=rev
Log:
o jxpath is not needed except for testing in my branch which i will merge
shortly
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=768820r1=768819r2=768820view=diff
==
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Apr 26 22:41:53 2009
@@ -97,6 +97,7 @@
dependency
groupIdcommons-jxpath/groupId
artifactIdcommons-jxpath/artifactId
+ scopetest/scope
/dependency
/dependencies
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=768820r1=768819r2=768820view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Apr 26 22:41:53 2009
@@ -29,7 +29,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.jxpath.JXPathContext;
import org.apache.maven.ArtifactFilterManager;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@@ -1679,6 +1678,7 @@
return mojoExecutions;
}
+/*
public Object getMojoParameterFor( MojoExecution mojoExecution, String
xPath )
throws Exception
{
@@ -1688,6 +1688,7 @@
return JXPathContext.newContext( mergedConfig ).getValue( xPath );
}
+*/
public void executeMojo( MojoExecution mojoExecution, MavenSession session
)
throws Exception
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=768820r1=768819r2=768820view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Sun Apr 26 22:41:53 2009
@@ -17,6 +17,7 @@
import java.util.Collection;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenSession;
@@ -56,9 +57,11 @@
CollectionMojoExecution getMojoExecutionsForGoal( String goal )
throws Exception;
+/*
Object getMojoParameterFor( MojoExecution mojoExecution, String xPath )
throws Exception;
-
+*/
+
void executeMojo( MojoExecution mojoExecution, MavenSession session )
throws Exception;
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=768820r1=768819r2=768820view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Sun Apr 26 22:41:53 2009
@@ -170,11 +170,13 @@
return pluginManager.getMojoExecutionsForGoal( goal );
}
+/*
public Object getMojoParameterFor(MojoExecution mojoExecution, String
xPath)
throws Exception
{
return pluginManager.getMojoParameterFor( mojoExecution, xPath);
}
+*/
public void executeMojo(MojoExecution mojoExecution, MavenSession
mavenSession )
throws Exception
svn commit: r768821 - /maven/components/branches/maven-2.2.x/
Author: bentmann Date: Sun Apr 26 22:45:34 2009 New Revision: 768821 URL: http://svn.apache.org/viewvc?rev=768821view=rev Log: o Added merge info Modified: maven/components/branches/maven-2.2.x/ (props changed) Propchange: maven/components/branches/maven-2.2.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Apr 26 22:45:34 2009 @@ -2,6 +2,6 @@ /maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304 /maven/components/branches/maven-2.1.0-RC:63,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215 -/maven/components/branches/maven-2.1.x:751686,767628,767631 +/maven/components/branches/maven-2.1.x:751686,767628,767631,768817 /maven/components/trunk:572229,720001,721902,726845,729292 /maven/sandbox/branches/maven/MNG-3379:678167
svn commit: r768823 - in /maven/components/trunk: ./ build.xml
Author: bentmann Date: Sun Apr 26 22:47:12 2009 New Revision: 768823 URL: http://svn.apache.org/viewvc?rev=768823view=rev Log: o Updated bootstrap due to r768764 Modified: maven/components/trunk/ (props changed) maven/components/trunk/build.xml Propchange: maven/components/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Apr 26 22:47:12 2009 @@ -1,6 +1,6 @@ /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 +/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 Modified: maven/components/trunk/build.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=768823r1=768822r2=768823view=diff == --- maven/components/trunk/build.xml (original) +++ maven/components/trunk/build.xml Sun Apr 26 22:47:12 2009 @@ -168,7 +168,7 @@ modello file=maven-plugin-api/src/main/mdo/lifecycle.mdo/ modello file=maven-model-builder/src/main/mdo/profiles.mdo/ modello file=maven-core/src/main/mdo/settings.mdo/ -modello file=maven-toolchain/src/main/mdo/toolchains.xml/ +modello file=maven-toolchain/src/main/mdo/toolchains.mdo/ modello file=maven-compat/src/main/mdo/metadata.mdo/ /target
svn commit: r768832 - in /maven/components/branches/MNG-2766: ./ maven-compat/src/main/java/org/apache/maven/artifact/manager/ maven-core/src/test/java/org/apache/maven/lifecycle/ maven-core/src/test/
Author: jvanzyl Date: Sun Apr 26 23:51:09 2009 New Revision: 768832 URL: http://svn.apache.org/viewvc?rev=768832view=rev Log: o more meshing of trunk and my branch, two tests that are out of sync Removed: maven/components/branches/MNG-2766/bs maven/components/branches/MNG-2766/build-mercury.xml maven/components/branches/MNG-2766/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java maven/components/branches/MNG-2766/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml maven/components/branches/MNG-2766/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java?rev=768832r1=768831r2=768832view=diff == --- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java (original) +++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManager.java Sun Apr 26 23:51:09 2009 @@ -73,8 +73,6 @@ // we can safely assume that we're calculating based on the snapshot policy here if we've made it past the // release-artifact short circuit above. ArtifactRepositoryPolicy policy = repository.getSnapshots(); - -System.out.println( snappies + repository.getSnapshots().getUpdatePolicy() ); return isUpdateRequired( artifact, repository, policy ); } Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=768832r1=768831r2=768832view=diff == --- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (original) +++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java Sun Apr 26 23:51:09 2009 @@ -48,7 +48,7 @@ File pom = getProject( project-with-additional-lifecycle-elements ); MavenSession session = createMavenSession( pom ); assertEquals( project-with-additional-lifecycle-elements, session.getCurrentProject().getArtifactId() ); -assertEquals( 1.0-SNAPSHOT, session.getCurrentProject().getVersion() ); +assertEquals( 1.0, session.getCurrentProject().getVersion() ); ListMojoDescriptor lifecyclePlan = lifecycleExecutor.calculateLifecyclePlan( package, session ); // resources:resources @@ -76,7 +76,7 @@ File pom = getProject( project-with-additional-lifecycle-elements ); MavenSession session = createMavenSession( pom ); assertEquals( project-with-additional-lifecycle-elements, session.getCurrentProject().getArtifactId() ); -assertEquals( 1.0-SNAPSHOT, session.getCurrentProject().getVersion() ); +assertEquals( 1.0, session.getCurrentProject().getVersion() ); lifecycleExecutor.execute( session ); } } Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=768832r1=768831r2=768832view=diff == --- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java (original) +++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java Sun Apr 26 23:51:09 2009 @@ -84,7 +84,7 @@ Plugin plugin = new Plugin(); plugin.setGroupId( org.apache.maven.plugins ); plugin.setArtifactId( maven-remote-resources-plugin ); -plugin.setVersion( 1.1 ); +plugin.setVersion( 1.0-beta-2 ); MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
svn commit: r768839 - in /maven/components: branches/MNG-2766/ branches/MNG-2766/apache-maven/ branches/MNG-2766/apache-maven/src/.cd/ branches/MNG-2766/apache-maven/src/main/assembly/ branches/MNG-27
Author: jvanzyl Date: Mon Apr 27 00:16:42 2009 New Revision: 768839 URL: http://svn.apache.org/viewvc?rev=768839view=rev Log: (empty) Added: maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/ - copied from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/ maven/components/branches/MNG-2766/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml - copied unchanged from r768832, maven/components/trunk/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml maven/components/branches/MNG-2766/maven-toolchain/src/main/mdo/toolchains.mdo - copied unchanged from r768832, maven/components/trunk/maven-toolchain/src/main/mdo/toolchains.mdo maven/components/branches/MNG-2766/maven-toolchain/src/site/apt/ - copied from r768832, maven/components/trunk/maven-toolchain/src/site/apt/ maven/components/branches/MNG-2766/maven-toolchain/src/site/apt/index.apt - copied unchanged from r768832, maven/components/trunk/maven-toolchain/src/site/apt/index.apt Removed: maven/components/branches/MNG-2766/apache-maven/src/.cd/ maven/components/branches/MNG-2766/maven-mercury/ maven/components/branches/MNG-2766/maven-repository-mercury/ maven/components/branches/MNG-2766/maven-toolchain/src/main/mdo/toolchains.xml Modified: maven/components/branches/MNG-2766/ (props changed) maven/components/branches/MNG-2766/apache-maven/ (props changed) maven/components/branches/MNG-2766/apache-maven/pom.xml maven/components/branches/MNG-2766/apache-maven/src/main/assembly/bin.xml maven/components/branches/MNG-2766/build.xml maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/ (props changed) maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java (props changed) maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/inheritance/ (props changed) maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/project/path/ (props changed) maven/components/branches/MNG-2766/maven-compat/src/main/mdo/ (props changed) maven/components/branches/MNG-2766/maven-compat/src/test/ (props changed) maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/project/path/ (props changed) maven/components/branches/MNG-2766/maven-core/pom.xml maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java (props changed) maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java (props changed) maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/ (props changed) maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (contents, props changed) maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (props
svn commit: r768842 - in /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven: model/ model/interpolator/ model/processors/ profiles/ profiles/matchers/
Author: jvanzyl Date: Mon Apr 27 00:43:53 2009 New Revision: 768842 URL: http://svn.apache.org/viewvc?rev=768842view=rev Log: o trying to merge manually Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/DomainModel.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/PomClassicDomainModel.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (contents, props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ModelProperty.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BuildProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/CiManagementProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ContributorsProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependenciesProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyManagementProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DependencyProcessor.java (contents, props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DevelopersProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/DistributionManagementProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/IssueManagementProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/LicensesProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/MailingListProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModelProcessor.java (contents, props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ModuleProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/OrganizationProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ParentProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsManagementProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginsProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PrerequisitesProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilePropertiesProcessor.java (props changed) maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/ProfilesModuleProcessor.java (props changed)
