svn commit: r944868 - in /maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus: artifact-handlers.xml components.xml
Author: bentmann Date: Sun May 16 15:47:09 2010 New Revision: 944868 URL: http://svn.apache.org/viewvc?rev=944868view=rev Log: o Formatted code Modified: maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml maven/maven-3/trunk/maven-core/src/main/resources/META-INF/plexus/components.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=944868r1=944867r2=944868view=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 Sun May 16 15:47:09 2010 @@ -1,3 +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. +-- + !-- Artifact handlers are required by the dependency resolution mechanism and therefore needed by the core. @@ -18,8 +39,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role-hintpom/role-hint - implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler - /implementation + implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler/implementation configuration typepom/type /configuration @@ -53,8 +73,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role-hintjar/role-hint - implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler - /implementation + implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler/implementation configuration typejar/type languagejava/language @@ -108,8 +127,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role-hintejb/role-hint - implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler - /implementation + implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler/implementation configuration typeejb/type extensionjar/extension @@ -118,11 +136,9 @@ problem. /configuration /component component - roleorg.apache.maven.lifecycle.mapping.LifecycleMapping - /role + roleorg.apache.maven.lifecycle.mapping.LifecycleMapping/role role-hintejb/role-hint - implementationorg.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - /implementation + implementationorg.apache.maven.lifecycle.mapping.DefaultLifecycleMapping/implementation configuration lifecycles lifecycle @@ -162,8 +178,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role-hintejb-client/role-hint - implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler - /implementation + implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler/implementation configuration typeejb-client/type extensionjar/extension @@ -176,8 +191,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role-hintejb3/role-hint - implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler - /implementation + implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler/implementation configuration typeejb3/type includesDependenciestrue/includesDependencies @@ -232,8 +246,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role-hinttest-jar/role-hint - implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler - /implementation + implementationorg.apache.maven.artifact.handler.DefaultArtifactHandler/implementation configuration classifiertests/classifier extensionjar/extension @@ -250,8 +263,7 @@ problem. component roleorg.apache.maven.artifact.handler.ArtifactHandler/role role
svn commit: r944890 - in /maven/plugins/trunk: maven-plugins/ maven-plugins/pom.xml maven-plugins/src/ pom.xml src/
Author: bentmann Date: Sun May 16 18:01:45 2010 New Revision: 944890 URL: http://svn.apache.org/viewvc?rev=944890view=rev Log: o Moved maven-plugins into sibling directory to ease its release (cf. http://www.mail-archive.com/d...@maven.apache.org/msg84531.html) Added: maven/plugins/trunk/maven-plugins/ (with props) maven/plugins/trunk/maven-plugins/pom.xml - copied, changed from r944873, maven/plugins/trunk/pom.xml maven/plugins/trunk/maven-plugins/src/ - copied from r944873, maven/plugins/trunk/src/ Removed: maven/plugins/trunk/pom.xml maven/plugins/trunk/src/ Propchange: maven/plugins/trunk/maven-plugins/ -- --- svn:ignore (added) +++ svn:ignore Sun May 16 18:01:45 2010 @@ -0,0 +1,9 @@ +target +*~ +*.log +.settings +.classpath +.project +*.ipr +*.iws +*.iml Copied: maven/plugins/trunk/maven-plugins/pom.xml (from r944873, maven/plugins/trunk/pom.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins/pom.xml?p2=maven/plugins/trunk/maven-plugins/pom.xmlp1=maven/plugins/trunk/pom.xmlr1=944873r2=944890rev=944890view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/maven-plugins/pom.xml Sun May 16 18:01:45 2010 @@ -24,7 +24,7 @@ under the License. groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId version16/version -relativePath../pom/maven/pom.xml/relativePath +relativePath../../pom/maven/pom.xml/relativePath /parent groupIdorg.apache.maven.plugins/groupId @@ -110,59 +110,10 @@ under the License. /mailingList /mailingLists - modules -modulemaven-ant-plugin/module -modulemaven-antrun-plugin/module - -!-- HACK: Deliberately put before other plugins that employ maven-antrun-plugin to workaround MNG-1323 -- -modulemaven-eclipse-plugin/module - -!-- Excluded due to ongoing failures modulemaven-assembly-plugin/module -- -modulemaven-changelog-plugin/module -modulemaven-changes-plugin/module -modulemaven-checkstyle-plugin/module -modulemaven-clean-plugin/module -modulemaven-compiler-plugin/module -modulemaven-dependency-plugin/module -modulemaven-deploy-plugin/module -modulemaven-doap-plugin/module -modulemaven-docck-plugin/module -modulemaven-ear-plugin/module -modulemaven-ejb-plugin/module -modulemaven-gpg-plugin/module -modulemaven-help-plugin/module -modulemaven-idea-plugin/module -modulemaven-install-plugin/module -modulemaven-invoker-plugin/module -modulemaven-jar-plugin/module -modulemaven-jarsigner-plugin/module -modulemaven-javadoc-plugin/module -modulemaven-linkcheck-plugin/module -modulemaven-one-plugin/module -modulemaven-patch-plugin/module -modulemaven-pdf-plugin/module -modulemaven-pmd-plugin/module -!--Excluded as a workaround for MNG-3814 -modulemaven-project-info-reports-plugin/module-- -modulemaven-rar-plugin/module -modulemaven-reactor-plugin/module -!--Excluded as a workaround for MNG-3814 -modulemaven-remote-resources-plugin/module-- -modulemaven-repository-plugin/module -modulemaven-resources-plugin/module -modulemaven-shade-plugin/module -modulemaven-site-plugin/module -modulemaven-source-plugin/module -modulemaven-stage-plugin/module -modulemaven-toolchains-plugin/module -modulemaven-verifier-plugin/module -modulemaven-war-plugin/module - /modules - scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk//developerConnection -urlhttp://svn.apache.org/viewvc/maven/plugins/trunk//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-plugins//developerConnection +urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugins//url /scm distributionManagement site @@ -290,44 +241,5 @@ under the License. /plugins /reporting /profile -profile - idparent-release/id - build -plugins - plugin -artifactIdmaven-release-plugin/artifactId -configuration - arguments-N -Papache-release/arguments -/configuration - /plugin - plugin -artifactIdmaven-assembly-plugin/artifactId -executions - execution -idsource-release-assembly/id -configuration - descriptorRefs -descriptorRefsrc/descriptorRef - /descriptorRefs -/configuration - /execution -/executions - /plugin
svn commit: r944891 - /maven/plugins/trunk/pom.xml
Author: bentmann
Date: Sun May 16 18:03:08 2010
New Revision: 944891
URL: http://svn.apache.org/viewvc?rev=944891view=rev
Log:
o Added maven-plugins-aggregator to compensate for move of maven-plugins (cf.
http://www.mail-archive.com/d...@maven.apache.org/msg84531.html)
Added:
maven/plugins/trunk/pom.xml (with props)
Added: maven/plugins/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=944891view=auto
==
--- maven/plugins/trunk/pom.xml (added)
+++ maven/plugins/trunk/pom.xml Sun May 16 18:03:08 2010
@@ -0,0 +1,103 @@
+?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
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.maven/groupId
+artifactIdmaven-parent/artifactId
+version16/version
+relativePath../pom/maven/pom.xml/relativePath
+ /parent
+
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-plugins-aggregator/artifactId
+ version1-SNAPSHOT/version
+ packagingpom/packaging
+
+ nameMaven Plugins Aggregator/name
+ descriptionMaven Plugins Aggregator/description
+
+ modules
+modulemaven-plugins/module
+modulemaven-ant-plugin/module
+modulemaven-antrun-plugin/module
+
+!-- HACK: Deliberately put before other plugins that employ
maven-antrun-plugin to workaround MNG-1323 --
+modulemaven-eclipse-plugin/module
+
+!-- Excluded due to ongoing failures
modulemaven-assembly-plugin/module --
+modulemaven-changelog-plugin/module
+modulemaven-changes-plugin/module
+modulemaven-checkstyle-plugin/module
+modulemaven-clean-plugin/module
+modulemaven-compiler-plugin/module
+modulemaven-dependency-plugin/module
+modulemaven-deploy-plugin/module
+modulemaven-doap-plugin/module
+modulemaven-docck-plugin/module
+modulemaven-ear-plugin/module
+modulemaven-ejb-plugin/module
+modulemaven-gpg-plugin/module
+modulemaven-help-plugin/module
+modulemaven-idea-plugin/module
+modulemaven-install-plugin/module
+modulemaven-invoker-plugin/module
+modulemaven-jar-plugin/module
+modulemaven-jarsigner-plugin/module
+modulemaven-javadoc-plugin/module
+modulemaven-linkcheck-plugin/module
+modulemaven-one-plugin/module
+modulemaven-patch-plugin/module
+modulemaven-pdf-plugin/module
+modulemaven-pmd-plugin/module
+!--Excluded as a workaround for MNG-3814
+modulemaven-project-info-reports-plugin/module--
+modulemaven-rar-plugin/module
+modulemaven-reactor-plugin/module
+!--Excluded as a workaround for MNG-3814
+modulemaven-remote-resources-plugin/module--
+modulemaven-repository-plugin/module
+modulemaven-resources-plugin/module
+modulemaven-shade-plugin/module
+modulemaven-site-plugin/module
+modulemaven-source-plugin/module
+modulemaven-stage-plugin/module
+modulemaven-toolchains-plugin/module
+modulemaven-verifier-plugin/module
+modulemaven-war-plugin/module
+ /modules
+
+ profiles
+profile
+ idmaven-3/id
+ activation
+file
+ !-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) --
+ exists${basedir}/exists
+/file
+ /activation
+ modules
+modulemaven-project-info-reports-plugin/module
+modulemaven-remote-resources-plugin/module
+ /modules
+/profile
+ /profiles
+/project
Propchange: maven/plugins/trunk/pom.xml
--
svn:eol-style = native
Propchange: maven/plugins/trunk/pom.xml
--
svn:keywords = Author Date Id Revision
svn commit: r944685 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Author: bentmann Date: Sat May 15 17:26:43 2010 New Revision: 944685 URL: http://svn.apache.org/viewvc?rev=944685view=rev Log: o Cleaned up core artifact filter and removed exclusions pf non-existing artifacts Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=944685r1=944684r2=944685view=diff == --- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original) +++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Sat May 15 17:26:43 2010 @@ -58,11 +58,8 @@ public class DefaultArtifactFilterManage artifacts.add( org.codehaus.plexus:plexus-container-default ); artifacts.add( org.apache.maven:maven-artifact ); artifacts.add( org.apache.maven:maven-artifact-manager ); -artifacts.add( org.apache.maven:maven-artifact-resolver ); -artifacts.add( org.apache.maven:maven-build-context ); artifacts.add( org.apache.maven:maven-compat ); artifacts.add( org.apache.maven:maven-core ); -artifacts.add( org.apache.maven:maven-error-diagnoser ); artifacts.add( org.apache.maven:maven-error-diagnostics ); artifacts.add( org.apache.maven:maven-lifecycle ); artifacts.add( org.apache.maven:maven-model );
svn commit: r944710 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Author: bentmann Date: Sat May 15 20:14:00 2010 New Revision: 944710 URL: http://svn.apache.org/viewvc?rev=944710view=rev Log: [MNG-4666] [regression] Plugins depending on plexus:plexus-container-default get broken runtime classpath Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=944710r1=944709r2=944710view=diff == --- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original) +++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Sat May 15 20:14:00 2010 @@ -56,6 +56,7 @@ public class DefaultArtifactFilterManage artifacts.add( org.codehaus.plexus:plexus-classworlds ); artifacts.add( org.codehaus.plexus:plexus-component-api ); artifacts.add( org.codehaus.plexus:plexus-container-default ); +artifacts.add( plexus:plexus-container-default ); artifacts.add( org.apache.maven:maven-artifact ); artifacts.add( org.apache.maven:maven-artifact-manager ); artifacts.add( org.apache.maven:maven-compat );
svn commit: r944714 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Author: bentmann
Date: Sat May 15 20:29:45 2010
New Revision: 944714
URL: http://svn.apache.org/viewvc?rev=944714view=rev
Log:
o Added method to purge specific g:a:v from local repo
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=944714r1=944713r2=944714view=diff
==
---
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
(original)
+++
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Sat May 15 20:29:45 2010
@@ -850,6 +850,31 @@ public class Verifier
}
/**
+ * Deletes all artifacts in the specified g:a:v from the local repository.
+ *
+ * @param gid The group id whose artifacts should be deleted, must not be
codenull/code.
+ * @param aid The artifact id whose artifacts should be deleted, must not
be codenull/code.
+ * @param version The (base) version whose artifacts should be deleted,
must not be codenull/code.
+ * @throws IOException If the artifacts could not be deleted.
+ * @since 1.3
+ */
+public void deleteArtifacts( String gid, String aid, String version )
+throws IOException
+{
+String path;
+if ( default.equals( localRepoLayout ) )
+{
+path = gid.replace( '.', '/' ) + '/' + aid + '/' + version;
+}
+else
+{
+throw new IllegalStateException( Unsupported repository layout:
+ localRepoLayout );
+}
+
+FileUtils.deleteDirectory( new File( localRepo, path ) );
+}
+
+/**
* Deletes the specified directory.
*
* @param path The path to the directory to delete, relative to the base
directory, must not be codenull/code.
svn commit: r944715 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java
Author: bentmann Date: Sat May 15 20:34:14 2010 New Revision: 944715 URL: http://svn.apache.org/viewvc?rev=944715view=rev Log: o Stabilized IT Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java?rev=944715r1=944714r2=944715view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java Sat May 15 20:34:14 2010 @@ -55,7 +55,19 @@ public class MavenITmng4666CoreRealmImpo Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( target ); -verifier.deleteArtifacts( org.apache.maven.its.mng4666 ); +verifier.deleteArtifacts( org.apache.maven, maven-model, 0.1-stub ); +verifier.deleteArtifacts( org.apache.maven, maven-settings, 0.1-stub ); +verifier.deleteArtifacts( org.apache.maven, maven-project, 0.1-stub ); +verifier.deleteArtifacts( org.apache.maven, maven-artifact, 0.1-stub ); +verifier.deleteArtifacts( org.apache.maven, maven-core, 0.1-stub ); +verifier.deleteArtifacts( org.apache.maven, maven-plugin-api, 0.1-stub ); +verifier.deleteArtifacts( org.apache.maven, maven-plugin-descriptor, 0.1-stub ); +verifier.deleteArtifacts( plexus, plexus-container-default, 0.1-stub ); +verifier.deleteArtifacts( org.codehaus.plexus, plexus-container-default, 0.1-stub ); +verifier.deleteArtifacts( org.codehaus.plexus, plexus-component-api, 0.1-stub ); +verifier.deleteArtifacts( org.codehaus.plexus, plexus-utils, 0.1-stub ); +verifier.deleteArtifacts( org.codehaus.plexus, plexus-classworlds, 0.1-stub ); +verifier.deleteArtifacts( classworlds, classworlds, 0.1-stub ); verifier.filterFile( settings-template.xml, settings.xml, UTF-8, verifier.newDefaultFilterProperties() ); verifier.getCliOptions().add( -s ); verifier.getCliOptions().add( settings.xml );
svn commit: r944470 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
Author: bentmann Date: Fri May 14 21:08:59 2010 New Revision: 944470 URL: http://svn.apache.org/viewvc?rev=944470view=rev Log: o Removed unused imports Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=944470r1=944469r2=944470view=diff == --- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (original) +++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Fri May 14 21:08:59 2010 @@ -31,8 +31,6 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; -import org.apache.maven.repository.MirrorSelector; -import org.apache.maven.settings.Mirror; import org.apache.maven.wagon.ConnectionException; import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.TransferFailedException; @@ -73,8 +71,7 @@ public class DefaultWagonManager @Requirement private UpdateCheckManager updateCheckManager; - - + // // Retriever //
svn commit: r943454 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: bentmann
Date: Wed May 12 11:36:21 2010
New Revision: 943454
URL: http://svn.apache.org/viewvc?rev=943454view=rev
Log:
o Updated plugin index to account for release of maven-clean-plugin:2.4.1
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=943454r1=943453r2=943454view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed May 12 11:36:21 2010
@@ -61,7 +61,7 @@ Available Plugins
*---++--++--+++
| Core plugins ||
|| Plugins corresponding to default core phases (ie.
clean, compile). They may have muliple goals as well. | |
*---++--++--+++
-| {{{/plugins/maven-clean-plugin/} clean}}| B | 2.4
| 2010-01-15 | Clean up after the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MCLEAN}JIRA}}
+| {{{/plugins/maven-clean-plugin/} clean}}| B |
2.4.1| 2010-05-12 | Clean up after the build. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MCLEAN}JIRA}}
*---++--++--+++
| {{{/plugins/maven-compiler-plugin/} compiler}} | B | 2.3
| 2010-04-16 | Compiles Java sources. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MCOMPILER}JIRA}}
*---++--++--+++
svn commit: r942366 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade: DefaultShader.java TempRemappingClassAdapter.java
Author: bentmann
Date: Sat May 8 11:43:05 2010
New Revision: 942366
URL: http://svn.apache.org/viewvc?rev=942366view=rev
Log:
[MSHADE-79] Annotations are not shaded
Submitted by: Brian Kramer
Added:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
(with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=942366r1=942365r2=942366view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Sat May 8 11:43:05 2010
@@ -254,7 +254,7 @@ public class DefaultShader
ClassWriter cw = new ClassWriter( cr, 0 );
-ClassVisitor cv = new RemappingClassAdapter( cw, remapper );
+ClassVisitor cv = new TempRemappingClassAdapter( cw, remapper );
cr.accept( cv, ClassReader.EXPAND_FRAMES );
Added:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java?rev=942366view=auto
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
Sat May 8 11:43:05 2010
@@ -0,0 +1,35 @@
+package org.apache.maven.plugins.shade;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.commons.RemappingAnnotationAdapter;
+import org.objectweb.asm.commons.RemappingClassAdapter;
+import org.objectweb.asm.commons.RemappingMethodAdapter;
+
+/**
+ * A temporary class to fix a bug in objectweb asm.
+ *
+ */
+public class TempRemappingClassAdapter extends RemappingClassAdapter {
+private static class MethRemapVisitor extends RemappingMethodAdapter {
+public MethRemapVisitor(int access, String desc, MethodVisitor mv,
Remapper renamer) {
+super(access, desc, mv, renamer);
+}
+
+public AnnotationVisitor visitAnnotation(String desc, boolean visible)
{
+// The original source from asm did not have the call to
remapper.mapDesc()
+AnnotationVisitor av = mv.visitAnnotation(remapper.mapDesc(desc),
visible);
+return av == null ? av : new RemappingAnnotationAdapter(av,
remapper);
+}
+}
+
+public TempRemappingClassAdapter(ClassVisitor cv, Remapper remapper) {
+super(cv, remapper);
+}
+
+protected MethodVisitor createRemappingMethodAdapter(int access, String
newDesc, MethodVisitor mv) {
+return new MethRemapVisitor(access, newDesc, mv, remapper);
+}
+}
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
--
svn:keywords = Author Date Id Revision
svn commit: r942368 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
Author: bentmann
Date: Sat May 8 11:45:28 2010
New Revision: 942368
URL: http://svn.apache.org/viewvc?rev=942368view=rev
Log:
o Added license header
o Fixed code style
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java?rev=942368r1=942367r2=942368view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java
Sat May 8 11:45:28 2010
@@ -1,5 +1,24 @@
package org.apache.maven.plugins.shade;
+/*
+ * 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.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
@@ -10,26 +29,37 @@ import org.objectweb.asm.commons.Remappi
/**
* A temporary class to fix a bug in objectweb asm.
- *
+ *
+ * @see a
href=http://forge.ow2.org/tracker/index.php?func=detailaid=314982group_id=23atid=100023;bug
#314982/a
*/
-public class TempRemappingClassAdapter extends RemappingClassAdapter {
-private static class MethRemapVisitor extends RemappingMethodAdapter {
-public MethRemapVisitor(int access, String desc, MethodVisitor mv,
Remapper renamer) {
-super(access, desc, mv, renamer);
+class TempRemappingClassAdapter
+extends RemappingClassAdapter
+{
+
+private static class MethRemapVisitor
+extends RemappingMethodAdapter
+{
+public MethRemapVisitor( int access, String desc, MethodVisitor mv,
Remapper renamer )
+{
+super( access, desc, mv, renamer );
}
-public AnnotationVisitor visitAnnotation(String desc, boolean visible)
{
+public AnnotationVisitor visitAnnotation( String desc, boolean visible
)
+{
// The original source from asm did not have the call to
remapper.mapDesc()
-AnnotationVisitor av = mv.visitAnnotation(remapper.mapDesc(desc),
visible);
-return av == null ? av : new RemappingAnnotationAdapter(av,
remapper);
+AnnotationVisitor av = mv.visitAnnotation( remapper.mapDesc( desc
), visible );
+return av == null ? av : new RemappingAnnotationAdapter( av,
remapper );
}
}
-public TempRemappingClassAdapter(ClassVisitor cv, Remapper remapper) {
-super(cv, remapper);
+public TempRemappingClassAdapter( ClassVisitor cv, Remapper remapper )
+{
+super( cv, remapper );
}
-protected MethodVisitor createRemappingMethodAdapter(int access, String
newDesc, MethodVisitor mv) {
-return new MethRemapVisitor(access, newDesc, mv, remapper);
+protected MethodVisitor createRemappingMethodAdapter( int access, String
newDesc, MethodVisitor mv )
+{
+return new MethRemapVisitor( access, newDesc, mv, remapper );
}
+
}
svn commit: r942370 - in /maven/plugins/trunk/maven-shade-plugin/src: it/reloc-anno/ it/reloc-anno/src/ it/reloc-anno/src/main/ it/reloc-anno/src/main/java/ it/reloc-anno/src/main/java/relocated/ main
Author: bentmann Date: Sat May 8 11:57:36 2010 New Revision: 942370 URL: http://svn.apache.org/viewvc?rev=942370view=rev Log: [MSHADE-79] Annotations are not shaded o Extended original patch to fix field annotations as well o Added IT Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties (with props) maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml (with props) maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/src/ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/src/main/ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/src/main/java/ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/src/main/java/Main.java (with props) maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/src/main/java/relocated/ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/src/main/java/relocated/MyAnno.java (with props) Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/TempRemappingClassAdapter.java Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties?rev=942370view=auto == --- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties (added) +++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties Sat May 8 11:57:36 2010 @@ -0,0 +1 @@ +invoker.java.version = 1.5+ Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml?rev=942370view=auto == --- maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml (added) +++ maven/plugins/trunk/maven-shade-plugin/src/it/reloc-anno/pom.xml Sat May 8 11:57:36 2010 @@ -0,0 +1,108 @@ +?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 http://maven.apache.org/maven-v4_0_0.xsd; + modelVersion4.0.0/modelVersion + + groupIdorg.apache.maven.its.shade.ra/groupId + artifactIdtest/artifactId + version1.0/version + packagingjar/packaging + + nameMSHADE-79/name + description +Test that annotations are properly relocated. + /description + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +version2.0.2/version +configuration + source1.5/source + target1.5/target +/configuration + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-jar-plugin/artifactId +version2.1/version + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-resources-plugin/artifactId +version2.2/version + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-shade-plugin/artifactId +version@project.version@/version +executions + execution +idshade/id +phasepackage/phase +goals + goalshade/goal +/goals +configuration + createDependencyReducedPomfalse/createDependencyReducedPom + relocations +relocation + patternrelocated/pattern + shadedPatternhidden/shadedPattern
svn commit: r942375 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Author: bentmann
Date: Sat May 8 12:43:53 2010
New Revision: 942375
URL: http://svn.apache.org/viewvc?rev=942375view=rev
Log:
o Polished code
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=942375r1=942374r2=942375view=diff
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Sat May 8 12:43:53 2010
@@ -46,7 +46,6 @@ import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
/**
* @author Jason van Zyl
@@ -56,8 +55,9 @@ public class DefaultShader
extends AbstractLogEnabled
implements Shader
{
+
public void shade( Set jars, File uberJar, List filters, List relocators,
List resourceTransformers )
-throws IOException
+throws IOException
{
Set resources = new HashSet();
svn commit: r942376 - in /maven/plugins/trunk/maven-shade-plugin: pom.xml src/main/java/org/apache/maven/plugins/shade/DefaultShader.java src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.ja
Author: bentmann Date: Sat May 8 12:52:51 2010 New Revision: 942376 URL: http://svn.apache.org/viewvc?rev=942376view=rev Log: o Inherited from maven-plugins:18 o Declared mojo as thread-safe o Made shader use per-lookup instantiation Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=942376r1=942375r2=942376view=diff == --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Sat May 8 12:52:51 2010 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId - version17/version + version18/version /parent artifactIdmaven-shade-plugin/artifactId Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=942376r1=942375r2=942376view=diff == --- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original) +++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Sat May 8 12:52:51 2010 @@ -49,7 +49,7 @@ import org.objectweb.asm.commons.Remappe /** * @author Jason van Zyl - * @plexus.component + * @plexus.component instantiation-strategy=per-lookup */ public class DefaultShader extends AbstractLogEnabled Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=942376r1=942375r2=942376view=diff == --- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original) +++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Sat May 8 12:52:51 2010 @@ -74,6 +74,7 @@ import org.codehaus.plexus.util.WriterFa * @goal shade * @phase package * @requiresDependencyResolution runtime + * @threadSafe */ public class ShadeMojo extends AbstractMojo
svn commit: r942385 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: bentmann Date: Sat May 8 13:48:01 2010 New Revision: 942385 URL: http://svn.apache.org/viewvc?rev=942385view=rev Log: o Bumped version to 2.4.1-SNAPSHOT in preparation for release Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=942385r1=942384r2=942385view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Sat May 8 13:48:01 2010 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-clean-plugin/artifactId - version2.5-SNAPSHOT/version + version2.4.1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Clean Plugin/name
svn commit: r942398 - in /maven/plugins/trunk/maven-clean-plugin/src: main/java/org/apache/maven/plugin/clean/GlobSelector.java test/java/org/apache/maven/plugin/clean/CleanMojoTest.java test/resource
Author: bentmann
Date: Sat May 8 14:57:59 2010
New Revision: 942398
URL: http://svn.apache.org/viewvc?rev=942398view=rev
Log:
[MCLEAN-44] NullPointerException when using empty exclude to preserve base
directory of fileset
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java?rev=942398r1=942397r2=942398view=diff
==
---
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
Sat May 8 14:57:59 2010
@@ -99,6 +99,11 @@ class GlobSelector
private static String normalizePattern( String pattern )
{
+if ( pattern == null )
+{
+return ;
+}
+
String normalized = pattern.replace( ( File.separatorChar == '/' ) ?
'\\' : '/', File.separatorChar );
if ( normalized.endsWith( File.separator ) )
Modified:
maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java?rev=942398r1=942397r2=942398view=diff
==
---
maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/test/java/org/apache/maven/plugin/clean/CleanMojoTest.java
Sat May 8 14:57:59 2010
@@ -160,10 +160,9 @@ public class CleanMojoTest
assertTrue( checkEmpty( getBasedir() +
/target/test-classes/unit/fileset-clean-test/target/subdir ) );
// fileset 2
-//TODO: MCLEAN-7
assertTrue( checkExists( getBasedir() +
/target/test-classes/unit/fileset-clean-test/
+ buildOutputDirectory ) );
-assertFalse( checkExists( getBasedir() +
/target/test-classes/fileset-clean-test/
+assertFalse( checkExists( getBasedir() +
/target/test-classes/unit/fileset-clean-test/
+ buildOutputDirectory/file.txt ) );
}
Modified:
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml?rev=942398r1=942397r2=942398view=diff
==
---
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
Sat May 8 14:57:59 2010
@@ -40,7 +40,7 @@
include**/include
/includes
excludes
-exclude**/exclude
+exclude/exclude
/excludes
/fileset
/filesets
svn commit: r942399 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: bentmann Date: Sat May 8 15:05:19 2010 New Revision: 942399 URL: http://svn.apache.org/viewvc?rev=942399view=rev Log: [maven-release-plugin] prepare release maven-clean-plugin-2.4.1 Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=942399r1=942398r2=942399view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Sat May 8 15:05:19 2010 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-clean-plugin/artifactId - version2.4.1-SNAPSHOT/version + version2.4.1/version packagingmaven-plugin/packaging nameMaven Clean Plugin/name @@ -49,9 +49,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-clean-plugin-2.4.1/url /scm issueManagement systemJIRA/system
svn commit: r942400 - /maven/plugins/tags/maven-clean-plugin-2.4.1/
Author: bentmann Date: Sat May 8 15:06:00 2010 New Revision: 942400 URL: http://svn.apache.org/viewvc?rev=942400view=rev Log: [maven-scm] copy for tag maven-clean-plugin-2.4.1 Added: maven/plugins/tags/maven-clean-plugin-2.4.1/ - copied from r942399, maven/plugins/trunk/maven-clean-plugin/
svn commit: r942401 - /maven/plugins/trunk/maven-clean-plugin/pom.xml
Author: bentmann Date: Sat May 8 15:06:15 2010 New Revision: 942401 URL: http://svn.apache.org/viewvc?rev=942401view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=942401r1=942400r2=942401view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Sat May 8 15:06:15 2010 @@ -29,7 +29,7 @@ under the License. /parent artifactIdmaven-clean-plugin/artifactId - version2.4.1/version + version2.4.2-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Clean Plugin/name @@ -49,9 +49,9 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.4.1/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-clean-plugin-2.4.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/url /scm issueManagement systemJIRA/system
svn commit: r942430 - /maven/maven-3/trunk/build.xml
Author: bentmann
Date: Sat May 8 18:04:28 2010
New Revision: 942430
URL: http://svn.apache.org/viewvc?rev=942430view=rev
Log:
o Made bootstrapper fully respect user-supplied maven home directory, including
the final directory name
Modified:
maven/maven-3/trunk/build.xml
Modified: maven/maven-3/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev=942430r1=942429r2=942430view=diff
==
--- maven/maven-3/trunk/build.xml (original)
+++ maven/maven-3/trunk/build.xml Sat May 8 18:04:28 2010
@@ -58,17 +58,15 @@ END SNIPPET: ant-bootstrap --
target name=init depends=isMavenHomeSet
xmlproperty prefix=pom file=pom.xml /
-dirname file=${maven.home} property=maven.home.dirname /
!-- Initialize properties --
property name=maven.home.basename.expected
value=apache-maven-${pom.project.version} /
-property name=maven.home.effective
location=${maven.home.dirname}/${maven.home.basename.expected} /
property name=maven.assembly
location=apache-maven/target/${maven.home.basename.expected}-bin.zip /
property name=maven.repo.local value=${user.home}/.m2/repository /
property name=maven.debug value=-e /
property name=maven.test.skip value=false /
property name=surefire.useFile value=true /
property name=maven.test.redirectTestOutputToFile
value=${surefire.useFile} /
-echomaven.home = ${maven.home.effective}/echo
+echomaven.home = ${maven.home}/echo
echomaven.repo.local = ${maven.repo.local}/echo
/target
@@ -232,13 +230,15 @@ This goal just validates the presence of
/target
target name=extract-assembly depends=init,maven-assembly
description=extracts the maven assembly into maven.home
-echoExtracting assembly to ${maven.home.dirname} .../echo
+echoExtracting assembly to ${maven.home} .../echo
!-- If we are starting from scratch make sure the directory is created --
-delete dir=${maven.home.effective} /
-mkdir dir=${maven.home.effective} /
-unzip src=${maven.assembly} dest=${maven.home.dirname} /
+delete dir=${maven.home} /
+mkdir dir=${maven.home} /
+unzip src=${maven.assembly} dest=${maven.home}
+ mapper type=regexp from=^[^\\/]+[\\/](.*)$$ to=\1 /
+/unzip
chmod perm=+x
- fileset dir=${maven.home.effective}/bin
+ fileset dir=${maven.home}/bin
include name=mvn /
/fileset
/chmod
svn commit: r942440 - /maven/maven-3/trunk/build.xml
Author: bentmann
Date: Sat May 8 18:43:13 2010
New Revision: 942440
URL: http://svn.apache.org/viewvc?rev=942440view=rev
Log:
o Made bootstrapper prompt user in case specified maven home already exists
Modified:
maven/maven-3/trunk/build.xml
Modified: maven/maven-3/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev=942440r1=942439r2=942440view=diff
==
--- maven/maven-3/trunk/build.xml (original)
+++ maven/maven-3/trunk/build.xml Sat May 8 18:43:13 2010
@@ -54,6 +54,20 @@ END SNIPPET: ant-bootstrap --
/or
/condition
/fail
+available property=maven.home.exists file=${maven.home} /
+ /target
+
+ target name=prompt-maven-home-exists depends=isMavenHomeSet
if=maven.home.exists
+input addproperty=maven.home.exists.continue validargs=yes,no
defaultvalue=noWARNING:
+The specified target directory
+ ${maven.home}
+already exists. It will be deleted and overwritten by the build.
+Do you want to continue?/input
+fail message=Build was aborted by user
+ condition
+equals arg1=${maven.home.exists.continue} arg2=no trim=true
casesensitive=false /
+ /condition
+/fail
/target
target name=init depends=isMavenHomeSet
@@ -229,7 +243,7 @@ This goal just validates the presence of
fail if=build.failed message=Assembly task seemed to succeed, but
couldn't find assembly file: ${maven.assembly} /
/target
- target name=extract-assembly depends=init,maven-assembly
description=extracts the maven assembly into maven.home
+ target name=extract-assembly
depends=init,prompt-maven-home-exists,maven-assembly description=extracts
the maven assembly into maven.home
echoExtracting assembly to ${maven.home} .../echo
!-- If we are starting from scratch make sure the directory is created --
delete dir=${maven.home} /
svn commit: r942067 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java
Author: bentmann Date: Fri May 7 13:24:02 2010 New Revision: 942067 URL: http://svn.apache.org/viewvc?rev=942067view=rev Log: [MNG-466] Adjust the expected message string in MavenITmng2690MojoLoadingErrorsTest Submitted by: Stuart McCulloch Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java?rev=942067r1=942066r2=942067view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java Fri May 7 13:24:02 2010 @@ -104,7 +104,7 @@ public class MavenITmng2690MojoLoadingEr List lines = verifier.loadFile( new File( testDir, log.txt ), false ); -int msg = indexOf( lines, (?i).*required class was missing during (mojo )?configuration.* ); +int msg = indexOf( lines, (?i).*required class (i|wa)s missing( during (mojo )?configuration)?.* ); assertTrue( User-friendly message was not found in output., msg = 0 ); int cls = lines.get( msg ).toString().replace( '/', '.' ).indexOf( TestCase.class.getName() );
svn commit: r941657 - /maven/shared/trunk/maven-archiver/src/site/site.xml
Author: bentmann
Date: Thu May 6 10:59:12 2010
New Revision: 941657
URL: http://svn.apache.org/viewvc?rev=941657view=rev
Log:
o Fixed site descriptor
Modified:
maven/shared/trunk/maven-archiver/src/site/site.xml
Modified: maven/shared/trunk/maven-archiver/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/site/site.xml?rev=941657r1=941656r2=941657view=diff
==
--- maven/shared/trunk/maven-archiver/src/site/site.xml (original)
+++ maven/shared/trunk/maven-archiver/src/site/site.xml Thu May 6 10:59:12 2010
@@ -18,22 +18,6 @@ specific language governing permissions
under the License.
--
project xmlns=http://maven.apache.org/DECORATION/1.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd;
- !-- TODO: Most of the stuff in this file should be inherited from the
shared parent --
- !-- TODO: banners, skin, publish date, version should be inherited from
Maven itself --
- bannerLeft
-name${project.name}/name
-srchttp://maven.apache.org/images/apache-maven-project-2.png/src
-hrefhttp://maven.apache.org//href
- /bannerLeft
- bannerRight
-srchttp://maven.apache.org/images/maven-logo-2.gif/src
- /bannerRight
- skin
-groupIdorg.apache.maven.skins/groupId
-artifactIdmaven-stylus-skin/artifactId
- /skin
- publishDate format=dd MMM position=left /
- version position=left /
body
menu name=Overview
item name=Reference href=index.html/
@@ -45,26 +29,5 @@ under the License.
item name=Set Up The Classpath href=examples/classpath.html/
item name=Use Your Own Manifest File
href=examples/manifestFile.html/
/menu
-!-- TODO: Link, head, reports should be inherited --
-!-- TODO: use breadcrumbs more structure, links for links, and inherit
subprojects as a menu or not at all --
-links
- item name=Apache href=http://www.apache.org//
- item name=Maven 1.x href=http://maven.apache.org/maven-1.x/
- item name=Maven 2.x href=http://maven.apache.org//
- item name=Maven 2.x Plugins href=http://maven.apache.org/plugins//
- item name=SCM href=http://maven.apache.org/scm/
- item name=Wagon href=http://maven.apache.org/wagon/
- item name=JXR href=http://maven.apache.org/jxr/
- item name=Doxia href=http://maven.apache.org/doxia/
-/links
-head
- script src=http://www.google-analytics.com/urchin.js;
type=text/javascript
- /script
- script type=text/javascript
-_uacct = UA-140879-1;
-urchinTracker();
- /script
-/head
-menu ref=reports inherit=bottom /
/body
/project
svn commit: r941224 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/lifecycle/internal/ test/java/org/apache/maven/lifecycle/
Author: bentmann
Date: Wed May 5 09:49:08 2010
New Revision: 941224
URL: http://svn.apache.org/viewvc?rev=941224view=rev
Log:
[MNG-4664] Minor patches needed to run Maven3 with the replacement Guice-Plexus
container
Submitted by: Stuart McCulloch
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java?rev=941224r1=941223r2=941224view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
Wed May 5 09:49:08 2010
@@ -14,13 +14,12 @@
*/
package org.apache.maven.lifecycle.internal;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
import org.apache.maven.project.MavenProject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -80,10 +79,17 @@ public class ConcurrentBuildLogger
{
StringBuilder result = new StringBuilder();
-MultimapMavenProject, BuildLogItem multiMap =
ArrayListMultimap.create();
+MapMavenProject, CollectionBuildLogItem multiMap = new
HashMapMavenProject, CollectionBuildLogItem();
for ( BuildLogItem builtLogItem : items )
{
-multiMap.put( builtLogItem.getProject(), builtLogItem );
+MavenProject project = builtLogItem.getProject();
+CollectionBuildLogItem bag = multiMap.get( project );
+if ( bag == null )
+{
+bag = new ArrayListBuildLogItem();
+multiMap.put( project, bag );
+}
+bag.add( builtLogItem );
}
result.append( digraph build );
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java?rev=941224r1=941223r2=941224view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
Wed May 5 09:49:08 2010
@@ -37,7 +37,7 @@ import java.util.Set;
* p/
* NOTE: This class is not part of any public api and can be changed
or deleted without prior notice.
*/
-...@component(role = LifecyclePluginAnalyzerImpl.class)
+...@component(role = LifeCyclePluginAnalyzer.class)
public class LifecyclePluginAnalyzerImpl
implements LifeCyclePluginAnalyzer
{
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java?rev=941224r1=941223r2=941224view=diff
==
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
Wed May 5 09:49:08 2010
@@ -21,7 +21,6 @@ import org.apache.maven.exception.Except
import org.apache.maven.lifecycle.internal.LifecycleDependencyResolver;
import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
-import org.apache.maven.lifecycle.internal.LifecyclePluginAnalyzerImpl;
import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.MojoExecutor;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -66,7 +65,7 @@ public class LifecycleExecutorSubModules
lifeCycleBuilder = lookup( LifecycleModuleBuilder.class );
lifeCycleDependencyResolver = lookup(
LifecycleDependencyResolver.class );
lifeCycleExecutionPlanCalculator
svn commit: r941233 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: bentmann
Date: Wed May 5 10:36:34 2010
New Revision: 941233
URL: http://svn.apache.org/viewvc?rev=941233view=rev
Log:
o Updated plugin index to account for release of maven-plugin-plugin:2.6
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=941233r1=941232r2=941233view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed May 5 10:36:34 2010
@@ -145,7 +145,7 @@ Available Plugins
*---++--++--+++
| {{{/plugins/maven-pdf-plugin/} pdf}}| B | 1.1
| 2009-12-13 | Generate a PDF version of your project's documentation.
| {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pdf-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPDF}JIRA}}
*---++--++--+++
-| {{{/plugins/maven-plugin-plugin/} plugin}} | B+R|
2.5.1| 2009-10-08 | Create a Maven plugin descriptor for any Mojo's
found in the source tree, to include in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPLUGIN}JIRA}}
+| {{{/plugins/maven-plugin-plugin/} plugin}} | B+R| 2.6
| 2010-05-05 | Create a Maven plugin descriptor for any mojo's found
in the source tree, to include in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPLUGIN}JIRA}}
*---++--++--+++
| {{{/plugins/maven-release-plugin/} release}}| B | 2.0
| 2010-02-10 | Release the current project - updating the POM and
tagging in the SCM. |
{{{http://svn.apache.org/repos/asf/maven/release/trunk/maven-release-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRELEASE}JIRA}}
*---++--++--+++
svn commit: r941235 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: bentmann
Date: Wed May 5 10:37:43 2010
New Revision: 941235
URL: http://svn.apache.org/viewvc?rev=941235view=rev
Log:
o Fixed typo
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=941235r1=941234r2=941235view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed May 5 10:37:43 2010
@@ -145,7 +145,7 @@ Available Plugins
*---++--++--+++
| {{{/plugins/maven-pdf-plugin/} pdf}}| B | 1.1
| 2009-12-13 | Generate a PDF version of your project's documentation.
| {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-pdf-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPDF}JIRA}}
*---++--++--+++
-| {{{/plugins/maven-plugin-plugin/} plugin}} | B+R| 2.6
| 2010-05-05 | Create a Maven plugin descriptor for any mojo's found
in the source tree, to include in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPLUGIN}JIRA}}
+| {{{/plugins/maven-plugin-plugin/} plugin}} | B+R| 2.6
| 2010-05-05 | Create a Maven plugin descriptor for any mojos found in
the source tree, to include in the JAR. |
{{{http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MPLUGIN}JIRA}}
*---++--++--+++
| {{{/plugins/maven-release-plugin/} release}}| B | 2.0
| 2010-02-10 | Release the current project - updating the POM and
tagging in the SCM. |
{{{http://svn.apache.org/repos/asf/maven/release/trunk/maven-release-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MRELEASE}JIRA}}
*---++--++--+++
svn commit: r941241 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-0956/ resources/mng-0956/repo/org/apache/maven/its/it0081/ resources/mng-
Author: bentmann Date: Wed May 5 10:59:47 2010 New Revision: 941241 URL: http://svn.apache.org/viewvc?rev=941241view=rev Log: o Renamed artifact to match issue number Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.pom Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/it0081/ Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java?rev=941241r1=941240r2=941241view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java Wed May 5 10:59:47 2010 @@ -49,7 +49,7 @@ public class MavenITmng0956ComponentInje Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( target ); -verifier.deleteArtifacts( org.apache.maven.its.it0081 ); +verifier.deleteArtifacts( org.apache.maven.its.mng0956 ); verifier.filterFile( settings-template.xml, settings.xml, UTF-8, verifier.newDefaultFilterProperties() ); verifier.getCliOptions().add( --settings ); verifier.getCliOptions().add( settings.xml ); @@ -58,7 +58,7 @@ public class MavenITmng0956ComponentInje verifier.resetStreams(); Properties apiProps = verifier.loadProperties( target/component.properties ); -assertEquals( true, apiProps.getProperty( org.apache.maven.its.it0081.DefaultComponent ) ); +assertEquals( true, apiProps.getProperty( org.apache.maven.plugin.coreit.DefaultComponent ) ); } } Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml?rev=941241r1=941240r2=941241view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/pom.xml Wed May 5 10:59:47 2010 @@ -22,12 +22,12 @@ under the License. project modelVersion4.0.0/modelVersion - groupIdorg.apache.maven.its.it0081/groupId + groupIdorg.apache.maven.its.mng0956/groupId artifactIdtest/artifactId version0.1/version packagingpom/packaging - nameMaven Integration Test :: it0081/name + nameMaven Integration Test :: MNG-956/name description Test component injection from project-level plugin dependencies. /description @@ -54,7 +54,7 @@ under the License. dependencies !-- load component into plugin realm -- dependency -groupIdorg.apache.maven.its.it0081/groupId +groupIdorg.apache.maven.its.mng0956/groupId artifactIdcomponent/artifactId version0.1/version /dependency Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956/component/0.1/component-0.1.jar?rev=941241view=auto == Binary file - no diff available. Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0956/repo/org/apache/maven/its/mng0956
svn commit: r941249 - /maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Compo
Author: bentmann
Date: Wed May 5 11:14:14 2010
New Revision: 941249
URL: http://svn.apache.org/viewvc?rev=941249view=rev
Log:
[MNG-4665] Missing component test class from maven-it-plugin-class-loader
project?
Submitted by: Stuart McCulloch
Added:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java
(with props)
Added:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java?rev=941249view=auto
==
---
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java
(added)
+++
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java
Wed May 5 11:14:14 2010
@@ -0,0 +1,30 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * 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.
+ */
+
+/**
+ * A simple interface for our test components.
+ *
+ * @author Benjamin Bentmann
+ */
+public interface Component
+{
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java
--
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/Component.java
--
svn:keywords = Author Date Id Revision
svn commit: r941252 - /maven/maven-3/trunk/build.xml
Author: bentmann
Date: Wed May 5 11:21:42 2010
New Revision: 941252
URL: http://svn.apache.org/viewvc?rev=941252view=rev
Log:
o Removed cruft
Modified:
maven/maven-3/trunk/build.xml
Modified: maven/maven-3/trunk/build.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev=941252r1=941251r2=941252view=diff
==
--- maven/maven-3/trunk/build.xml (original)
+++ maven/maven-3/trunk/build.xml Wed May 5 11:21:42 2010
@@ -65,9 +65,6 @@ END SNIPPET: ant-bootstrap --
property name=maven.assembly
location=apache-maven/target/${maven.home.basename.expected}-bin.zip /
property name=maven.repo.local value=${user.home}/.m2/repository /
property name=maven.debug value=-e /
-!--
-property name=maven.debug value=-e -X /
---
property name=maven.test.skip value=false /
property name=surefire.useFile value=true /
property name=maven.test.redirectTestOutputToFile
value=${surefire.useFile} /
svn commit: r940789 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/IntegrationTestSuite.java java/org/apache/maven/it/MavenITmng4418ReservedRepoIdLocalTest
Author: bentmann Date: Tue May 4 09:56:22 2010 New Revision: 940789 URL: http://svn.apache.org/viewvc?rev=940789view=rev Log: [MNG-4658] Relax validation of repository ids and only warn upon conflict with local o Removed obsolete IT Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4418ReservedRepoIdLocalTest.java maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4418/ 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=940789r1=940788r2=940789view=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 Tue May 4 09:56:22 2010 @@ -124,7 +124,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng4423SessionDataFromPluginParameterExpressionTest.class ); suite.addTestSuite( MavenITmng4422PluginExecutionPhaseInterpolationTest.class ); suite.addTestSuite( MavenITmng4421DeprecatedPomInterpolationExpressionsTest.class ); -suite.addTestSuite( MavenITmng4418ReservedRepoIdLocalTest.class ); suite.addTestSuite( MavenITmng4416PluginOrderAfterProfileInjectionTest.class ); suite.addTestSuite( MavenITmng4415InheritedPluginOrderTest.class ); suite.addTestSuite( MavenITmng4413MirroringOfDependencyRepoTest.class );
svn commit: r940790 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/settings/validation/ maven-model-builder/src/main/java/org/apache/maven/model/validation/ maven-model-builder/s
Author: bentmann
Date: Tue May 4 09:57:46 2010
New Revision: 940790
URL: http://svn.apache.org/viewvc?rev=940790view=rev
Log:
[MNG-4658] Relax validation of repository ids and only warn upon conflict with
local
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java?rev=940790r1=940789r2=940790view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
Tue May 4 09:57:46 2010
@@ -90,7 +90,9 @@ public class DefaultSettingsValidator
if ( local.equals( mirror.getId() ) )
{
-addError( problems, 'mirrors.mirror.id' must not be
'local', this identifier is reserved. );
+addWarn( problems, 'mirrors.mirror.id' must not be
'local'
++ , this identifier is reserved for the local
repository
++ , using it for other repositories will corrupt your
repository metadata. );
}
validateStringNotEmpty( problems, mirrors.mirror.url,
mirror.getUrl(), mirror.getId() );
@@ -119,7 +121,9 @@ public class DefaultSettingsValidator
if ( local.equals( repository.getId() ) )
{
-addError( problems, ' + prefix + .id' must not be 'local',
this identifier is reserved. );
+addWarn( problems, ' + prefix + .id' must not be 'local'
++ , this identifier is reserved for the local repository
++ , using it for other repositories will corrupt your
repository metadata. );
}
validateStringNotEmpty( problems, prefix + .url,
repository.getUrl(), repository.getId() );
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=940790r1=940789r2=940790view=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 May 4 09:57:46 2010
@@ -500,8 +500,10 @@ public class DefaultModelValidator
{
if ( local.equals( repository.getId() ) )
{
-addViolation( problems, Severity.ERROR, prefix + .id, null,
- must not be 'local', this identifier is
reserved. );
+Severity errOn31 = getSeverity( request,
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 );
+addViolation( problems, errOn31, prefix + .id, null, must
not be 'local'
++ , this identifier is reserved for the local repository
++ , using it for other repositories will corrupt your
repository metadata. );
}
if ( legacy.equals( repository.getLayout() ) )
{
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=940790r1=940789r2=940790view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Tue May 4 09:57:46 2010
@@ -84,6 +84,11 @@ public class DefaultModelValidatorTest
return problems;
}
+private void assertContains( String msg, String substring )
+{
+assertTrue( \ + substring + \ was not found in: + msg,
msg.contains( substring ) );
+}
+
@Override
protected void setUp()
throws Exception
@@ -439,14 +444,13 @@ public
svn commit: r940810 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
Author: bentmann
Date: Tue May 4 11:41:32 2010
New Revision: 940810
URL: http://svn.apache.org/viewvc?rev=940810view=rev
Log:
o Fixed error message
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java?rev=940810r1=940809r2=940810view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
Tue May 4 11:41:32 2010
@@ -87,10 +87,10 @@ public class PluginVersionResolutionExce
if ( remoteRepositories != null !remoteRepositories.isEmpty() )
{
-repos += , ;
-
for ( ArtifactRepository repository : remoteRepositories )
{
+repos += , ;
+
if ( repository != null )
{
repos += repository.getId() + ( + repository.getUrl() +
);
svn commit: r940409 - /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml
Author: bentmann Date: Mon May 3 10:18:15 2010 New Revision: 940409 URL: http://svn.apache.org/viewvc?rev=940409view=rev Log: o Adjusted IT to compensate for MEV-658 Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml?rev=940409r1=940408r2=940409view=diff == --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-306/pom.xml Mon May 3 10:18:15 2010 @@ -25,7 +25,7 @@ !-- Both the range AND the scope are critical here, since this artifact will be EXCLUDED from the depSet. -- - version[1.2.13]/version + version[1.2.16]/version scopeprovided/scope /dependency /dependencies
svn commit: r940414 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java test/java/org/apache/maven/plugin/assembly/io/DefaultA
Author: bentmann
Date: Mon May 3 10:53:06 2010
New Revision: 940414
URL: http://svn.apache.org/viewvc?rev=940414view=rev
Log:
[MASSEMBLY-486] ComponentDescriptors to support absolute paths
Submitted by: Michael Lawler
o Applied with minor formatting/modifications
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=940414r1=940413r2=940414view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
Mon May 3 10:53:06 2010
@@ -27,6 +27,7 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import
org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolationException;
import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
+import
org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.Component;
import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
@@ -422,7 +423,10 @@ public class DefaultAssemblyReader
protected void mergeComponentsWithMainAssembly( Assembly assembly,
AssemblerConfigurationSource configSource )
throws AssemblyReadException
{
-RelativeFileLocatorStrategy fls = new RelativeFileLocatorStrategy(
configSource.getBasedir() );
+RelativeFileLocatorStrategy rfls = new RelativeFileLocatorStrategy(
configSource.getBasedir() );
+
+// allow absolute paths in componentDescriptor... MASSEMBLY-486
+FileLocatorStrategy afls = new FileLocatorStrategy();
ClasspathResourceLocatorStrategy crls = new
ClasspathResourceLocatorStrategy();
@@ -434,16 +438,29 @@ public class DefaultAssemblyReader
URLLocatorStrategy uls = new URLLocatorStrategy();
Locator locator = new Locator();
-locator.addStrategy( fls );
+locator.addStrategy( rfls );
+locator.addStrategy( afls );
locator.addStrategy( als );
locator.addStrategy( crls );
locator.addStrategy( uls );
+AssemblyExpressionEvaluator aee = new AssemblyExpressionEvaluator(
configSource );
+
List componentLocations = assembly.getComponentDescriptors();
for ( Iterator it = componentLocations.iterator(); it.hasNext(); )
{
String location = (String) it.next();
+
+// allow expressions in path to component descriptor...
MASSEMBLY-486
+try
+{
+location = aee.evaluate( location ).toString();
+}
+catch ( Exception eee )
+{
+getLogger().error( Error interpolating componentDescriptor:
+ location, eee );
+}
Location resolvedLocation = locator.resolve( location );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?rev=940414r1=940413r2=940414view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
Mon May 3 10:53:06 2010
@@ -487,6 +487,12 @@ public class DefaultAssemblyReaderTest
configSource.getBasedir();
configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE
);
+
+
+MavenProject project = new MavenProject();
+
+configSource.getProject();
+configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE
);
mockManager.replayAll();
@@ -702,7 +708,6 @@ public class DefaultAssemblyReaderTest
model.setVersion( version );
MavenProject project = new MavenProject( model );
-
configSource.getProject();
configSourceControl.setReturnValue( project
svn commit: r940415 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path: ./ assembly.xml component.xml goals.txt pom.xml verify.bsh
Author: bentmann
Date: Mon May 3 10:54:58 2010
New Revision: 940415
URL: http://svn.apache.org/viewvc?rev=940415view=rev
Log:
[MASSEMBLY-486] ComponentDescriptors to support absolute paths
o Added IT
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml?rev=940415view=auto
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
Mon May 3 10:54:58 2010
@@ -0,0 +1,13 @@
+assembly
xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+
xsi:schemaLocation=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd;
+ idfiltered-assembly/id
+ formats
+formatdir/format
+ /formats
+ includeBaseDirectoryfalse/includeBaseDirectory
+ componentDescriptors
+!-- Needs to be interpolated before actual resolution --
+componentDescriptor${project.basedir}/component.xml/componentDescriptor
+ /componentDescriptors
+/assembly
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/assembly.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml?rev=940415view=auto
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
Mon May 3 10:54:58 2010
@@ -0,0 +1,7 @@
+component
+ files
+file
+ sourcepom.xml/source
+/file
+ /files
+/component
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/component.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt?rev=940415view=auto
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
Mon May 3 10:54:58 2010
@@ -0,0 +1 @@
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:assembly
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/filtering-feature/filter-comp-descriptor-path/goals.txt
--
svn:eol-style = native
svn commit: r940419 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: bentmann Date: Mon May 3 11:25:25 2010 New Revision: 940419 URL: http://svn.apache.org/viewvc?rev=940419view=rev Log: o Inherited from maven-plugins:17 o Updated to plexus-utils:2.0.5 o Updated to plexus-io:1.0 Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=940419r1=940418r2=940419view=diff == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon May 3 11:25:25 2010 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version16/version +version17/version /parent artifactIdmaven-assembly-plugin/artifactId @@ -104,7 +104,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-io/artifactId - version1.0-alpha-4/version + version1.0/version exclusions exclusion groupIdorg.codehaus.plexus/groupId @@ -139,7 +139,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version2.0.1/version + version2.0.5/version /dependency dependency groupIdorg.apache.maven/groupId @@ -195,7 +195,7 @@ under the License. dependency groupIdjunit/groupId artifactIdjunit/artifactId - version3.8.1/version + version3.8.2/version scopetest/scope /dependency /dependencies
svn commit: r939983 - /maven/plugin-tools/trunk/pom.xml
Author: bentmann Date: Sat May 1 11:53:33 2010 New Revision: 939983 URL: http://svn.apache.org/viewvc?rev=939983view=rev Log: o Updated to plexus-utils:2.0.5 Modified: maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=939983r1=939982r2=939983view=diff == --- maven/plugin-tools/trunk/pom.xml (original) +++ maven/plugin-tools/trunk/pom.xml Sat May 1 11:53:33 2010 @@ -186,7 +186,7 @@ dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId -version1.5.6/version +version2.0.5/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r939992 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic: src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java verify.groovy
Author: bentmann
Date: Sat May 1 12:19:13 2010
New Revision: 939992
URL: http://svn.apache.org/viewvc?rev=939992view=rev
Log:
o Extended ITs
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
(with props)
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy
Added:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java?rev=939992view=auto
==
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
(added)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
Sat May 1 12:19:13 2010
@@ -0,0 +1,39 @@
+package org.apache.maven.plugin.coreit;
+
+/*
+ * 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.AbstractMojo;
+
+/**
+ * Does nothing special.
+ *
+ * @goal second
+ * @requiresDependencyCollection compile
+ * @threadSafe
+ */
+public class SecondMojo
+extends AbstractMojo
+{
+
+public void execute()
+{
+}
+
+}
Propchange:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
--
svn:eol-style = native
Propchange:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
--
svn:keywords = Author Date Id Revision
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy?rev=939992r1=939991r2=939992view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/java-basic/verify.groovy
Sat May 1 12:19:13 2010
@@ -14,10 +14,12 @@ assert mojo.language.text() == 'java'
assert mojo.description.text() == 'Touches a test file.'
assert mojo.deprecated.text() == Don't use!
assert mojo.requiresDependencyResolution.text() == 'test'
+assert mojo.requiresDependencyCollection.text() == ''
assert mojo.requiresProject.text() == 'true'
assert mojo.requiresOnline.text() == 'false'
assert mojo.requiresDirectInvocation.text() == 'false'
assert mojo.aggregator.text() == 'false'
+assert mojo.threadSafe.text() == 'false'
assert mojo.phase.text() == 'integration-test'
assert mojo.executePhase.text() == 'generate-sources'
assert mojo.executeLifecycle.text() == 'cobertura'
@@ -62,4 +64,9 @@ assert mojo.parameters.parameter[2].requ
assert mojo.parameters.parameter[2].editable.text() == 'true'
assert mojo.parameters.parameter[2].description.text() == ''
+mojo = pluginDescriptor.mojos.mojo.findAll{ it.goal.text() == second}[0]
+
+assert mojo.requiresDependencyCollection.text() == 'compile'
+assert mojo.threadSafe.text() == 'true'
+
return true;
svn commit: r939993 - in /maven/plugin-tools/trunk: maven-plugin-plugin/pom.xml maven-plugin-tools-java/pom.xml maven-plugin-tools-javadoc/pom.xml
Author: bentmann
Date: Sat May 1 12:20:51 2010
New Revision: 939993
URL: http://svn.apache.org/viewvc?rev=939993view=rev
Log:
o Updated to plexus-utils:2.0.5
o Updated to qdox:1.11
o Updated to maven-invoker-plugin:1.5
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=939993r1=939992r2=939993view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sat May 1 12:20:51
2010
@@ -99,7 +99,7 @@
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
-version1.5.6/version
+version2.0.5/version
/dependency
/dependencies
/dependencyManagement
@@ -270,7 +270,7 @@
plugins
plugin
artifactIdmaven-invoker-plugin/artifactId
-version1.4/version
+version1.5/version
configuration
debugtrue/debug
cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=939993r1=939992r2=939993view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Sat May 1
12:20:51 2010
@@ -74,7 +74,7 @@
dependency
groupIdcom.thoughtworks.qdox/groupId
artifactIdqdox/artifactId
- version1.10/version
+ version1.11/version
/dependency
/dependencies
/project
Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=939993r1=939992r2=939993view=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml Sat May 1
12:20:51 2010
@@ -72,7 +72,7 @@
plugins
plugin
artifactIdmaven-invoker-plugin/artifactId
-version1.4/version
+version1.5/version
configuration
debugtrue/debug
cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
svn commit: r940004 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/help-package/ maven-plugin-plugin/src/it/help-package/src/ maven-plugin-plugin/src/it/help-package/src/main/ maven-plugin
Author: bentmann Date: Sat May 1 12:54:30 2010 New Revision: 940004 URL: http://svn.apache.org/viewvc?rev=940004view=rev Log: [MPLUGIN-168] Provide ability to set package of HelpMojo Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties (with props) maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml (with props) maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/src/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/src/main/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/src/main/java/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/src/main/java/test/ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/src/main/java/test/MyMojo.java (with props) maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/verify.bsh (with props) Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties?rev=940004view=auto == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties (added) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties Sat May 1 12:54:30 2010 @@ -0,0 +1 @@ +invoker.goals = compile Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties -- svn:eol-style = native Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/invoker.properties -- svn:keywords = Author Date Id Revision Added: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml?rev=940004view=auto == --- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml (added) +++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml Sat May 1 12:54:30 2010 @@ -0,0 +1,66 @@ +?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 + + groupIdorg.apache.maven.its.plugin/groupId + artifactIdhelp/artifactId + version1.0/version + packagingmaven-plugin/packaging + + description +Tests generation of the help mojo in a user-specified package (MPLUGIN-168). + /description + + properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + /properties + + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0/version +/dependency + /dependencies + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-plugin-plugin/artifactId +version@project.version@/version +configuration + helpPackageNametest.help/helpPackageName +/configuration +executions + execution +idhelp-goal/id +goals + goalhelpmojo/goal +/goals + /execution +/executions + /plugin +/plugins + /build +/project Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml -- svn:eol-style = native Propchange: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml
svn commit: r940009 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin: AbstractGeneratorMojo.java metadata/AddPluginArtifactMetadataMojo.java
Author: bentmann
Date: Sat May 1 13:32:37 2010
New Revision: 940009
URL: http://svn.apache.org/viewvc?rev=940009view=rev
Log:
o Polished code
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=940009r1=940008r2=940009view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
Sat May 1 13:32:37 2010
@@ -48,7 +48,7 @@ public abstract class AbstractGeneratorM
/**
* The project currently being built.
*
- * @parameter expression=${project}
+ * @parameter default-value=${project}
* @required
* @readonly
*/
@@ -118,7 +118,7 @@ public abstract class AbstractGeneratorM
public void execute()
throws MojoExecutionException
{
-if ( !project.getPackaging().equals( maven-plugin ) )
+if ( !maven-plugin.equals( project.getPackaging() ) )
{
return;
}
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java?rev=940009r1=940008r2=940009view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
Sat May 1 13:32:37 2010
@@ -44,7 +44,7 @@ public class AddPluginArtifactMetadataMo
/**
* The project artifact, which should have the LATEST metadata added to it.
*
- * @parameter expression=${project}
+ * @parameter default-value=${project}
* @required
* @readonly
*/
svn commit: r940010 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
Author: bentmann
Date: Sat May 1 13:35:33 2010
New Revision: 940010
URL: http://svn.apache.org/viewvc?rev=940010view=rev
Log:
[MPLUGIN-146] Implement pluginXml parameter for maven-plugin-plugin
o Added a skip parameter instead which simply allows usage of
src/main/resources/META-INF/maven/plugin.xml to yield the desired effect
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java?rev=940010r1=940009r2=940010view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
Sat May 1 13:35:33 2010
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.plugin;
* under the License.
*/
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.tools.plugin.generator.Generator;
import org.apache.maven.tools.plugin.generator.PluginDescriptorGenerator;
@@ -46,6 +47,14 @@ public class DescriptorGeneratorMojo
*/
protected File outputDirectory;
+/**
+ * A flag to disable generation of the codeplugin.xml/code in favor of
a hand authored plugin descriptor.
+ *
+ * @parameter default-value=false
+ * @since 2.6
+ */
+private boolean skipDescriptor;
+
/** {...@inheritdoc} */
protected File getOutputDirectory()
{
@@ -57,4 +66,17 @@ public class DescriptorGeneratorMojo
{
return new PluginDescriptorGenerator();
}
+
+/** {...@inheritdoc} */
+public void execute()
+throws MojoExecutionException
+{
+if ( skipDescriptor )
+{
+return;
+}
+
+super.execute();
+}
+
}
svn commit: r940014 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja
Author: bentmann Date: Sat May 1 13:47:12 2010 New Revision: 940014 URL: http://svn.apache.org/viewvc?rev=940014view=rev Log: [maven-release-plugin] prepare release maven-plugin-tools-2.6 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=940014r1=940013r2=940014view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sat May 1 13:47:12 2010 @@ -28,7 +28,7 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId - version2.6-SNAPSHOT/version + version2.6/version packagingmaven-plugin/packaging nameMaven Plugin Plugin/name @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-plugin/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-plugin/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-plugin/url /scm issueManagement systemjira/system @@ -62,7 +62,7 @@ mavenVersion2.0.6/mavenVersion doxiaVersion1.0/doxiaVersion doxia-sitetoolsVersion1.0/doxia-sitetoolsVersion -pluginToolsVersion2.6-SNAPSHOT/pluginToolsVersion +pluginToolsVersion2.6/pluginToolsVersion /properties !-- Copy from project up -- Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=940014r1=940013r2=940014view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Sat May 1 13:47:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.6-SNAPSHOT/version +version2.6/version /parent artifactIdmaven-plugin-tools-ant/artifactId @@ -34,9 +34,9 @@ descriptionDescriptor extractor for plugins written in Ant./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-ant/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-ant/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-ant/url /scm dependencies Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=940014r1=940013r2=940014view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Sat May 1 13:47:12 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.6-SNAPSHOT/version +version2.6/version /parent artifactIdmaven-plugin-tools-api/artifactId @@ -34,9 +34,9 @@ descriptionThe Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api//connection - developerConnectionscm:svn:https://svn.apache.org/repos
svn commit: r940015 - /maven/plugin-tools/tags/maven-plugin-tools-2.6/
Author: bentmann Date: Sat May 1 13:47:41 2010 New Revision: 940015 URL: http://svn.apache.org/viewvc?rev=940015view=rev Log: [maven-scm] copy for tag maven-plugin-tools-2.6 Added: maven/plugin-tools/tags/maven-plugin-tools-2.6/ - copied from r940014, maven/plugin-tools/trunk/
svn commit: r940017 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja
Author: bentmann Date: Sat May 1 13:48:14 2010 New Revision: 940017 URL: http://svn.apache.org/viewvc?rev=940017view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=940017r1=940016r2=940017view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sat May 1 13:48:14 2010 @@ -28,7 +28,7 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId - version2.6/version + version2.7-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Plugin Plugin/name @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-plugin/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-plugin/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-plugin/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin//url /scm issueManagement systemjira/system @@ -62,7 +62,7 @@ mavenVersion2.0.6/mavenVersion doxiaVersion1.0/doxiaVersion doxia-sitetoolsVersion1.0/doxia-sitetoolsVersion -pluginToolsVersion2.6/pluginToolsVersion +pluginToolsVersion2.7-SNAPSHOT/pluginToolsVersion /properties !-- Copy from project up -- Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=940017r1=940016r2=940017view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Sat May 1 13:48:14 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.6/version +version2.7-SNAPSHOT/version /parent artifactIdmaven-plugin-tools-ant/artifactId @@ -34,9 +34,9 @@ descriptionDescriptor extractor for plugins written in Ant./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-ant/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-ant/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-ant/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant//url /scm dependencies Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=940017r1=940016r2=940017view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Sat May 1 13:48:14 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.6/version +version2.7-SNAPSHOT/version /parent artifactIdmaven-plugin-tools-api/artifactId @@ -34,9 +34,9 @@ descriptionThe Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6/maven-plugin-tools-api/connection - developerConnectionscm:svn:https
svn commit: r940018 - /maven/plugins/trunk/pom.xml
Author: bentmann Date: Sat May 1 13:55:59 2010 New Revision: 940018 URL: http://svn.apache.org/viewvc?rev=940018view=rev Log: o Updated to (staged) maven-plugin-plugin:2.6 in preparation for release Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=940018r1=940017r2=940018view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Sat May 1 13:55:59 2010 @@ -214,7 +214,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.5.1/version +version2.6/version executions execution idgenerated-helpmojo/id @@ -232,7 +232,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId -version2.5.1/version +version2.6/version /plugin /plugins /reporting
svn commit: r940020 - /maven/plugins/trunk/pom.xml
Author: bentmann Date: Sat May 1 13:57:46 2010 New Revision: 940020 URL: http://svn.apache.org/viewvc?rev=940020view=rev Log: [maven-release-plugin] prepare release maven-plugins-18 Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=940020r1=940019r2=940020view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Sat May 1 13:57:46 2010 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId - version18-SNAPSHOT/version + version18/version packagingpom/packaging nameMaven Plugins/name @@ -160,9 +160,9 @@ under the License. /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk//developerConnection -urlhttp://svn.apache.org/viewvc/maven/plugins/trunk//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-18/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-18/developerConnection +urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-18/url /scm distributionManagement site
svn commit: r940021 - /maven/plugins/tags/maven-plugins-18/
Author: bentmann Date: Sat May 1 13:58:10 2010 New Revision: 940021 URL: http://svn.apache.org/viewvc?rev=940021view=rev Log: [maven-scm] copy for tag maven-plugins-18 Added: maven/plugins/tags/maven-plugins-18/ - copied from r940020, maven/plugins/trunk/
svn commit: r940022 - /maven/plugins/trunk/pom.xml
Author: bentmann Date: Sat May 1 13:58:53 2010 New Revision: 940022 URL: http://svn.apache.org/viewvc?rev=940022view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=940022r1=940021r2=940022view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Sat May 1 13:58:53 2010 @@ -29,7 +29,7 @@ under the License. groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId - version18/version + version19-SNAPSHOT/version packagingpom/packaging nameMaven Plugins/name @@ -160,9 +160,9 @@ under the License. /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-18/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-plugins-18/developerConnection -urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-18/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk//developerConnection +urlhttp://svn.apache.org/viewvc/maven/plugins/trunk//url /scm distributionManagement site
svn commit: r940050 - /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt
Author: bentmann
Date: Sat May 1 14:52:21 2010
New Revision: 940050
URL: http://svn.apache.org/viewvc?rev=940050view=rev
Log:
o Added dependency source aggregating example to index page
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt?rev=940050r1=940049r2=940050view=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt Sat May 1
14:52:21 2010
@@ -109,6 +109,8 @@ Maven Javadoc Plugin
* {{{./examples/aggregate.html}Aggregating Javadocs for Multi-Projects}}
+ * {{{./examples/aggregate-dependency-sources.html}Aggregating Dependency
Javadocs}}
+
* {{{./examples/exclude-package-names.html}Excluding Packages}}
* {{{./examples/group-configuration.html}Grouping Packages}}
svn commit: r940051 - /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm
Author: bentmann Date: Sat May 1 14:55:11 2010 New Revision: 940051 URL: http://svn.apache.org/viewvc?rev=940051view=rev Log: o Improved example to use non-forking goals during lifecycle phases Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm?rev=940051r1=940050r2=940051view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate-dependency-sources.apt.vm Sat May 1 14:55:11 2010 @@ -98,10 +98,10 @@ org.test:project-distro:0.1 phasepackage/phase goals !-- produce source artifact for main project sources -- - goaljar/goal + goaljar-no-fork/goal !-- produce source artifact for project test sources -- - goaltest-jar/goal + goaltest-jar-no-fork/goal /goals /execution /executions @@ -113,7 +113,7 @@ org.test:project-distro:0.1 +-+ NOTE: If you don't intend to generate test javadocs that include dependency sources, you can omit the - test-jar goal above. + test-jar-no-fork goal above. At this point, your project is ready to produce the artifacts necessary to support dependency-driven javadoc aggregation. The next time you install or deploy the project, the appropriate artifacts will be available for your distribution
svn commit: r940066 - in /maven/maven-3/trunk/maven-plugin-api/src/test: java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java resources/plugin.xml
Author: bentmann Date: Sat May 1 16:04:39 2010 New Revision: 940066 URL: http://svn.apache.org/viewvc?rev=940066view=rev Log: o Extended tests Modified: maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java maven/maven-3/trunk/maven-plugin-api/src/test/resources/plugin.xml Modified: maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java?rev=940066r1=940065r2=940066view=diff == --- maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java (original) +++ maven/maven-3/trunk/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java Sat May 1 16:04:39 2010 @@ -59,7 +59,7 @@ public class PluginDescriptorBuilderTest assertEquals( plugin-description, pd.getDescription() ); assertEquals( false, pd.isIsolatedRealm() ); assertEquals( true, pd.isInheritedByDefault() ); -assertEquals( 1, pd.getMojos().size() ); +assertEquals( 2, pd.getMojos().size() ); assertEquals( 1, pd.getDependencies().size() ); MojoDescriptor md = pd.getMojos().get( 0 ); @@ -73,6 +73,7 @@ public class PluginDescriptorBuilderTest assertEquals( true, md.isInheritedByDefault() ); assertEquals( false, md.isOnlineRequired() ); assertEquals( true, md.isProjectRequired() ); +assertEquals( false, md.isThreadSafe() ); assertEquals( package, md.getPhase() ); assertEquals( org.apache.maven.plugin.jar.JarMojo, md.getImplementation() ); assertEquals( antrun, md.getComponentConfigurator() ); @@ -117,6 +118,13 @@ public class PluginDescriptorBuilderTest assertEquals( maven-plugin-api, cd.getArtifactId() ); assertEquals( 2.0.6, cd.getVersion() ); assertEquals( jar, cd.getType() ); + +md = pd.getMojos().get( 1 ); + +assertEquals( war, md.getGoal() ); +assertEquals( null, md.getDependencyResolutionRequired() ); +assertEquals( null, md.getDependencyCollectionRequired() ); +assertEquals( true, md.isThreadSafe() ); } } Modified: maven/maven-3/trunk/maven-plugin-api/src/test/resources/plugin.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/test/resources/plugin.xml?rev=940066r1=940065r2=940066view=diff == --- maven/maven-3/trunk/maven-plugin-api/src/test/resources/plugin.xml (original) +++ maven/maven-3/trunk/maven-plugin-api/src/test/resources/plugin.xml Sat May 1 16:04:39 2010 @@ -52,6 +52,10 @@ /requirement /requirements /mojo +mojo + goalwar/goal + threadSafetrue/threadSafe +/mojo /mojos dependencies dependency
svn commit: r940092 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4654/ resources/mng-4654/repo/ resources/mng-4654/repo/org/ resources/mng
Author: bentmann Date: Sat May 1 18:38:16 2010 New Revision: 940092 URL: http://svn.apache.org/viewvc?rev=940092view=rev Log: [MNG-4654] Maven erroneously selects artifact handler contributed by extension plugin for use with project main artifact based on the handler's packaging rather than type o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/its/mng4654/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/its/mng4654/maven-ext-plugin/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/its/mng4654/maven-ext-plugin/1.0/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/its/mng4654/maven-ext-plugin/1.0/maven-ext-plugin-1.0.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/repo/org/apache/maven/its/mng4654/maven-ext-plugin/1.0/maven-ext-plugin-1.0.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4654/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=940092r1=940091r2=940092view=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 May 1 18:38:16 2010 @@ -82,6 +82,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng4654ArtifactHandlerForMainArtifactTest.class ); suite.addTestSuite( MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class ); suite.addTestSuite( MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.class ); suite.addTestSuite( MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java?rev=940092view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java Sat May 1 18:38:16 2010 @@ -0,0 +1,65 @@ +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
svn commit: r939608 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/install-extra-artifacts/ it/install-extra-artifacts/src/ it/install-extra-artifacts/src/it/ it/install-extra-artifacts/src/it
Author: bentmann
Date: Fri Apr 30 09:45:55 2010
New Revision: 939608
URL: http://svn.apache.org/viewvc?rev=939608view=rev
Log:
[MINVOKER-102] Provide a way to install Extra dependencies
Submitted by: Marvin Froeder
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/project/
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/project/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/settings.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml?rev=939608view=auto
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
Fri Apr 30 09:45:55 2010
@@ -0,0 +1,56 @@
+?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
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.invoker/groupId
+ artifactIdlocal-repo-isolated/artifactId
+ version1.0-SNAPSHOT/version
+ packagingpom/packaging
+
+ description
+Test to check for usage of an isolated local repository.
+ /description
+
+ properties
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+ /properties
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-invoker-plugin/artifactId
+version@pom.version@/version
+configuration
+
localRepositoryPath${project.build.directory}/it-repo/localRepositoryPath
+ pomIncludes
+pomInclude*/pom.xml/pomInclude
+ /pomIncludes
+ settingsFilesrc/it/settings.xml/settingsFile
+ extraArtifacts
+extraArtifactasm:asm:3.0/extraArtifact
+
extraArtifactorg.apache.maven.plugins:maven-clean-plugin:2.4:maven-plugin/extraArtifact
+
extraArtifactorg.apache.maven.plugins:maven-clean-plugin:2.4:jar:javadoc/extraArtifact
+ /extraArtifacts
+/configuration
+executions
+ execution
+idintegration-test/id
+phaseinitialize/phase
+goals
+ goalinstall/goal
+/goals
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+
+/project
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/project/pom.xml?rev=939608view=auto
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/it/project/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/install
svn commit: r939618 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Author: bentmann
Date: Fri Apr 30 10:24:21 2010
New Revision: 939618
URL: http://svn.apache.org/viewvc?rev=939618view=rev
Log:
o Polished code
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=939618r1=939617r2=939618view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Fri Apr 30 10:24:21 2010
@@ -29,7 +29,6 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -39,7 +38,6 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.ResolutionNode;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.plugin.AbstractMojo;
@@ -139,7 +137,7 @@ public class InstallMojo
private Collection copiedArtifacts;
/**
- * Extra dependencies that needed to be installed on the local
repository.BR
+ * Extra dependencies that need to be installed on the local
repository.BR
* Format:
*
* pre
@@ -154,9 +152,10 @@ public class InstallMojo
* /pre
*
* If the type is 'maven-plugin' the plugin will try to resolve the
artifact using plugin remote repositories,
- * instead of using artifact remore repository.
+ * instead of using artifact remote repositories.
*
* @parameter
+ * @since 1.6
*/
private String[] extraArtifacts;
@@ -167,11 +166,13 @@ public class InstallMojo
/**
* @parameter default-value=${project.remoteArtifactRepositories}
+ * @readonly
*/
-private List remoteRepositories;
+private List remoteArtifactRepositories;
/**
* @parameter default-value=${project.pluginArtifactRepositories}
+ * @readonly
*/
private List remotePluginRepositories;
@@ -203,10 +204,7 @@ public class InstallMojo
installProjectParents( project, testRepository );
installProjectArtifacts( project, testRepository );
-if ( extraArtifacts != null )
-{
-installExtraArtifacts( testRepository, extraArtifacts );
-}
+installExtraArtifacts( testRepository, extraArtifacts );
}
/**
@@ -598,6 +596,13 @@ public class InstallMojo
private void installExtraArtifacts( ArtifactRepository testRepository,
String[] extraArtifacts )
throws MojoExecutionException
{
+if ( extraArtifacts == null )
+{
+return;
+}
+
+Artifact originatingArtifact = project.getArtifact();
+
for ( int i = 0; i extraArtifacts.length; i++ )
{
String[] gav = extraArtifacts[i].split( : );
@@ -606,15 +611,11 @@ public class InstallMojo
throw new MojoExecutionException( Invalid artifact +
extraArtifacts[i] );
}
-String type = null;
+String type = jar;
if ( gav.length 3 )
{
type = gav[3];
}
-else
-{
-type = jar;
-}
String classifier = null;
if ( gav.length == 5 )
@@ -629,7 +630,7 @@ public class InstallMojo
}
else
{
-remoteRepositories = this.remoteRepositories;
+remoteRepositories = this.remoteArtifactRepositories;
}
Artifact artifact = null;
@@ -637,17 +638,13 @@ public class InstallMojo
{
artifact = artifactFactory.createArtifactWithClassifier(
gav[0], gav[1], gav[2], type, classifier );
-Artifact originatingArtifact =
artifactFactory.createBuildArtifact( dummy, dummy, 1.0, jar );
-
ArtifactResolutionResult arr =
resolver.resolveTransitively( Collections.singleton(
artifact ), originatingArtifact,
remoteRepositories,
localRepository, artifactMetadataSource );
-Set nodes = arr.getArtifactResolutionNodes();
-for ( Iterator iterator = nodes.iterator();
iterator.hasNext
svn commit: r939628 - in /maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts: pom.xml src/ verify.bsh
Author: bentmann
Date: Fri Apr 30 10:47:16 2010
New Revision: 939628
URL: http://svn.apache.org/viewvc?rev=939628view=rev
Log:
o Polished IT
Removed:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/src/
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml?rev=939628r1=939627r2=939628view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
Fri Apr 30 10:47:16 2010
@@ -1,21 +1,34 @@
?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.
- --
+!--
+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
http://maven.apache.org/maven-v4_0_0.xsd;
modelVersion4.0.0/modelVersion
groupIdorg.apache.maven.plugins.invoker/groupId
- artifactIdlocal-repo-isolated/artifactId
+ artifactIdstage-extras/artifactId
version1.0-SNAPSHOT/version
packagingpom/packaging
description
-Test to check for usage of an isolated local repository.
+Test to check for staging of external dependencies directly from local
repository (MINVOKER-102).
/description
properties
@@ -30,13 +43,12 @@
version@pom.version@/version
configuration
localRepositoryPath${project.build.directory}/it-repo/localRepositoryPath
- pomIncludes
-pomInclude*/pom.xml/pomInclude
- /pomIncludes
- settingsFilesrc/it/settings.xml/settingsFile
extraArtifacts
-extraArtifactasm:asm:3.0/extraArtifact
+!-- gid:aid:version --
+extraArtifactjunit:junit:3.8.2/extraArtifact
+!-- gid:aid:version:type --
extraArtifactorg.apache.maven.plugins:maven-clean-plugin:2.4:maven-plugin/extraArtifact
+!-- gid:aid:version:type:classifier --
extraArtifactorg.apache.maven.plugins:maven-clean-plugin:2.4:jar:javadoc/extraArtifact
/extraArtifacts
/configuration
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh?rev=939628r1=939627r2=939628view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
Fri Apr 30 10:47:16 2010
@@ -11,39 +11,27 @@ try
return false;
}
-File installedFile = new File( itRepoDir,
org/apache/maven/plugins/maven-clean-plugin/2.4/maven-clean-plugin-2.4.pom );
-if ( !installedFile.isFile() )
+String[] files =
{
-System.out.println( Installed file missing in local repo: +
installedFile );
-return false;
-}
-
-installedFile = new File( itRepoDir,
org
svn commit: r939631 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml
Author: bentmann Date: Fri Apr 30 10:51:05 2010 New Revision: 939631 URL: http://svn.apache.org/viewvc?rev=939631view=rev Log: [MINVOKER-103] Update to plexus-utils:2.0.4+ to eliminate deadlock potential during forked Maven executions Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=939631r1=939630r2=939631view=diff == --- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Fri Apr 30 10:51:05 2010 @@ -154,7 +154,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version1.5.6/version + version2.0.5/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r939868 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/install-extra-artifacts/pom.xml it/install-extra-artifacts/verify.bsh main/java/org/apache/maven/plugin/invoker/InstallMojo.j
Author: bentmann
Date: Fri Apr 30 22:58:30 2010
New Revision: 939868
URL: http://svn.apache.org/viewvc?rev=939868view=rev
Log:
[MINVOKER-102] Provide a way to install Extra dependencies
o Added support for relocation of root artifact
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml?rev=939868r1=939867r2=939868view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/pom.xml
Fri Apr 30 22:58:30 2010
@@ -50,6 +50,8 @@ under the License.
extraArtifactorg.apache.maven.plugins:maven-clean-plugin:2.4:maven-plugin/extraArtifact
!-- gid:aid:version:type:classifier --
extraArtifactorg.apache.maven.plugins:maven-clean-plugin:2.4:jar:javadoc/extraArtifact
+!-- relocated --
+extraArtifactjdom:jdom:1.1/extraArtifact
/extraArtifacts
/configuration
executions
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh?rev=939868r1=939867r2=939868view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/install-extra-artifacts/verify.bsh
Fri Apr 30 22:58:30 2010
@@ -23,6 +23,9 @@ try
org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom,
junit/junit/3.8.2/junit-3.8.2.jar,
junit/junit/3.8.2/junit-3.8.2.pom,
+jdom/jdom/1.1/jdom-1.1.pom,
+org/jdom/jdom/1.1/jdom-1.1.pom,
+org/jdom/jdom/1.1/jdom-1.1.jar,
};
for ( String file : files )
{
@@ -32,6 +35,10 @@ try
{
throw new IllegalStateException( Missing: + stagedFile );
}
+if ( file.endsWith( jdom-1.1.jar ) stagedFile.length() 1024 *
10 )
+{
+throw new IllegalStateException( Corrupt: + stagedFile );
+}
}
}
catch( Throwable t )
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=939868r1=939867r2=939868view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Fri Apr 30 22:58:30 2010
@@ -522,6 +522,8 @@ public class InstallMojo
private void copyArtifact( Artifact artifact, ArtifactRepository
testRepository )
throws MojoExecutionException
{
+copyPoms( artifact, testRepository );
+
Artifact depArtifact =
artifactFactory.createArtifactWithClassifier(
artifact.getGroupId(), artifact.getArtifactId(),
artifact.getBaseVersion(), artifact.getType(),
@@ -529,22 +531,23 @@ public class InstallMojo
File artifactFile = artifact.getFile();
+copyArtifact( artifactFile, depArtifact, testRepository );
+}
+
+private void copyPoms( Artifact artifact, ArtifactRepository
testRepository )
+throws MojoExecutionException
+{
Artifact pomArtifact =
-artifactFactory.createProjectArtifact( depArtifact.getGroupId(),
depArtifact.getArtifactId(),
-
depArtifact.getBaseVersion() );
+artifactFactory.createProjectArtifact( artifact.getGroupId(),
artifact.getArtifactId(),
+ artifact.getBaseVersion() );
File pomFile = new File( localRepository.getBasedir(),
localRepository.pathOf( pomArtifact ) );
if ( pomFile.isFile() )
{
-if ( !pomArtifact.getId().equals( depArtifact.getId() ) )
-{
-copyArtifact( pomFile, pomArtifact, testRepository );
-}
+copyArtifact( pomFile, pomArtifact, testRepository );
copyParentPoms( pomFile, testRepository
svn commit: r939034 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
Author: bentmann
Date: Wed Apr 28 18:04:12 2010
New Revision: 939034
URL: http://svn.apache.org/viewvc?rev=939034view=rev
Log:
o Formatted code
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java?rev=939034r1=939033r2=939034view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
Wed Apr 28 18:04:12 2010
@@ -154,13 +154,7 @@ public class LifecycleStarter
}
}
-
-catch (
-
-Exception e
-
-)
-
+catch ( Exception e )
{
result.addException( e );
}
@@ -193,4 +187,4 @@ public class LifecycleStarter
}
}
}
-}
\ No newline at end of file
+}
svn commit: r938352 - /maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
Author: bentmann Date: Tue Apr 27 08:21:43 2010 New Revision: 938352 URL: http://svn.apache.org/viewvc?rev=938352view=rev Log: [MRRESOURCES-49] bump parent to org.apache.maven.plugins:maven-plugins:17 Submitted by: jieryn Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=938352r1=938351r2=938352view=diff == --- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Tue Apr 27 08:21:43 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version16/version +version17/version /parent artifactIdmaven-remote-resources-plugin/artifactId
svn commit: r938354 - /maven/plugins/trunk/pom.xml
Author: bentmann Date: Tue Apr 27 08:23:27 2010 New Revision: 938354 URL: http://svn.apache.org/viewvc?rev=938354view=rev Log: o Included maven-remote-resources-plugin in reactor for Maven 3.x Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=938354r1=938353r2=938354view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Tue Apr 27 08:23:27 2010 @@ -326,6 +326,7 @@ under the License. /activation modules modulemaven-project-info-reports-plugin/module +modulemaven-remote-resources-plugin/module /modules /profile /profiles
svn commit: r938367 - in /maven/plugins/trunk: maven-ant-plugin/ maven-clean-plugin/ maven-compiler-plugin/ maven-dependency-plugin/ maven-deploy-plugin/ maven-install-plugin/ maven-invoker-plugin/ ma
Author: bentmann Date: Tue Apr 27 09:16:11 2010 New Revision: 938367 URL: http://svn.apache.org/viewvc?rev=938367view=rev Log: o Inherited from maven-plugins:17 Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml maven/plugins/trunk/maven-clean-plugin/pom.xml maven/plugins/trunk/maven-compiler-plugin/pom.xml maven/plugins/trunk/maven-dependency-plugin/pom.xml maven/plugins/trunk/maven-deploy-plugin/pom.xml maven/plugins/trunk/maven-install-plugin/pom.xml maven/plugins/trunk/maven-invoker-plugin/pom.xml maven/plugins/trunk/maven-jar-plugin/pom.xml maven/plugins/trunk/maven-jarsigner-plugin/pom.xml maven/plugins/trunk/maven-patch-plugin/pom.xml maven/plugins/trunk/maven-rar-plugin/pom.xml maven/plugins/trunk/maven-repository-plugin/pom.xml maven/plugins/trunk/maven-source-plugin/pom.xml maven/plugins/trunk/maven-toolchains-plugin/pom.xml maven/plugins/trunk/maven-verifier-plugin/pom.xml maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=938367r1=938366r2=938367view=diff == --- maven/plugins/trunk/maven-ant-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ant-plugin/pom.xml Tue Apr 27 09:16:11 2010 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version16/version +version17/version /parent artifactIdmaven-ant-plugin/artifactId Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=938367r1=938366r2=938367view=diff == --- maven/plugins/trunk/maven-clean-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/pom.xml Tue Apr 27 09:16:11 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version16/version +version17/version /parent artifactIdmaven-clean-plugin/artifactId Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=938367r1=938366r2=938367view=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Tue Apr 27 09:16:11 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version16/version +version17/version /parent artifactIdmaven-compiler-plugin/artifactId Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=938367r1=938366r2=938367view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Apr 27 09:16:11 2010 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version16/version +version17/version /parent artifactIdmaven-dependency-plugin/artifactId Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=938367r1=938366r2=938367view=diff == --- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Tue Apr 27 09:16:11 2010 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version16/version +version17/version /parent artifactIdmaven-deploy-plugin/artifactId Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=938367r1=938366r2=938367view=diff == --- maven/plugins/trunk/maven-install-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-install-plugin/pom.xml Tue Apr 27 09:16:11 2010 @@ -25,7 +25,7 @@ under the License. parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version16/version +version17/version /parent artifactIdmaven-install-plugin/artifactId Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=938367r1=938366r2
svn commit: r938393 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
Author: bentmann
Date: Tue Apr 27 10:15:27 2010
New Revision: 938393
URL: http://svn.apache.org/viewvc?rev=938393view=rev
Log:
o Made programming errors show up as internal errors to the user
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java?rev=938393r1=938392r2=938393view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
Tue Apr 27 10:15:27 2010
@@ -14,6 +14,7 @@
*/
package org.apache.maven.lifecycle.internal;
+import org.apache.maven.InternalErrorException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.BuildFailure;
import org.apache.maven.execution.ExecutionEvent;
@@ -92,8 +93,13 @@ public class BuilderCommon
public void handleBuildError( final ReactorContext buildContext, final
MavenSession rootSession,
- final MavenProject mavenProject, final
Exception e, final long buildStartTime )
+ final MavenProject mavenProject, Exception
e, final long buildStartTime )
{
+if ( e instanceof RuntimeException )
+{
+e = new InternalErrorException( Internal error: + e, e );
+}
+
buildContext.getResult().addException( e );
long buildEndTime = System.currentTimeMillis();
svn commit: r938410 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/ test/java/org/apache/maven/model/validation/ test/resources/poms/validation/
Author: bentmann
Date: Tue Apr 27 11:09:54 2010
New Revision: 938410
URL: http://svn.apache.org/viewvc?rev=938410view=rev
Log:
[MNG-4648] NullPointerException thrown from
DefaultPluginRealmCache#pluginHashCode method if project-level plugin
dependency misses version
Added:
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-version.xml
(with props)
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-artifactId.xml
(with props)
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml
(with props)
maven/maven-3/trunk/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-version.xml
(with props)
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
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=938410r1=938409r2=938410view=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 Apr 27 11:09:54 2010
@@ -253,12 +253,7 @@ public class DefaultModelValidator
validateBoolean( build.plugins.plugin.extensions,
problems, errOn30, p.getExtensions(),
p.getKey() );
-for ( Dependency d : p.getDependencies() )
-{
-validateEnum( build.plugins.plugin[ + p.getKey() +
].dependencies.dependency.scope,
- problems, errOn30, d.getScope(),
d.getManagementKey(),
- compile, runtime, system );
-}
+validateEffectivePluginDependencies( problems, p, request
);
}
validateResources( problems, build.getResources(),
build.resources.resource, request );
@@ -365,67 +360,21 @@ public class DefaultModelValidator
}
private void validateEffectiveDependencies( ModelProblemCollector
problems, ListDependency dependencies,
-boolean managed,
ModelBuildingRequest request )
+boolean management,
ModelBuildingRequest request )
{
Severity errOn30 = getSeverity( request,
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
-String prefix = managed ?
dependencyManagement.dependencies.dependency. : dependencies.dependency.;
+String prefix = management ?
dependencyManagement.dependencies.dependency. : dependencies.dependency.;
for ( Dependency d : dependencies )
{
-validateId( prefix + artifactId, problems, d.getArtifactId(),
d.getManagementKey() );
-
-validateId( prefix + groupId, problems, d.getGroupId(),
d.getManagementKey() );
-
-if ( !managed )
-{
-validateStringNotEmpty( prefix + type, problems,
Severity.ERROR, d.getType(), d.getManagementKey() );
-
-validateStringNotEmpty( prefix + version, problems,
Severity.ERROR, d.getVersion(),
-d.getManagementKey() );
-}
-
-if ( system.equals( d.getScope() ) )
-{
-String systemPath = d.getSystemPath();
-
-if ( StringUtils.isEmpty( systemPath ) )
-{
-addViolation( problems, Severity.ERROR, prefix +
systemPath, d.getManagementKey(), is missing. );
-}
-else
-{
-File sysFile = new File( systemPath );
-if ( !sysFile.isAbsolute() )
-{
-addViolation( problems, Severity.ERROR, prefix +
systemPath, d.getManagementKey(),
- must specify an absolute path but is
+ systemPath );
-}
-else if ( !sysFile.isFile() )
-{
-String msg = refers to a non-existing file +
sysFile.getAbsolutePath();
-systemPath = systemPath.replace( '/',
File.separatorChar ).replace( '\\', File.separatorChar );
-String jdkHome
svn commit: r938411 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Author: bentmann
Date: Tue Apr 27 11:11:49 2010
New Revision: 938411
URL: http://svn.apache.org/viewvc?rev=938411view=rev
Log:
o Polished log output
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=938411r1=938410r2=938411view=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
Tue Apr 27 11:11:49 2010
@@ -415,8 +415,8 @@ public class DefaultMaven
for ( ModelProblem problem : result.getProblems() )
{
-logger.warn( problem.getMessage() + @
-+ ModelProblemUtils.formatLocation( problem,
result.getProjectId() ) );
+String location = ModelProblemUtils.formatLocation(
problem, result.getProjectId() );
+logger.warn( problem.getMessage() + (
StringUtils.isNotEmpty( location ) ? @ + location : ) );
}
problems = true;
svn commit: r938420 - /maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo
Author: bentmann Date: Tue Apr 27 12:33:00 2010 New Revision: 938420 URL: http://svn.apache.org/viewvc?rev=938420view=rev Log: o Extended documentation 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=938420r1=938419r2=938420view=diff == --- maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo (original) +++ maven/maven-3/trunk/maven-model/src/main/mdo/maven.mdo Tue Apr 27 12:33:00 2010 @@ -1980,14 +1980,16 @@ description ![CDATA[ The relative path of the parent codepom.xml/code file within the check out. -The default value is code../pom.xml/code. -Maven looks for the parent pom first in this location on +If not specified, it defaults to code../pom.xml/code. +Maven looks for the parent POM first in this location on the filesystem, then the local repository, and lastly in the remote repo. coderelativePath/code allows you to select a different location, -for example when your structure is flat, or deeper without an intermediate parent pom. +for example when your structure is flat, or deeper without an intermediate parent POM. However, the group ID, artifact ID and version are still required, and must match the file in the location given or it will revert to the repository for the POM. This feature is only for enhancing the development in a local checkout of that project. +Set the value to an empty string in case you want to disable the feature and always resolve +the parent POM from the repositories. ]] /description typeString/type
svn commit: r938491 - /maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
Author: bentmann
Date: Tue Apr 27 15:00:34 2010
New Revision: 938491
URL: http://svn.apache.org/viewvc?rev=938491view=rev
Log:
o Simplfied code
Modified:
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
Modified:
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java?rev=938491r1=938490r2=938491view=diff
==
---
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
(original)
+++
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
Tue Apr 27 15:00:34 2010
@@ -63,14 +63,14 @@ public class PluginDescriptorBuilder
if ( isolatedRealm != null )
{
-pluginDescriptor.setIsolatedRealm( Boolean.valueOf( isolatedRealm
).booleanValue() );
+pluginDescriptor.setIsolatedRealm( Boolean.parseBoolean(
isolatedRealm ) );
}
String inheritedByDefault = c.getChild( inheritedByDefault
).getValue();
if ( inheritedByDefault != null )
{
-pluginDescriptor.setInheritedByDefault( Boolean.valueOf(
inheritedByDefault ).booleanValue() );
+pluginDescriptor.setInheritedByDefault( Boolean.parseBoolean(
inheritedByDefault ) );
}
//
--
@@ -213,49 +213,49 @@ public class PluginDescriptorBuilder
if ( directInvocationOnly != null )
{
-mojo.setDirectInvocationOnly( Boolean.valueOf(
directInvocationOnly ).booleanValue() );
+mojo.setDirectInvocationOnly( Boolean.parseBoolean(
directInvocationOnly ) );
}
String requiresProject = c.getChild( requiresProject ).getValue();
if ( requiresProject != null )
{
-mojo.setProjectRequired( Boolean.valueOf( requiresProject
).booleanValue() );
+mojo.setProjectRequired( Boolean.parseBoolean( requiresProject ) );
}
String requiresReports = c.getChild( requiresReports ).getValue();
if ( requiresReports != null )
{
-mojo.setRequiresReports( Boolean.valueOf( requiresReports
).booleanValue() );
+mojo.setRequiresReports( Boolean.parseBoolean( requiresReports ) );
}
String aggregator = c.getChild( aggregator ).getValue();
if ( aggregator != null )
{
-mojo.setAggregator( Boolean.valueOf( aggregator ).booleanValue() );
+mojo.setAggregator( Boolean.parseBoolean( aggregator ) );
}
String requiresOnline = c.getChild( requiresOnline ).getValue();
if ( requiresOnline != null )
{
-mojo.setOnlineRequired( Boolean.valueOf( requiresOnline
).booleanValue() );
+mojo.setOnlineRequired( Boolean.parseBoolean( requiresOnline ) );
}
String inheritedByDefault = c.getChild( inheritedByDefault
).getValue();
if ( inheritedByDefault != null )
{
-mojo.setInheritedByDefault( Boolean.valueOf( inheritedByDefault
).booleanValue() );
+mojo.setInheritedByDefault( Boolean.parseBoolean(
inheritedByDefault ) );
}
String threadSafe = c.getChild( threadSafe ).getValue();
if ( threadSafe != null )
{
-mojo.setThreadSafe( Boolean.valueOf( threadSafe ).booleanValue() );
+mojo.setThreadSafe( Boolean.parseBoolean( threadSafe ) );
}
//
--
@@ -280,7 +280,7 @@ public class PluginDescriptorBuilder
String required = d.getChild( required ).getValue();
-parameter.setRequired( Boolean.valueOf( required ).booleanValue()
);
+parameter.setRequired( Boolean.parseBoolean( required ) );
PlexusConfiguration editableConfig = d.getChild( editable );
@@ -289,7 +289,7 @@ public class PluginDescriptorBuilder
{
String editable = d.getChild( editable ).getValue();
-parameter.setEditable( editable == null || Boolean.valueOf(
editable ).booleanValue() );
+parameter.setEditable( editable == null ||
Boolean.parseBoolean( editable ) );
}
parameter.setDescription( d.getChild( description ).getValue() );
svn commit: r938155 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4644/
Author: bentmann
Date: Mon Apr 26 17:56:55 2010
New Revision: 938155
URL: http://svn.apache.org/viewvc?rev=938155view=rev
Log:
[MNG-4644] Misplaced text contents in root element of POM is not rejected by
parser
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4644/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4644/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=938155r1=938154r2=938155view=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
Mon Apr 26 17:56:55 2010
@@ -82,6 +82,7 @@ public class IntegrationTestSuite
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite(
MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class );
suite.addTestSuite(
MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.class );
suite.addTestSuite(
MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.class );
suite.addTestSuite(
MavenITmng4618AggregatorBuiltAfterModulesTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java?rev=938155view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java
Mon Apr 26 17:56:55 2010
@@ -0,0 +1,69 @@
+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.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-4644;MNG-4644/a.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4644StrictPomParsingRejectsMisplacedTextTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng4644StrictPomParsingRejectsMisplacedTextTest()
+{
+super( [3.0-alpha-7,) );
+}
+
+/**
+ * Verify that misplaced text inside the project element of a POM causes a
parser error during reactor builds.
+ */
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-4644 );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+try
+{
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+
+fail( Should fail to validate the POM syntax due to misplaced
text in project element. );
+}
+catch ( VerificationException e )
+{
+// expected
+}
+finally
+{
+verifier.resetStreams();
+}
+}
+
+}
Propchange:
maven/core-integration-testing/trunk
svn commit: r938250 - in /maven/plugin-tools/trunk: maven-plugin-plugin/pom.xml pom.xml
Author: bentmann Date: Mon Apr 26 21:51:25 2010 New Revision: 938250 URL: http://svn.apache.org/viewvc?rev=938250view=rev Log: o Inherited from maven-plugins:17 and maven-parent:16 Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=938250r1=938249r2=938250view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon Apr 26 21:51:25 2010 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version16/version +version17/version /parent groupIdorg.apache.maven.plugins/groupId Modified: maven/plugin-tools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=938250r1=938249r2=938250view=diff == --- maven/plugin-tools/trunk/pom.xml (original) +++ maven/plugin-tools/trunk/pom.xml Mon Apr 26 21:51:25 2010 @@ -25,7 +25,7 @@ parent artifactIdmaven-parent/artifactId groupIdorg.apache.maven/groupId -version15/version +version16/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r938255 - in /maven/plugin-tools/trunk: ./ maven-plugin-plugin/ maven-plugin-tools-ant/ maven-plugin-tools-api/ maven-plugin-tools-beanshell/ maven-plugin-tools-java/ maven-plugin-tools-ja
Author: bentmann Date: Mon Apr 26 21:57:50 2010 New Revision: 938255 URL: http://svn.apache.org/viewvc?rev=938255view=rev Log: o Bumped version to 2.6-SNAPSHOT to account for recent feature additions Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml maven/plugin-tools/trunk/maven-plugin-tools-model/pom.xml maven/plugin-tools/trunk/pom.xml Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=938255r1=938254r2=938255view=diff == --- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon Apr 26 21:57:50 2010 @@ -28,7 +28,7 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugin-plugin/artifactId - version2.5.2-SNAPSHOT/version + version2.6-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven Plugin Plugin/name @@ -62,7 +62,7 @@ mavenVersion2.0.6/mavenVersion doxiaVersion1.0/doxiaVersion doxia-sitetoolsVersion1.0/doxia-sitetoolsVersion -pluginToolsVersion2.5.2-SNAPSHOT/pluginToolsVersion +pluginToolsVersion2.6-SNAPSHOT/pluginToolsVersion /properties !-- Copy from project up -- Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=938255r1=938254r2=938255view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Mon Apr 26 21:57:50 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.5.2-SNAPSHOT/version +version2.6-SNAPSHOT/version /parent artifactIdmaven-plugin-tools-ant/artifactId Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=938255r1=938254r2=938255view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Mon Apr 26 21:57:50 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.5.2-SNAPSHOT/version +version2.6-SNAPSHOT/version /parent artifactIdmaven-plugin-tools-api/artifactId Modified: maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml?rev=938255r1=938254r2=938255view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-beanshell/pom.xml Mon Apr 26 21:57:50 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.5.2-SNAPSHOT/version +version2.6-SNAPSHOT/version /parent artifactIdmaven-plugin-tools-beanshell/artifactId Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=938255r1=938254r2=938255view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Mon Apr 26 21:57:50 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.5.2-SNAPSHOT/version +version2.6-SNAPSHOT/version /parent artifactIdmaven-plugin-tools-java/artifactId Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=938255r1=938254r2=938255view=diff == --- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml Mon Apr 26 21:57:50 2010 @@ -25,7 +25,7 @@ parent groupIdorg.apache.maven.plugin-tools/groupId artifactIdmaven-plugin-tools/artifactId -version2.5.2
svn commit: r938263 - in /maven/plugin-tools/trunk: maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/ ma
Author: bentmann
Date: Mon Apr 26 22:48:25 2010
New Revision: 938263
URL: http://svn.apache.org/viewvc?rev=938263view=rev
Log:
o Polished code
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedMojoDescriptor.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc.properties
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_de.properties
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_fr.properties
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoAnnotation.java
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedMojoDescriptor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedMojoDescriptor.java?rev=938263r1=938262r2=938263view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedMojoDescriptor.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/ExtendedMojoDescriptor.java
Mon Apr 26 22:48:25 2010
@@ -41,12 +41,12 @@ public class ExtendedMojoDescriptor
this.threadSafe = threadSafe;
}
-public String getRequiresDependencyCollection()
+public String getDependencyCollectionRequired()
{
return requiresDependencyCollection;
}
-public void setRequiresDependencyCollection( String
requiresDependencyCollection )
+public void setDependencyCollectionRequired( String
requiresDependencyCollection )
{
this.requiresDependencyCollection = requiresDependencyCollection;
}
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=938263r1=938262r2=938263view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
Mon Apr 26 22:48:25 2010
@@ -309,14 +309,13 @@ public class PluginDescriptorGenerator
if ( mojoDescriptor instanceof ExtendedMojoDescriptor )
{
ExtendedMojoDescriptor extendedMojoDescriptor =
(ExtendedMojoDescriptor) mojoDescriptor;
-if ( extendedMojoDescriptor.getRequiresDependencyCollection() !=
null )
+if ( extendedMojoDescriptor.getDependencyCollectionRequired() !=
null )
{
PluginUtils.element( w, requiresDependencyCollection,
-
extendedMojoDescriptor.getRequiresDependencyCollection() );
+
extendedMojoDescriptor.getDependencyCollectionRequired() );
}
-PluginUtils.element( w, threadSafe, + (
(ExtendedMojoDescriptor) mojoDescriptor ).isThreadSafe() );
-
+PluginUtils.element( w, threadSafe, +
extendedMojoDescriptor.isThreadSafe() );
}
//
--
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=938263r1=938262r2=938263view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
(original)
+++
maven/plugin-tools/trunk
svn commit: r937218 - /maven/maven-3/trunk/pom.xml
Author: bentmann Date: Fri Apr 23 09:50:50 2010 New Revision: 937218 URL: http://svn.apache.org/viewvc?rev=937218view=rev Log: o Disabled cobertura-maven-plugin to get site generation working 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=937218r1=937217r2=937218view=diff == --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Fri Apr 23 09:50:50 2010 @@ -462,6 +462,17 @@ targetJdk1.5/targetJdk /configuration /plugin + plugin +groupIdorg.codehaus.mojo/groupId +artifactIdcobertura-maven-plugin/artifactId +version2.2/version +reportSets + reportSet +!-- Disabled at it kills the site generation via a NoClassDefFoundError -- +reports/reports + /reportSet +/reportSets + /plugin /plugins /reporting /profile
svn commit: r937234 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/DefaultModelProblem.java interpolation/AbstractStringBasedModelInterpolator.java
Author: bentmann
Date: Fri Apr 23 10:29:12 2010
New Revision: 937234
URL: http://svn.apache.org/viewvc?rev=937234view=rev
Log:
o Fixed javadoc
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java?rev=937234r1=937233r2=937234view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
Fri Apr 23 10:29:12 2010
@@ -50,7 +50,8 @@ public class DefaultModelProblem
* Creates a new problem with the specified message and exception.
*
* @param message The message describing the problem, may be {...@code
null}.
- * @param severity The severity level of the problem, may be {...@code
null} to default to {...@link Severity#ERROR}.
+ * @param severity The severity level of the problem, may be {...@code
null} to default to
+ *{...@link ModelProblem.Severity#ERROR}.
* @param source The source of the problem, may be {...@code null}.
* @param lineNumber The one-based index of the line containing the error
or {...@code -1} if unknown.
* @param columnNumber The one-based index of the column containing the
error or {...@code -1} if unknown.
@@ -67,7 +68,8 @@ public class DefaultModelProblem
* Creates a new problem with the specified message and exception.
*
* @param message The message describing the problem, may be {...@code
null}.
- * @param severity The severity level of the problem, may be {...@code
null} to default to {...@link Severity#ERROR}.
+ * @param severity The severity level of the problem, may be {...@code
null} to default to
+ *{...@link ModelProblem.Severity#ERROR}.
* @param source A hint about the source of the problem like a file path,
may be {...@code null}.
* @param lineNumber The one-based index of the line containing the
problem or {...@code -1} if unknown.
* @param columnNumber The one-based index of the column containing the
problem or {...@code -1} if unknown.
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java?rev=937234r1=937233r2=937234view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
Fri Apr 23 10:29:12 2010
@@ -42,7 +42,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
@@ -52,7 +51,6 @@ import java.util.Properties;
*
* @author jdcasey Created on Feb 3, 2005
* @version $Id$
- * @todo Consolidate this logic with the PluginParameterExpressionEvaluator,
minus deprecations/bans.
*/
public abstract class AbstractStringBasedModelInterpolator
implements ModelInterpolator
svn commit: r937263 - in /maven/site/trunk: pom.xml src/site/apt/docs/3.0-beta-1/ src/site/apt/docs/3.0-beta-1/release-notes.apt.vm src/site/apt/docs/3.0-beta-1/release-notes.txt
Author: bentmann
Date: Fri Apr 23 11:52:53 2010
New Revision: 937263
URL: http://svn.apache.org/viewvc?rev=937263view=rev
Log:
o Added release notes for apache-maven:3.0-beta-1
Added:
maven/site/trunk/src/site/apt/docs/3.0-beta-1/
- copied from r937218, maven/site/trunk/src/site/apt/docs/3.0-alpha-7/
Modified:
maven/site/trunk/pom.xml
maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.apt.vm
maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.txt
Modified: maven/site/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=937263r1=937262r2=937263view=diff
==
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Fri Apr 23 11:52:53 2010
@@ -271,10 +271,10 @@
current20xReleaseDate25 Feb 2010/current20xReleaseDate
currentStableVersion2.2.1/currentStableVersion
currentStableReleaseDate11 August 2009/currentStableReleaseDate
-currentDevelopmentVersion3.0-alpha-7/currentDevelopmentVersion
-currentDevelopmentReleaseDate13 March
2010/currentDevelopmentReleaseDate
+currentDevelopmentVersion3.0-beta-1/currentDevelopmentVersion
+currentDevelopmentReleaseDate23 April
2010/currentDevelopmentReleaseDate
releasedVersions2.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/releasedVersions
-
developmentVersions3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3/developmentVersions
+
developmentVersions3.0-beta-1,3.0-alpha-7,3.0-alpha-6,3.0-alpha-5,3.0-alpha-4,3.0-alpha-3/developmentVersions
site.deploy.urlscp://people.apache.org/www/maven.apache.org//site.deploy.url
/properties
Modified: maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.apt.vm
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.apt.vm?rev=937263r1=937218r2=937263view=diff
==
--- maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.apt.vm
(original)
+++ maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.apt.vm Fri Apr
23 11:52:53 2010
@@ -1,9 +1,9 @@
--
-Release Notes - Maven 3.0-alpha-7
+Release Notes - Maven 3.0-beta-1
--
Brett Porter
--
-13 March 2010
+23 April 2010
--
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -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-alpha-7
+Maven 3.0-beta-1
- The Apache Maven team would like to announce the release of Maven
3.0-alpha-7.
+ The Apache Maven team would like to announce the release of Maven 3.0-beta-1.
- Maven 3.0-alpha-7 is {{{../../download.html} available for download}} from
the 'preview' section.
+ Maven 3.0-beta-1 is {{{../../download.html} available for download}} from
the 'preview' section.
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-beta-1/release-notes.txt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.txt?rev=937263r1=937218r2=937263view=diff
==
--- maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.txt (original)
+++ maven/site/trunk/src/site/apt/docs/3.0-beta-1/release-notes.txt Fri Apr 23
11:52:53 2010
@@ -1,69 +1,103 @@
-* Maven 3.0-alpha-7 Release Notes
+* Maven 3.0-beta-1 Release Notes
Maven 3 aims to ensure backward compatibility, improve usability, increase
performance, allow safe embedding, and pave the way
to implement many highly demanded features.
+
+ Noteworthy changes in this release are the revision of version range to no
longer include snapshot versions unless
+ explicitly matched by a range boundary (cf. [MNG-3092]) and the support for
parallel builds (cf. [MNG-3092]).
+ Users that intent to use this feature are strongly advised to read the
+
{{{https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3}
Guide on Parallel Builds}}
+ to learn about potential ramifications.
- The full list of changes can be found in our
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=16087styleName=TextprojectId=10500}issue
management system}}, and is reproduced below.
+ The full list of changes can be found in our
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10500version=16089}issue
management system}}, and is reproduced below.
** Known Incompatibilities with Maven 2
Please refer to the following
{{{http://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html}
compatibility notes}}.
-** Release Notes
svn commit: r935534 - in /maven/maven-3/branches/MNG-1803: maven-core/src/main/java/org/apache/maven/project/ maven-model-builder/src/main/java/org/apache/maven/model/building/
Author: bentmann
Date: Mon Apr 19 11:38:27 2010
New Revision: 935534
URL: http://svn.apache.org/viewvc?rev=935534view=rev
Log:
o Added request option to enable location tracking
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=935534r1=935533r2=935534view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Mon Apr 19 11:38:27 2010
@@ -110,6 +110,7 @@ public class DefaultProjectBuilder
request.setPomFile( pomFile );
request.setModelSource( modelSource );
+request.setLocationTracking( pomFile != null );
ModelBuildingResult result;
try
@@ -310,6 +311,7 @@ public class DefaultProjectBuilder
request.setPomFile( pomFile );
request.setTwoPhaseBuilding( true );
+request.setLocationTracking( true );
request.setModelCache( modelCache );
DefaultModelBuildingListener listener =
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=935534r1=935533r2=935534view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Mon Apr 19 11:38:27 2010
@@ -346,7 +346,7 @@ public class DefaultModelBuilder
try
{
boolean strict = request.getValidationLevel() =
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
-InputSource source = strict ? new InputSource() : null;
+InputSource source = request.isLocationTracking() ? new
InputSource() : null;
MapString, Object options = new HashMapString, Object();
options.put( ModelProcessor.IS_STRICT, Boolean.valueOf( strict ) );
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java?rev=935534r1=935533r2=935534view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java
Mon Apr 19 11:38:27 2010
@@ -47,6 +47,8 @@ public class DefaultModelBuildingRequest
private boolean twoPhaseBuilding;
+private boolean locationTracking;
+
private ListProfile profiles;
private ListString activeProfileIds;
@@ -155,6 +157,18 @@ public class DefaultModelBuildingRequest
return this;
}
+public boolean isLocationTracking()
+{
+return locationTracking;
+}
+
+public DefaultModelBuildingRequest setLocationTracking( boolean
locationTracking )
+{
+this.locationTracking = locationTracking;
+
+return this;
+}
+
public ListProfile getProfiles()
{
if ( profiles == null )
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building
svn commit: r935539 - in /maven/maven-3/branches/MNG-1803: maven-core/src/main/java/org/apache/maven/model/plugin/ maven-model-builder/src/main/java/org/apache/maven/model/building/ maven-model-builde
Author: bentmann
Date: Mon Apr 19 12:05:57 2010
New Revision: 935539
URL: http://svn.apache.org/viewvc?rev=935539view=rev
Log:
o Extended location reporting
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
Modified:
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java?rev=935539r1=935538r2=935539view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
Mon Apr 19 12:05:57 2010
@@ -64,7 +64,7 @@ public class DefaultLifecycleBindingsInj
if ( defaultPlugins == null )
{
-problems.add( Severity.ERROR, Unknown packaging: + packaging,
null, null );
+problems.add( Severity.ERROR, Unknown packaging: + packaging,
model.getLocation( packaging ), null );
}
else if ( !defaultPlugins.isEmpty() )
{
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=935539r1=935538r2=935539view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Mon Apr 19 12:05:57 2010
@@ -466,7 +466,8 @@ public class DefaultModelBuilder
}
catch ( InvalidRepositoryException e )
{
-problems.add( Severity.ERROR, Invalid repository +
repository.getId() + : + e.getMessage(), null, e );
+problems.add( Severity.ERROR, Invalid repository +
repository.getId() + : + e.getMessage(),
+ repository.getLocation( ), e );
}
}
}
@@ -595,7 +596,7 @@ public class DefaultModelBuilder
{
problems.add( Severity.ERROR, Invalid packaging for parent
POM
+ ModelProblemUtils.toSourceHint( parentModel ) + , must
be \pom\ but is \
-+ parentModel.getPackaging() + \, null, null );
++ parentModel.getPackaging() + \,
parentModel.getLocation( packaging ), null );
}
}
else
@@ -640,7 +641,7 @@ public class DefaultModelBuilder
problems.add( Severity.WARNING, 'parent.relativePath' of POM
+ ModelProblemUtils.toSourceHint( childModel ) + points at
+ groupId + : + artifactId
+ instead of + parent.getGroupId() + : +
parent.getArtifactId()
-+ , please verify your project structure, null, null );
++ , please verify your project structure,
childModel.getLocation( parent ), null );
return null;
}
if ( version == null || !version.equals( parent.getVersion() ) )
@@ -711,7 +712,7 @@ public class DefaultModelBuilder
{
problems.add( Severity.FATAL, Non-resolvable parent POM
+ ModelProblemUtils.toId( groupId, artifactId, version ) +
for
-+ ModelProblemUtils.toId( childModel ) + : +
e.getMessage(), null, e );
++ ModelProblemUtils.toId( childModel ) + : +
e.getMessage(), childModel.getLocation( parent ), e );
throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
problems.getProblems() );
}
@@ -812,7 +813,8 @@ public class DefaultModelBuilder
svn commit: r935664 - in /maven/maven-3/trunk: ./ apache-maven/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ maven-settings/
Author: bentmann Date: Mon Apr 19 16:54:05 2010 New Revision: 935664 URL: http://svn.apache.org/viewvc?rev=935664view=rev Log: [maven-release-plugin] prepare release maven-3.0-beta-1 Modified: maven/maven-3/trunk/apache-maven/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-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=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/apache-maven/pom.xml (original) +++ maven/maven-3/trunk/apache-maven/pom.xml Mon Apr 19 16:54:05 2010 @@ -21,7 +21,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/version /parent artifactIdapache-maven/artifactId packagingpom/packaging Modified: maven/maven-3/trunk/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/maven-artifact/pom.xml (original) +++ maven/maven-3/trunk/maven-artifact/pom.xml Mon Apr 19 16:54:05 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/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=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/maven-compat/pom.xml (original) +++ maven/maven-3/trunk/maven-compat/pom.xml Mon Apr 19 16:54:05 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/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=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/maven-core/pom.xml (original) +++ maven/maven-3/trunk/maven-core/pom.xml Mon Apr 19 16:54:05 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/version /parent artifactIdmaven-core/artifactId nameMaven Core/name Modified: maven/maven-3/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/maven-embedder/pom.xml (original) +++ maven/maven-3/trunk/maven-embedder/pom.xml Mon Apr 19 16:54:05 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/version /parent artifactIdmaven-embedder/artifactId nameMaven Embedder/name 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=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/maven-model-builder/pom.xml (original) +++ maven/maven-3/trunk/maven-model-builder/pom.xml Mon Apr 19 16:54:05 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/version /parent artifactIdmaven-model-builder/artifactId Modified: maven/maven-3/trunk/maven-model/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/pom.xml?rev=935664r1=935663r2=935664view=diff == --- maven/maven-3/trunk/maven-model/pom.xml (original) +++ maven/maven-3/trunk/maven-model/pom.xml Mon Apr 19 16:54:05 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-SNAPSHOT/version +version3.0-beta-1/version /parent artifactIdmaven-model/artifactId Modified: maven/maven-3/trunk/maven-plugin-api/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/pom.xml?rev=935664r1
svn commit: r935665 - /maven/maven-3/tags/maven-3.0-beta-1/
Author: bentmann Date: Mon Apr 19 16:54:49 2010 New Revision: 935665 URL: http://svn.apache.org/viewvc?rev=935665view=rev Log: [maven-scm] copy for tag maven-3.0-beta-1 Added: maven/maven-3/tags/maven-3.0-beta-1/ (props changed) - copied from r935664, maven/maven-3/trunk/ Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- bugtraq:append = true Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- bugtraq:label = Enter issue ID: Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- bugtraq:message = Issue id: %BUGID% Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- bugtraq:number = false Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- --- svn:ignore (added) +++ svn:ignore Mon Apr 19 16:54:49 2010 @@ -0,0 +1,14 @@ +release.properties +deleteme.version.properties +bootstrap +target +.classpath +.project +.settings +*.iml +*.iws +*.ipr +log.txt +dependencies.xml +.git +.gitignore Propchange: maven/maven-3/tags/maven-3.0-beta-1/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Apr 19 16:54:49 2010 @@ -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-beta-1/ -- svnmerge-integrated = /maven/components/branches/maven-2.0.x:1-496200
svn commit: r935667 - in /maven/maven-3/trunk: ./ apache-maven/ maven-artifact/ maven-compat/ maven-core/ maven-embedder/ maven-model-builder/ maven-model/ maven-plugin-api/ maven-settings/
Author: bentmann Date: Mon Apr 19 16:55:28 2010 New Revision: 935667 URL: http://svn.apache.org/viewvc?rev=935667view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/maven-3/trunk/apache-maven/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-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=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/apache-maven/pom.xml (original) +++ maven/maven-3/trunk/apache-maven/pom.xml Mon Apr 19 16:55:28 2010 @@ -21,7 +21,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-SNAPSHOT/version /parent artifactIdapache-maven/artifactId packagingpom/packaging Modified: maven/maven-3/trunk/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/maven-artifact/pom.xml (original) +++ maven/maven-3/trunk/maven-artifact/pom.xml Mon Apr 19 16:55:28 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-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=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/maven-compat/pom.xml (original) +++ maven/maven-3/trunk/maven-compat/pom.xml Mon Apr 19 16:55:28 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-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=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/maven-core/pom.xml (original) +++ maven/maven-3/trunk/maven-core/pom.xml Mon Apr 19 16:55:28 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-core/artifactId nameMaven Core/name Modified: maven/maven-3/trunk/maven-embedder/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/pom.xml?rev=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/maven-embedder/pom.xml (original) +++ maven/maven-3/trunk/maven-embedder/pom.xml Mon Apr 19 16:55:28 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-embedder/artifactId nameMaven Embedder/name 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=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/maven-model-builder/pom.xml (original) +++ maven/maven-3/trunk/maven-model-builder/pom.xml Mon Apr 19 16:55:28 2010 @@ -16,7 +16,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-model-builder/artifactId Modified: maven/maven-3/trunk/maven-model/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model/pom.xml?rev=935667r1=935666r2=935667view=diff == --- maven/maven-3/trunk/maven-model/pom.xml (original) +++ maven/maven-3/trunk/maven-model/pom.xml Mon Apr 19 16:55:28 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven/artifactId -version3.0-beta-1/version +version3.0-SNAPSHOT/version /parent artifactIdmaven-model/artifactId Modified: maven/maven-3/trunk/maven-plugin-api/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/pom.xml?rev
svn commit: r935748 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/lifecycle/internal/ test/java/org/apache/maven/lifecycle/ test/java/org/a
Author: bentmann Date: Mon Apr 19 21:14:33 2010 New Revision: 935748 URL: http://svn.apache.org/viewvc?rev=935748view=rev Log: o Cleaned up license headers Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadConfigurationService.java maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultSchedulesTest.java maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadConfigurationServiceTest.java Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java?rev=935748r1=935747r2=935748view=diff == --- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java (original) +++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java Mon Apr 19 21:14:33 2010 @@ -1,18 +1,4 @@ package org.apache.maven.lifecycle; -/* - * 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. - */ /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadConfigurationService.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadConfigurationService.java?rev=935748r1=935747r2=935748view=diff == --- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadConfigurationService.java (original) +++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadConfigurationService.java Mon Apr 19 21:14:33 2010 @@ -1,5 +1,24 @@ package org.apache.maven.lifecycle.internal; +/* + * 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.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultSchedulesTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultSchedulesTest.java?rev=935748r1=935747r2=935748view=diff == --- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultSchedulesTest.java (original) +++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultSchedulesTest.java Mon Apr 19 21:14:33 2010 @@ -1,5 +1,24 @@ package org.apache.maven.lifecycle; +/* + * 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
svn commit: r935333 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt
Author: bentmann
Date: Sun Apr 18 11:29:35 2010
New Revision: 935333
URL: http://svn.apache.org/viewvc?rev=935333view=rev
Log:
o Fixed documentation about default source/target settings
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt
Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt?rev=935333r1=935332r2=935333view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/site/apt/index.apt Sun Apr 18
11:29:35 2010
@@ -30,8 +30,8 @@ Maven Compiler Plugin
The Compiler Plugin is used to compile the sources of your project. The
default compiler is javac and is used to compile Java sources.
- The default source setting is 1.3 and the default target
- setting is 1.1, independently of the JDK you run Maven with.
+ The default source setting is 1.5 and the default target
+ setting is 1.5, independently of the JDK you run Maven with.
If you want to change these defaults, you should set source and
target
as described in
{{{./examples/set-compiler-source-and-target.html}Setting the -source and
-target of the Java Compiler}}.
svn commit: r935165 - /maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Author: bentmann
Date: Sat Apr 17 10:28:42 2010
New Revision: 935165
URL: http://svn.apache.org/viewvc?rev=935165view=rev
Log:
o Fixed compilation errors
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Modified:
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=935165r1=935164r2=935165view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Sat Apr 17 10:28:42 2010
@@ -32,7 +32,7 @@ import org.apache.maven.model.Dependency
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.LocationTracker;
+import org.apache.maven.model.InputLocationTracker;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
@@ -509,13 +509,13 @@ public class DefaultModelValidator
// Field validation
// --
-private boolean validateId( String fieldName, ModelProblemCollector
problems, String id, LocationTracker tracker )
+private boolean validateId( String fieldName, ModelProblemCollector
problems, String id, InputLocationTracker tracker )
{
return validateId( fieldName, problems, id, null, tracker );
}
private boolean validateId( String fieldName, ModelProblemCollector
problems, String id, String sourceHint,
-LocationTracker tracker )
+InputLocationTracker tracker )
{
if ( !validateStringNotEmpty( fieldName, problems, Severity.ERROR, id,
sourceHint, tracker ) )
{
@@ -534,7 +534,7 @@ public class DefaultModelValidator
}
private boolean validateStringNoExpression( String fieldName,
ModelProblemCollector problems, Severity severity,
-String string, LocationTracker
tracker )
+String string,
InputLocationTracker tracker )
{
if ( !hasExpression( string ) )
{
@@ -552,7 +552,7 @@ public class DefaultModelValidator
}
private boolean validateStringNotEmpty( String fieldName,
ModelProblemCollector problems, Severity severity,
-String string, LocationTracker
tracker )
+String string,
InputLocationTracker tracker )
{
return validateStringNotEmpty( fieldName, problems, severity, string,
null, tracker );
}
@@ -566,7 +566,7 @@ public class DefaultModelValidator
* /ul
*/
private boolean validateStringNotEmpty( String fieldName,
ModelProblemCollector problems, Severity severity,
-String string, String sourceHint,
LocationTracker tracker )
+String string, String sourceHint,
InputLocationTracker tracker )
{
if ( !validateNotNull( fieldName, problems, severity, string,
sourceHint, tracker ) )
{
@@ -591,7 +591,7 @@ public class DefaultModelValidator
* /ul
*/
private boolean validateNotNull( String fieldName, ModelProblemCollector
problems, Severity severity,
- Object object, String sourceHint,
LocationTracker tracker )
+ Object object, String sourceHint,
InputLocationTracker tracker )
{
if ( object != null )
{
@@ -604,7 +604,7 @@ public class DefaultModelValidator
}
private boolean validateBoolean( String fieldName, ModelProblemCollector
problems, Severity severity, String string,
- String sourceHint, LocationTracker
tracker )
+ String sourceHint, InputLocationTracker
tracker )
{
if ( string == null || string.length() = 0 )
{
@@ -623,7 +623,7 @@ public class DefaultModelValidator
}
private boolean validateEnum( String fieldName, ModelProblemCollector
problems, Severity severity, String string,
- String sourceHint, LocationTracker tracker,
String... validValues )
+ String sourceHint, InputLocationTracker
tracker, String... validValues
svn commit: r934853 - in /maven/maven-3/trunk/maven-model-builder/src: main/java/org/apache/maven/model/validation/DefaultModelValidator.java test/java/org/apache/maven/model/validation/DefaultModelVa
Author: bentmann
Date: Fri Apr 16 12:50:18 2010
New Revision: 934853
URL: http://svn.apache.org/viewvc?rev=934853view=rev
Log:
o Improved validation messages
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
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=934853r1=934852r2=934853view=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
Fri Apr 16 12:50:18 2010
@@ -196,11 +196,12 @@ public class DefaultModelValidator
+ ' is invalid. Aggregator projects + require 'pom' as
packaging. );
}
-for ( String module : model.getModules() )
+for ( int i = 0, n = model.getModules().size(); i n; i++ )
{
+String module = model.getModules().get( i );
if ( StringUtils.isBlank( module ) )
{
-addViolation( problems, Severity.WARNING,
modules.module, null,
+addViolation( problems, Severity.WARNING,
modules.module[ + i + ], null,
has been specified without a path to the
project directory. );
}
}
@@ -221,12 +222,13 @@ public class DefaultModelValidator
if ( request.getValidationLevel() =
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
{
SetString modules = new HashSetString();
-for ( String module : model.getModules() )
+for ( int i = 0, n = model.getModules().size(); i n; i++ )
{
+String module = model.getModules().get( i );
if ( !modules.add( module ) )
{
-addViolation( problems, Severity.ERROR, modules.module,
null, specifies duplicate child module
-+ module );
+addViolation( problems, Severity.ERROR, modules.module[
+ i + ], null,
+ specifies duplicate child module + module
);
}
}
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java?rev=934853r1=934852r2=934853view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
Fri Apr 16 12:50:18 2010
@@ -420,7 +420,7 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 0, 1 );
-assertTrue( result.getWarnings().get( 0 ).contains( 'modules.module'
has been specified without a path ) );
+assertTrue( result.getWarnings().get( 0 ).contains(
'modules.module[0]' has been specified without a path ) );
}
public void testDuplicatePlugin()
svn commit: r934861 - in /maven/maven-3/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/exception/ maven-core/src/main/java/org/apache/maven/project/ maven-
Author: bentmann
Date: Fri Apr 16 13:18:48 2010
New Revision: 934861
URL: http://svn.apache.org/viewvc?rev=934861view=rev
Log:
o Refactored code
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.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=934861r1=934860r2=934861view=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
Fri Apr 16 13:18:48 2010
@@ -40,6 +40,7 @@ import org.apache.maven.execution.Projec
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.internal.ExecutionEventCatapult;
import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.ModelProblemUtils;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.project.DuplicateProjectException;
@@ -414,7 +415,8 @@ public class DefaultMaven
for ( ModelProblem problem : result.getProblems() )
{
-logger.warn( problem.getMessage() + @ +
problem.getLocation() );
+logger.warn( problem.getMessage() + @
++ ModelProblemUtils.formatLocation( problem,
result.getProjectId() ) );
}
problems = true;
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java?rev=934861r1=934860r2=934861view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
Fri Apr 16 13:18:48 2010
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.ModelProblemUtils;
import org.apache.maven.plugin.AbstractMojoExecutionException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -149,17 +150,7 @@ public class DefaultExceptionHandler
{
String message = problem.getMessage();
-String location = ;
-
-if ( !problem.getModelId().equals( projectId ) )
-{
-location += problem.getModelId();
-
-if ( StringUtils.isNotEmpty( problem.getSource() ) )
-{
-location += ( + problem.getSource() + );
-}
-}
+String location = ModelProblemUtils.formatLocation( problem,
projectId );
if ( StringUtils.isNotEmpty( location ) )
{
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=934861r1=934860r2=934861view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
Fri Apr 16 13:18:48 2010
@@ -25,6 +25,7 @@ import java.io.StringWriter;
import java.util.List;
import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.ModelProblemUtils;
/**
* @author Jason van Zyl
@@ -134,7 +135,7 @@ public class ProjectBuildingException
writer.print( ] );
writer.print( problem.getMessage
svn commit: r934867 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
Author: bentmann
Date: Fri Apr 16 13:37:25 2010
New Revision: 934867
URL: http://svn.apache.org/viewvc?rev=934867view=rev
Log:
o Fixed format of project id
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java?rev=934867r1=934866r2=934867view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
Fri Apr 16 13:37:25 2010
@@ -56,7 +56,9 @@ class DefaultProjectBuildingResult
public DefaultProjectBuildingResult( MavenProject project,
ListModelProblem problems,
ArtifactResolutionResult
dependencyResolutionResult )
{
-this.projectId = ( project != null ) ? project.getId() : ;
+this.projectId =
+( project != null ) ? project.getGroupId() + ':' +
project.getArtifactId() + ':' + project.getVersion()
+: ;
this.pomFile = ( project != null ) ? project.getFile() : null;
this.project = project;
this.problems = problems;
svn commit: r935093 [2/2] - in /maven/maven-3/branches/MNG-1803: ./ maven-compat/src/main/java/org/apache/maven/profiles/ maven-compat/src/main/java/org/apache/maven/project/validation/ maven-core/src
Modified:
maven/maven-3/branches/MNG-1803/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-1803/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=935093r1=935091r2=935093view=diff
==
---
maven/maven-3/branches/MNG-1803/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
(original)
+++
maven/maven-3/branches/MNG-1803/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Fri Apr 16 22:43:36 2010
@@ -40,6 +40,7 @@ import org.apache.maven.model.Distributi
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Extension;
import org.apache.maven.model.FileSet;
+import org.apache.maven.model.InputLocation;
import org.apache.maven.model.IssueManagement;
import org.apache.maven.model.License;
import org.apache.maven.model.MailingList;
@@ -146,6 +147,7 @@ public class ModelMerger
if ( sourceDominant || target.getModelVersion() == null )
{
target.setModelVersion( src );
+target.setLocation( modelVersion, source.getLocation(
modelVersion ) );
}
}
}
@@ -173,6 +175,7 @@ public class ModelMerger
if ( sourceDominant || target.getGroupId() == null )
{
target.setGroupId( src );
+target.setLocation( groupId, source.getLocation( groupId )
);
}
}
}
@@ -186,6 +189,7 @@ public class ModelMerger
if ( sourceDominant || target.getArtifactId() == null )
{
target.setArtifactId( src );
+target.setLocation( artifactId, source.getLocation(
artifactId ) );
}
}
}
@@ -198,6 +202,7 @@ public class ModelMerger
if ( sourceDominant || target.getVersion() == null )
{
target.setVersion( src );
+target.setLocation( version, source.getLocation( version )
);
}
}
}
@@ -210,6 +215,7 @@ public class ModelMerger
if ( sourceDominant || target.getPackaging() == null )
{
target.setPackaging( src );
+target.setLocation( packaging, source.getLocation(
packaging ) );
}
}
}
@@ -222,6 +228,7 @@ public class ModelMerger
if ( sourceDominant || target.getName() == null )
{
target.setName( src );
+target.setLocation( name, source.getLocation( name ) );
}
}
}
@@ -235,6 +242,7 @@ public class ModelMerger
if ( sourceDominant || target.getDescription() == null )
{
target.setDescription( src );
+target.setLocation( description, source.getLocation(
description ) );
}
}
}
@@ -247,6 +255,7 @@ public class ModelMerger
if ( sourceDominant || target.getUrl() == null )
{
target.setUrl( src );
+target.setLocation( url, source.getLocation( url ) );
}
}
}
@@ -260,6 +269,7 @@ public class ModelMerger
if ( sourceDominant || target.getInceptionYear() == null )
{
target.setInceptionYear( src );
+target.setLocation( inceptionYear, source.getLocation(
inceptionYear ) );
}
}
}
@@ -670,6 +680,8 @@ public class ModelMerger
merged.putAll( target.getProperties() );
}
target.setProperties( merged );
+target.setLocation( properties, InputLocation.merge(
target.getLocation( properties ),
+
source.getLocation( properties ), sourceDominant ) );
}
protected void mergeDistributionManagement( DistributionManagement target,
DistributionManagement source,
@@ -741,6 +753,7 @@ public class ModelMerger
if ( sourceDominant || target.getStatus() == null )
{
target.setStatus( src );
+target.setLocation( status, source.getLocation( status ) );
}
}
}
@@ -755,6 +768,7 @@ public class ModelMerger
if ( sourceDominant || target.getDownloadUrl() == null )
{
target.setDownloadUrl( src );
+target.setLocation( downloadUrl, source.getLocation(
downloadUrl ) );
}
}
}
@@ -777,6 +791,7 @@ public class ModelMerger
if ( sourceDominant || target.getGroupId() == null )
{
target.setGroupId( src );
+target.setLocation( groupId, source.getLocation( groupId )
);
}
}
}
@@ -790,6 +805,7 @@ public class ModelMerger
if ( sourceDominant
svn commit: r934372 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building: DefaultModelBuilder.java ModelProcessor.java
Author: bentmann
Date: Thu Apr 15 11:34:55 2010
New Revision: 934372
URL: http://svn.apache.org/viewvc?rev=934372view=rev
Log:
o Removed redundant/superfluous option
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/building/ModelProcessor.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=934372r1=934371r2=934372view=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
Thu Apr 15 11:34:55 2010
@@ -346,7 +346,6 @@ public class DefaultModelBuilder
MapString, Object options = new HashMapString, Object();
options.put( ModelProcessor.IS_STRICT, Boolean.valueOf( strict ) );
-options.put( ModelProcessor.LOCATION, modelSource.getLocation() );
options.put( ModelProcessor.SOURCE, modelSource );
try
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java?rev=934372r1=934371r2=934372view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java
Thu Apr 15 11:34:55 2010
@@ -25,7 +25,7 @@ import org.apache.maven.model.locator.Mo
public interface ModelProcessor
extends ModelLocator, ModelReader
{
-String LOCATION = org.apache.maven.model.building.location;
String SOURCE = org.apache.maven.model.building.source;
+
}
svn commit: r934381 - /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
Author: bentmann
Date: Thu Apr 15 12:04:02 2010
New Revision: 934381
URL: http://svn.apache.org/viewvc?rev=934381view=rev
Log:
o Refactored code
Modified:
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/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=934381r1=934380r2=934381view=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
Thu Apr 15 12:04:02 2010
@@ -34,6 +34,7 @@ import org.apache.maven.model.Distributi
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
import org.apache.maven.model.ReportPlugin;
@@ -71,7 +72,8 @@ public class DefaultModelValidator
if ( equals( parent.getGroupId(), model.getGroupId() )
equals( parent.getArtifactId(), model.getArtifactId() ) )
{
-addViolation( problems, Severity.FATAL, The parent element
cannot have the same ID as the project. );
+addViolation( problems, Severity.FATAL, parent.artifactId,
null, must be changed
++ , the parent element cannot have the same
groupId:artifactId as the project. );
}
}
@@ -161,6 +163,18 @@ public class DefaultModelValidator
{
index.put( key, plugin );
}
+
+SetString executionIds = new HashSetString();
+
+for ( PluginExecution exec : plugin.getExecutions() )
+{
+if ( !executionIds.add( exec.getId() ) )
+{
+addViolation( problems, Severity.ERROR,
build.plugins.plugin[ + plugin.getKey()
++ ].executions.execution.id, null, must be unique
but found duplicate execution with id
++ exec.getId() );
+}
+}
}
}
@@ -266,8 +280,6 @@ public class DefaultModelValidator
}
}
-forcePluginExecutionIdCollision( model, problems );
-
for ( Repository repository : model.getRepositories() )
{
validateRepository( problems, repository,
repositories.repository, request );
@@ -487,32 +499,6 @@ public class DefaultModelValidator
}
}
-private void forcePluginExecutionIdCollision( Model model,
ModelProblemCollector problems )
-{
-Build build = model.getBuild();
-
-if ( build != null )
-{
-ListPlugin plugins = build.getPlugins();
-
-if ( plugins != null )
-{
-for ( Plugin plugin : plugins )
-{
-// this will force an IllegalStateException, even if we
don't have to do inheritance assembly.
-try
-{
-plugin.getExecutionsAsMap();
-}
-catch ( IllegalStateException collisionException )
-{
-addViolation( problems, Severity.ERROR,
collisionException.getMessage() );
-}
-}
-}
-}
-}
-
// --
// Field validation
// --
svn commit: r934440 - in /maven/maven-3/trunk: maven-core/src/test/java/org/apache/maven/project/ maven-core/src/test/resources-project-builder/artifact-id-inheritance/ maven-core/src/test/resources-p
Author: bentmann
Date: Thu Apr 15 15:09:40 2010
New Revision: 934440
URL: http://svn.apache.org/viewvc?rev=934440view=rev
Log:
o Fixed handling of missing project artifact id
Added:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/
(with props)
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/
(with props)
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml
(with props)
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/pom.xml
(with props)
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=934440r1=934439r2=934440view=diff
==
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
Thu Apr 15 15:09:40 2010
@@ -1089,14 +1089,15 @@ public class PomConstructionTest
assertEquals(1, ( (Properties) pom.getValue( properties ) ).size());
assertEquals(child, pom.getValue( properties/pomProfile ) );
}
-
+
public void testPomInheritance()
- throws Exception
- {
- PomTestWrapper pom = buildPom( pom-inheritance/sub );
- assertEquals(parent-description, pom.getValue(description));
- }
-
+throws Exception
+{
+PomTestWrapper pom = buildPom( pom-inheritance/sub );
+assertEquals( parent-description, pom.getValue( description ) );
+assertEquals( jar, pom.getValue( packaging ) );
+}
+
public void testCompleteModelWithoutParent()
throws Exception
{
@@ -1756,6 +1757,20 @@ public class PomConstructionTest
assertEquals( actual, expected );
}
+public void testProjectArtifactIdIsNotInheritedButMandatory()
+throws Exception
+{
+try
+{
+buildPom( artifact-id-inheritance/child );
+fail( Missing artifactId did not cause validation error );
+}
+catch ( ProjectBuildingException e )
+{
+// expected
+}
+}
+
private void assertPathSuffixEquals( String expected, Object actual )
{
String a = actual.toString();
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/
--
bugtraq:label = Enter issue ID:
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/
--
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/
--
bugtraq:number = false
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/
--
bugtraq:label = Enter issue ID:
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/
--
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/
--
bugtraq:number = false
Propchange:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml?rev=934440view=auto
svn commit: r934451 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building: DefaultModelBuilder.java ModelBuildingException.java
Author: bentmann
Date: Thu Apr 15 15:31:08 2010
New Revision: 934451
URL: http://svn.apache.org/viewvc?rev=934451view=rev
Log:
o Allowed inspection of erroneous model
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/building/ModelBuildingException.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=934451r1=934450r2=934451view=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
Thu Apr 15 15:31:08 2010
@@ -218,7 +218,8 @@ public class DefaultModelBuilder
message += currentData.getId();
problems.add( ModelProblem.Severity.FATAL, message, null );
-throw new ModelBuildingException( problems.getRootModelId(),
problems.getProblems() );
+throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
+ problems.getProblems() );
}
}
@@ -315,7 +316,7 @@ public class DefaultModelBuilder
if ( problems.hasErrors() )
{
-throw new ModelBuildingException( problems.getRootModelId(),
problems.getProblems() );
+throw new ModelBuildingException( resultModel,
problems.getRootModelId(), problems.getProblems() );
}
return result;
@@ -386,7 +387,8 @@ public class DefaultModelBuilder
catch ( ModelParseException e )
{
problems.add( Severity.FATAL, Non-parseable POM +
modelSource.getLocation() + : + e.getMessage(), e );
-throw new ModelBuildingException( problems.getRootModelId(),
problems.getProblems() );
+throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
+ problems.getProblems() );
}
catch ( IOException e )
{
@@ -404,7 +406,8 @@ public class DefaultModelBuilder
}
}
problems.add( Severity.FATAL, Non-readable POM +
modelSource.getLocation() + : + msg, e );
-throw new ModelBuildingException( problems.getRootModelId(),
problems.getProblems() );
+throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
+ problems.getProblems() );
}
model.setPomFile( pomFile );
@@ -414,7 +417,8 @@ public class DefaultModelBuilder
if ( problems.hasFatalErrors() )
{
-throw new ModelBuildingException( problems.getRootModelId(),
problems.getProblems() );
+throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
+ problems.getProblems() );
}
return model;
@@ -694,7 +698,8 @@ public class DefaultModelBuilder
problems.add( Severity.FATAL, Non-resolvable parent POM
+ ModelProblemUtils.toId( groupId, artifactId, version ) +
for
+ ModelProblemUtils.toId( childModel ) + : +
e.getMessage(), e );
-throw new ModelBuildingException( problems.getRootModelId(),
problems.getProblems() );
+throw new ModelBuildingException( problems.getRootModel(),
problems.getRootModelId(),
+ problems.getProblems() );
}
ModelBuildingRequest lenientRequest = request;
Modified:
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java?rev=934451r1=934450r2=934451view=diff
==
---
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
Thu Apr 15 15:31:08 2010
@@ -24,6 +24,8 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.model.Model;
+
/**
* Signals one ore more errors during model building. The model builder tries
to collect as many problems as possible
* before
svn commit: r934206 - /maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java
Author: bentmann Date: Wed Apr 14 21:39:45 2010 New Revision: 934206 URL: http://svn.apache.org/viewvc?rev=934206view=rev Log: o Removed unused import Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java?rev=934206r1=934205r2=934206view=diff == --- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java (original) +++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java Wed Apr 14 21:39:45 2010 @@ -19,7 +19,6 @@ import org.apache.maven.lifecycle.Defaul import org.apache.maven.lifecycle.Lifecycle; import org.apache.maven.lifecycle.Schedule; import org.apache.maven.lifecycle.Scheduling; -import org.omg.CORBA.INITIALIZE; import java.util.Arrays; import java.util.HashMap;
svn commit: r933172 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
Author: bentmann
Date: Mon Apr 12 10:18:26 2010
New Revision: 933172
URL: http://svn.apache.org/viewvc?rev=933172view=rev
Log:
o Formatted code
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java?rev=933172r1=933171r2=933172view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
Mon Apr 12 10:18:26 2010
@@ -19,7 +19,12 @@ package org.apache.maven.lifecycle;
* under the License.
*/
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
import org.apache.maven.plugin.MojoExecution;
@@ -31,7 +36,8 @@ import org.apache.maven.plugin.descripto
//TODO: project dependencies that need downloading
//TODO: unfortunately the plugins need to be downloaded in order to get the
plugin.xml file. need to externalize this from the plugin archive.
//TODO: this will be the class that people get in IDEs to modify
-public class MavenExecutionPlan implements IterableExecutionPlanItem
+public class MavenExecutionPlan
+implements IterableExecutionPlanItem
{
/*
@@ -53,30 +59,35 @@ public class MavenExecutionPlan impleme
private final MapString, ExecutionPlanItem lastInPhase;
private final ListString phasesInOrder;
-public MavenExecutionPlan(SetString requiredDependencyResolutionScopes,
SetString requiredDependencyCollectionScopes, ListExecutionPlanItem
planItem) {
+public MavenExecutionPlan( SetString requiredDependencyResolutionScopes,
+ SetString requiredDependencyCollectionScopes,
ListExecutionPlanItem planItem )
+{
this.requiredDependencyResolutionScopes =
requiredDependencyResolutionScopes;
this.requiredDependencyCollectionScopes =
requiredDependencyCollectionScopes;
this.planItem = planItem;
lastInPhase = new HashMapString, ExecutionPlanItem();
phasesInOrder = new ArrayListString();
-for (ExecutionPlanItem executionPlanItem : getExecutionPlanItems()) {
+for ( ExecutionPlanItem executionPlanItem : getExecutionPlanItems() )
+{
final String phaseName = getPhase( executionPlanItem );
-if (!lastInPhase.containsKey( phaseName )){
+if ( !lastInPhase.containsKey( phaseName ) )
+{
phasesInOrder.add( phaseName );
}
lastInPhase.put( phaseName, executionPlanItem );
}
-
-
}
-private String getPhase( ExecutionPlanItem executionPlanItem){
+private String getPhase( ExecutionPlanItem executionPlanItem )
+{
final MojoExecution mojoExecution =
executionPlanItem.getMojoExecution();
final MojoDescriptor mojoDescriptor =
mojoExecution.getMojoDescriptor();
return mojoDescriptor.getPhase();
}
-public IteratorExecutionPlanItem iterator() {
+
+public IteratorExecutionPlanItem iterator()
+{
return getExecutionPlanItems().iterator();
}
@@ -86,22 +97,24 @@ public class MavenExecutionPlan impleme
* @param executionPlanItem The execution plan item
* @return The ExecutionPlanItem or null if none can be found
*/
-public ExecutionPlanItem findLastInPhase( ExecutionPlanItem
executionPlanItem){
+public ExecutionPlanItem findLastInPhase( ExecutionPlanItem
executionPlanItem )
+{
ExecutionPlanItem executionPlanItem1 = lastInPhase.get( getPhase(
executionPlanItem ) );
return executionPlanItem1;
}
private ListExecutionPlanItem getExecutionPlanItems()
- {
- return planItem;
- }
-
-public void forceAllComplete(){
-for (ExecutionPlanItem executionPlanItem : getExecutionPlanItems()) {
- executionPlanItem.forceComplete();
-}
+{
+return planItem;
}
+public void forceAllComplete()
+{
+for ( ExecutionPlanItem executionPlanItem : getExecutionPlanItems() )
+{
+executionPlanItem.forceComplete();
+}
+}
public SetString getRequiredResolutionScopes()
{
@@ -113,17 +126,19 @@ public class MavenExecutionPlan impleme
return requiredDependencyCollectionScopes;
}
-
-public ListMojoExecution getMojoExecutions(){
+public ListMojoExecution getMojoExecutions()
+{
ListMojoExecution result = new
svn commit: r933174 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
Author: bentmann
Date: Mon Apr 12 10:19:24 2010
New Revision: 933174
URL: http://svn.apache.org/viewvc?rev=933174view=rev
Log:
o Eased migration
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java?rev=933174r1=933173r2=933174view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
Mon Apr 12 10:19:24 2010
@@ -136,6 +136,12 @@ public class MavenExecutionPlan
return result;
}
+@Deprecated
+public ListMojoExecution getExecutions()
+{
+return getMojoExecutions();
+}
+
public int size()
{
return planItem.size();
svn commit: r932882 - in /maven/enforcer/trunk/maven-enforcer-plugin/src/it: require-java-version/pom.xml require-maven-version/pom.xml
Author: bentmann Date: Sun Apr 11 12:44:09 2010 New Revision: 932882 URL: http://svn.apache.org/viewvc?rev=932882view=rev Log: o Extended tests to check both version syntaxes Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-java-version/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-maven-version/pom.xml Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-java-version/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-java-version/pom.xml?rev=932882r1=932881r2=932882view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-java-version/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-java-version/pom.xml Sun Apr 11 12:44:09 2010 @@ -44,8 +44,13 @@ under the License. configuration rules requireJavaVersion + !-- implicit range -- version1.4/version /requireJavaVersion +requireJavaVersion + !-- explicit range -- + version[1.4,)/version +/requireJavaVersion /rules /configuration /execution Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-maven-version/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-maven-version/pom.xml?rev=932882r1=932881r2=932882view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-maven-version/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/it/require-maven-version/pom.xml Sun Apr 11 12:44:09 2010 @@ -44,8 +44,13 @@ under the License. configuration rules requireMavenVersion + !-- implicit range -- version2.0/version /requireMavenVersion +requireMavenVersion + !-- explicit range -- + version[2.0,)/version +/requireMavenVersion /rules /configuration /execution
svn commit: r932883 - /maven/enforcer/trunk/pom.xml
Author: bentmann Date: Sun Apr 11 12:46:31 2010 New Revision: 932883 URL: http://svn.apache.org/viewvc?rev=932883view=rev Log: o Fixed mailing list links Modified: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=932883r1=932882r2=932883view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Sun Apr 11 12:46:31 2010 @@ -58,7 +58,7 @@ archivehttp://mail-archives.apache.org/mod_mbox/maven-users/archive otherArchives otherArchivehttp://www.mail-archive.com/us...@maven.apache.org//otherArchive - otherArchivehttp://www.nabble.com/Maven---Users-f178.html/otherArchive + otherArchivehttp://old.nabble.com/Maven---Users-f178.html/otherArchive otherArchivehttp://maven.users.markmail.org//otherArchive /otherArchives /mailingList @@ -70,7 +70,7 @@ archivehttp://mail-archives.apache.org/mod_mbox/maven-dev/archive otherArchives otherArchivehttp://www.mail-archive.com/d...@maven.apache.org//otherArchive - otherArchivehttp://www.nabble.com/Maven-Developers-f179.html/otherArchive + otherArchivehttp://old.nabble.com/Maven-Developers-f179.html/otherArchive otherArchivehttp://maven.dev.markmail.org//otherArchive /otherArchives /mailingList @@ -81,7 +81,7 @@ archivehttp://mail-archives.apache.org/mod_mbox/maven-issues//archive otherArchives otherArchivehttp://www.mail-archive.com/iss...@maven.apache.org/otherArchive - otherArchivehttp://www.nabble.com/Maven---Issues-f15573.html/otherArchive + otherArchivehttp://old.nabble.com/Maven---Issues-f15573.html/otherArchive otherArchivehttp://maven.issues.markmail.org//otherArchive /otherArchives /mailingList @@ -92,7 +92,7 @@ archivehttp://mail-archives.apache.org/mod_mbox/maven-dev/archive otherArchives otherArchivehttp://www.mail-archive.com/commits@maven.apache.org/otherArchive - otherArchivehttp://www.nabble.com/Maven---Commits-f15575.html/otherArchive + otherArchivehttp://old.nabble.com/Maven---Commits-f15575.html/otherArchive otherArchivehttp://maven.commits.markmail.org//otherArchive /otherArchives /mailingList @@ -105,7 +105,7 @@ archivehttp://mail-archives.apache.org/mod_mbox/maven-announce//archive otherArchives otherArchivehttp://www.mail-archive.com/annou...@maven.apache.org/otherArchive - otherArchivehttp://www.nabble.com/Maven-Announcements-f15617.html/otherArchive + otherArchivehttp://old.nabble.com/Maven-Announcements-f15617.html/otherArchive otherArchivehttp://maven.announce.markmail.org//otherArchive /otherArchives /mailingList @@ -116,7 +116,7 @@ archivehttp://mail-archives.apache.org/mod_mbox/maven-notifications//archive otherArchives otherArchivehttp://www.mail-archive.com/notificati...@maven.apache.org/otherArchive - otherArchivehttp://www.nabble.com/Maven---Notifications-f15574.html/otherArchive + otherArchivehttp://old.nabble.com/Maven---Notifications-f15574.html/otherArchive otherArchivehttp://maven.notifications.markmail.org//otherArchive /otherArchives /mailingList
svn commit: r932885 - in /maven/enforcer/trunk: maven-enforcer-plugin/pom.xml pom.xml
Author: bentmann
Date: Sun Apr 11 12:56:37 2010
New Revision: 932885
URL: http://svn.apache.org/viewvc?rev=932885view=rev
Log:
o Inherited from maven-parent:16
o Updated to maven-plugin-plugin:2.5.1
o Updated to maven-invoker-plugin:1.5
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=932885r1=932884r2=932885view=diff
==
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Sun Apr 11 12:56:37 2010
@@ -20,7 +20,6 @@
--
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
- inceptionYear2007/inceptionYear
parent
groupIdorg.apache.maven.enforcer/groupId
@@ -36,6 +35,7 @@
nameMaven Enforcer Plugin/name
descriptionThe Loving Iron Fist of Maven/description
urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url
+ inceptionYear2007/inceptionYear
developers
developer
@@ -175,7 +175,7 @@
plugins
plugin
artifactIdmaven-invoker-plugin/artifactId
-version1.4/version
+version1.5/version
configuration
debugtrue/debug
cloneProjectsTo${project.build.directory}/it/cloneProjectsTo
Modified: maven/enforcer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=932885r1=932884r2=932885view=diff
==
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Sun Apr 11 12:56:37 2010
@@ -23,7 +23,7 @@
parent
artifactIdmaven-parent/artifactId
groupIdorg.apache.maven/groupId
-version15/version
+version16/version
relativePath../pom/maven/pom.xml/relativePath
/parent
@@ -149,7 +149,7 @@
/distributionManagement
properties
maven.version2.0.9/maven.version
-maven.plugin.plugin.version2.4.3/maven.plugin.plugin.version
+maven.plugin.plugin.version2.5.1/maven.plugin.plugin.version
site.deploy.urlscp://people.apache.org/www/maven.apache.org/site.deploy.url
/properties
svn commit: r933000 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/ main/java/org/apache/maven/execution/ main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/lifecyc
Author: bentmann
Date: Sun Apr 11 21:41:33 2010
New Revision: 933000
URL: http://svn.apache.org/viewvc?rev=933000view=rev
Log:
o Refactored execution event firing
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java
- copied, changed from r932461,
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultLifecycleEvent.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
(with props)
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java
(with props)
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ExecutionEventCatapultStub.java
(with props)
Removed:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ExecutionEventCatapult.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultLifecycleEvent.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleEventCatapult.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.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=933000r1=932999r2=933000view=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
Sun Apr 11 21:41:33 2010
@@ -29,10 +29,8 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.execution.DefaultLifecycleEvent;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.ExecutionEvent;
-import org.apache.maven.execution.ExecutionListener;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulationException;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
@@ -40,6 +38,7 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.LifecycleExecutor;
+import org.apache.maven.lifecycle.internal.ExecutionEventCatapult;
import org.apache.maven.lifecycle.internal.LifecycleWeaveBuilder;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelSource;
@@ -84,17 +83,8 @@ public class DefaultMaven
@Requirement
MavenExecutionRequestPopulator populator;
-private void fireEvent( MavenSession session, ExecutionEventCatapult
catapult )
-{
-ExecutionListener listener =
session.getRequest().getExecutionListener();
-
-if ( listener != null )
-{
-ExecutionEvent event = new DefaultLifecycleEvent( session, null );
-
-catapult.fire( listener, event );
-}
-}
+@Requirement
+private ExecutionEventCatapult eventCatapult;
public MavenExecutionResult execute( MavenExecutionRequest request )
{
@@ -162,7 +152,7 @@ public class DefaultMaven
return processResult( result, e );
}
-fireEvent( session, ExecutionEventCatapult.PROJECT_DISCOVERY_STARTED );
+eventCatapult.fire( ExecutionEvent.Type.ProjectDiscoveryStarted,
session, null );
//TODO: optimize for the single project or no project
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java?rev=933000r1=932999r2=933000view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java
(original)
+++
maven/maven-3
svn commit: r933001 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
Author: bentmann
Date: Sun Apr 11 22:15:17 2010
New Revision: 933001
URL: http://svn.apache.org/viewvc?rev=933001view=rev
Log:
o Refactored code
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java?rev=933001r1=933000r2=933001view=diff
==
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
Sun Apr 11 22:15:17 2010
@@ -68,7 +68,6 @@ public class MojoExecutor
{
execute( session, mojoExecution, projectIndex, dependencyContext,
phaseRecorder );
}
-
}
public void execute( MavenSession session, MojoExecution mojoExecution,
ProjectIndex projectIndex,
@@ -214,9 +213,11 @@ public class MojoExecutor
{
for ( Map.EntryString, ListMojoExecution fork :
forkedExecutions.entrySet() )
{
-int index = projectIndex.getIndices().get( fork.getKey() );
+String projectId = fork.getKey();
+
+int index = projectIndex.getIndices().get( projectId );
-MavenProject forkedProject =
projectIndex.getProjects().get( fork.getKey() );
+MavenProject forkedProject =
projectIndex.getProjects().get( projectId );
forkedProjects.add( forkedProject );
@@ -224,15 +225,22 @@ public class MojoExecutor
forkedProject.setExecutionProject( executedProject );
+ListMojoExecution mojoExecutions = fork.getValue();
+
+if ( mojoExecutions.isEmpty() )
+{
+continue;
+}
+
try
{
session.setCurrentProject( executedProject );
session.getProjects().set( index, executedProject );
-projectIndex.getProjects().put( fork.getKey(),
executedProject );
+projectIndex.getProjects().put( projectId,
executedProject );
eventCatapult.fire(
ExecutionEvent.Type.ForkedProjectStarted, session, mojoExecution );
-execute( session, fork.getValue(), projectIndex,
dependencyContext );
+execute( session, mojoExecutions, projectIndex,
dependencyContext );
eventCatapult.fire(
ExecutionEvent.Type.ForkedProjectSucceeded, session, mojoExecution );
}
@@ -244,7 +252,7 @@ public class MojoExecutor
}
finally
{
-projectIndex.getProjects().put( fork.getKey(),
forkedProject );
+projectIndex.getProjects().put( projectId,
forkedProject );
session.getProjects().set( index, forkedProject );
session.setCurrentProject( project );
}
svn commit: r933005 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java resources/mng-4189/dependent-on-newer-times
Author: bentmann
Date: Sun Apr 11 22:40:58 2010
New Revision: 933005
URL: http://svn.apache.org/viewvc?rev=933005view=rev
Log:
o Decoupled IT from production plugins
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4189/dependent-on-newer-timestamp-pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4189/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java?rev=933005r1=933004r2=933005view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
Sun Apr 11 22:40:58 2010
@@ -31,12 +31,13 @@ import org.apache.maven.it.util.Resource
public class MavenITmng4189UniqueVersionSnapshotTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng4189UniqueVersionSnapshotTest()
{
-super( [2.2.1,) );
+super( [2.2.1,),[3.0-alpha-3,) );
}
-public void testmng4189()
+public void testit()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-4189 );
@@ -45,45 +46,40 @@ public class MavenITmng4189UniqueVersion
verifier.setAutoclean( false );
verifier.deleteDirectory( target );
verifier.deleteArtifacts( org.apache.maven.its.mng4189 );
-Properties filterProps = verifier.newDefaultFilterProperties();
-verifier.filterFile( settings-template.xml, settings.xml, UTF-8,
filterProps );
+verifier.filterFile( settings-template.xml, settings.xml, UTF-8,
verifier.newDefaultFilterProperties() );
verifier.getCliOptions().add( --settings );
verifier.getCliOptions().add( settings.xml );
-
+
// depend on
org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar
-// which contains add() method
verifier.setLogFileName( log-1.txt );
-verifier.executeGoal( compile );
+verifier.executeGoal( validate );
verifier.verifyErrorFreeLog();
-
+
+Properties checksums = verifier.loadProperties(
target/checksum.properties );
+assertEquals( da2e54f69a9ba120f9211c476029f049967d840c,
checksums.getProperty( dep-1.0-SNAPSHOT.jar ) );
+
+// depend on
org.apache.maven.its.mng4189:dep:1.0-20090608.090416-2:jar
verifier.deleteDirectory( target );
verifier.getCliOptions().add( -f );
verifier.getCliOptions().add( dependent-on-newer-timestamp-pom.xml );
verifier.setLogFileName( log-2.txt );
-try
-{
- // depend on
org.apache.maven.its.mng4189:dep:1.0-20090608.090532-2-1:jar
- // which DOES NOT contains add() method
-verifier.executeGoal( compile );
-fail( Build should have failed due to compile errors! );
-}
-catch ( VerificationException e )
-{
-assertTrue( true );
-}
-verifier.verifyTextInLog(
org.apache.maven.plugin.CompilationFailureException: Compilation failure );
-
-verifier.deleteDirectory( target );
-
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+
+checksums = verifier.loadProperties( target/checksum.properties );
+assertEquals( 835979c28041014c5fd55daa15302d92976924a7,
checksums.getProperty( dep-1.0-SNAPSHOT.jar ) );
+
// revert back to
org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar
-// which contains the add() method
+verifier.deleteDirectory( target );
verifier.getCliOptions().remove( -f );
verifier.getCliOptions().remove(
dependent-on-newer-timestamp-pom.xml );
verifier.setLogFileName( log-3.txt );
-verifier.executeGoal( compile );
+verifier.executeGoal( validate );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-verifier.deleteArtifacts( org.apache.maven.its.mng4189 );
+checksums = verifier.loadProperties( target/checksum.properties );
+assertEquals( da2e54f69a9ba120f9211c476029f049967d840c,
checksums.getProperty( dep-1.0-SNAPSHOT.jar ) );
}
+
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4189/dependent-on-newer-timestamp-pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration
svn commit: r932705 - /maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml
Author: bentmann Date: Sat Apr 10 11:56:37 2010 New Revision: 932705 URL: http://svn.apache.org/viewvc?rev=932705view=rev Log: o Fixed IT to use proper version Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml?rev=932705r1=932704r2=932705view=diff == --- maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/it/jdk16-annotation/pom.xml Sat Apr 10 11:56:37 2010 @@ -12,7 +12,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-compiler-plugin/artifactId -version2.2-SNAPSHOT/version +version@project.version@/version executions execution iddefault-compile/id
