svn commit: r557577 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-apt/ doxia-module-apt/src/main/components/ doxia-module-apt/src/main/resources/META-INF/ doxia-module-xdoc/ doxia-module-x
Author: ltheussl Date: Thu Jul 19 04:22:36 2007 New Revision: 557577 URL: http://svn.apache.org/viewvc?view=revrev=557577 Log: DOXIA-115: apt and xdoc modules require descriptor merge, otherwise macro tests fail. Thanks to Eric Redmond. Added: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml (with props) maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/components/components.xml (with props) Removed: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/resources/META-INF/ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/resources/META-INF/ Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml?view=diffrev=557577r1=557576r2=557577 == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/pom.xml Thu Jul 19 04:22:36 2007 @@ -7,4 +7,27 @@ modelVersion4.0.0/modelVersion artifactIddoxia-module-apt/artifactId nameDoxia :: APT Module/name + + build +plugins + plugin +groupIdorg.codehaus.plexus/groupId +artifactIdplexus-maven-plugin/artifactId +configuration + descriptors +descriptorsrc/main/components/components.xml/descriptor + descriptortarget/generated-resources/plexus/META-INF/plexus/components.xml/descriptor + /descriptors +/configuration +executions + execution +goals + goalmerge-descriptors/goal +/goals + /execution +/executions + /plugin +/plugins + /build + /project Added: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml?view=autorev=557577 == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml (added) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml Thu Jul 19 04:22:36 2007 @@ -0,0 +1,22 @@ +component-set + components +component + roleorg.apache.maven.doxia.parser.Parser/role + role-hintapt/role-hint + implementationorg.apache.maven.doxia.module.apt.AptParser/implementation + description/description + requirements +requirement + roleorg.apache.maven.doxia.macro.manager.MacroManager/role + field-namemacroManager/field-name +/requirement + /requirements +/component +component + roleorg.apache.maven.doxia.site.module.SiteModule/role + role-hintapt/role-hint + implementationorg.apache.maven.doxia.module.apt.AptSiteModule/implementation + description/description +/component + /components +/component-set Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml -- svn:eol-style = native Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/components/components.xml -- svn:keywords = Author Date Id Revision Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml?view=diffrev=557577r1=557576r2=557577 == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Thu Jul 19 04:22:36 2007 @@ -7,4 +7,27 @@ modelVersion4.0.0/modelVersion artifactIddoxia-module-xdoc/artifactId nameDoxia :: XDoc Module/name + + build +plugins + plugin +groupIdorg.codehaus.plexus/groupId +artifactIdplexus-maven-plugin/artifactId +configuration + descriptors +descriptorsrc/main/components/components.xml/descriptor + descriptortarget/generated-resources/plexus/META-INF/plexus/components.xml/descriptor + /descriptors +/configuration +executions + execution +goals + goalmerge-descriptors/goal +/goals +
svn commit: r557596 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl Date: Thu Jul 19 05:34:14 2007 New Revision: 557596 URL: http://svn.apache.org/viewvc?view=revrev=557596 Log: o 2.2 was abandoned, revert back to 2.1-SNAPSHOT. Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=557596r1=557595r2=557596 == --- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Thu Jul 19 05:34:14 2007 @@ -28,7 +28,7 @@ artifactIdmaven-changelog-plugin/artifactId packagingmaven-plugin/packaging nameMaven Changelog Plug-in/name - version2.2-SNAPSHOT/version + version2.1-SNAPSHOT/version descriptionProduce SCM changelog reports./description prerequisites maven2.0/maven
svn commit: r557598 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Author: dennisl
Date: Thu Jul 19 05:41:25 2007
New Revision: 557598
URL: http://svn.apache.org/viewvc?view=revrev=557598
Log:
[MCHANGELOG-66] changelog for perforce fails because of default clientspec
o Add the ability to configure system properties, that can be picked up by
Maven SCM. This is how it is handled in the maven-scm-plugin.
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?view=diffrev=557598r1=557597r2=557598
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Thu Jul 19 05:41:25 2007
@@ -65,6 +65,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import java.util.Properties;
import java.util.ResourceBundle;
import java.util.StringTokenizer;
@@ -292,6 +293,13 @@
private String connection;
/**
+ * The system properties to use (needed by the perforce scm provider).
+ *
+ * @parameter
+ */
+private Properties systemProperties;
+
+/**
* @see
org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
*/
public void executeReport( Locale locale )
@@ -306,6 +314,23 @@
}
verifySCMTypeParams();
+
+if ( systemProperties != null )
+{
+// Add all system properties configured by the user
+Iterator iter = systemProperties.keySet().iterator();
+
+while ( iter.hasNext() )
+{
+String key = (String) iter.next();
+
+String value = systemProperties.getProperty( key );
+
+System.setProperty( key, value );
+
+getLog().debug( Setting system property: + key + = +
value );
+}
+}
doGenerateReport( getChangedSets(), getBundle( locale ), getSink() );
}
svn commit: r557712 - in /maven/plugins/trunk/maven-changelog-plugin/src/site: apt/examples/using-perforce.apt apt/index.apt site.xml
Author: dennisl
Date: Thu Jul 19 11:06:42 2007
New Revision: 557712
URL: http://svn.apache.org/viewvc?view=revrev=557712
Log:
[MCHANGELOG-66] changelog for perforce fails because of default clientspec
o Document how to configure the plugin when using Perforce.
Added:
maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml
Added:
maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt?view=autorev=557712
==
---
maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt
(added)
+++
maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt
Thu Jul 19 11:06:42 2007
@@ -0,0 +1,60 @@
+ --
+ Using Perforce
+ --
+ Dennis Lundberg
+ --
+ 2007-07-19
+ --
+
+ ~~ 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.
+
+
+Using Perforce
+
+ The maven-changelog-plugin uses {{{http://maven.apache.org/scm/}Maven SCM}}
+ as an underlying layer, when accessing your SCM system. When Maven SCM is
+ working with Perforce it needs a clientspec. This is provided by setting
+ system properties that are then read by Maven SCM.
+
+ Configuring this is done in the same way as for the maven-scm-plugin. So if
+ you have a working configuration for maven-scm-plugin, you can just copy
+ those lines over to your maven-changelog-plugin configuration. The following
+ configuration shows an example of what this can look like.
+
++-+
+project
+ ...
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-changelog-plugin/artifactId
+configuration
+ systemProperties
+property
+ namemaven.scm.perforce.clientspec.name/name
+ valueyour.perforce.clientspec.name/value
+/property
+ /systemProperties
+/configuration
+ /plugin
+/plugins
+ /reporting
+ ...
+/project
++-+
Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt?view=diffrev=557712r1=557711r2=557712
==
--- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt Thu Jul
19 11:06:42 2007
@@ -61,6 +61,7 @@
* {{{examples/configuration-tag-type.html}Using Tag Type}}
+ * {{{examples/using-perforce.html}Using Perforce}}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml?view=diffrev=557712r1=557711r2=557712
==
--- maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml Thu Jul 19
11:06:42 2007
@@ -34,6 +34,7 @@
item name=Using Date Type
href=/examples/configuration-date-type.html/
item name=Using Range Type
href=/examples/configuration-range-type.html/
item name=Using Tag Type
href=/examples/configuration-tag-type.html/
+ item name=Using Perforce href=/examples/using-perforce.html/
/menu
/body
/project
svn commit: r557720 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Author: dennisl
Date: Thu Jul 19 11:22:23 2007
New Revision: 557720
URL: http://svn.apache.org/viewvc?view=revrev=557720
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?view=diffrev=557720r1=557719r2=557720
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Thu Jul 19 11:22:23 2007
@@ -84,6 +84,11 @@
private static final String FILE_TOKEN = %FILE%;
/**
+ * The number of days to use as a range, when this is not specified.
+ */
+private static final int DEFAULT_RANGE = 30;
+
+/**
* Used to specify the format to use for the dates in the headings of the
* report.
*
@@ -465,7 +470,8 @@
}
else if ( tag.equals( type ) )
{
-if( repository.getProvider().equals( svn ) ) {
+if ( repository.getProvider().equals( svn ) )
+{
throw new MavenReportException( The type ' + type + '
isn't supported for svn. );
}
@@ -751,7 +757,7 @@
{
if ( range == -1 )
{
-range = 30;
+range = DEFAULT_RANGE;
}
}
else if ( date.equals( type ) )
@@ -759,7 +765,8 @@
if ( dates == null )
{
throw new MavenReportException(
-The dates parameter is required when type=\date\. The
value should be the absolute date for the start of the log. );
+The dates parameter is required when type=\date\.
++ The value should be the absolute date for the start of
the log. );
}
}
else if ( tag.equals( type ) )
@@ -927,7 +934,8 @@
else
{
sink.text( bundle.getString( report.SetRangeBetween ) );
-sink.text( + headingDateFormater.format( set.getStartDate() )
+ + bundle.getString( report.And ) +
+sink.text( + headingDateFormater.format( set.getStartDate() )
++ + bundle.getString( report.And ) +
+ headingDateFormater.format( set.getEndDate() ) );
}
sink.sectionTitle2_();
@@ -1302,10 +1310,13 @@
String head;
String tail;
-if (pos 0) {
+if ( pos 0 )
+{
head = ;
tail = name;
-} else {
+}
+else
+{
head = name.substring( 0, pos ) + /;
tail = name.substring( pos + 1 );
}
svn commit: r557721 - /maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt
Author: dennisl Date: Thu Jul 19 11:22:49 2007 New Revision: 557721 URL: http://svn.apache.org/viewvc?view=revrev=557721 Log: o Set eol style to native. Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt (props changed) Propchange: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt -- svn:eol-style = native
svn commit: r557722 - /maven/plugins/tags/maven-changelog-plugin-2.1/
Author: dennisl Date: Thu Jul 19 11:29:41 2007 New Revision: 557722 URL: http://svn.apache.org/viewvc?view=revrev=557722 Log: o Remove tag as the release vote was cancelled. Removed: maven/plugins/tags/maven-changelog-plugin-2.1/
svn commit: r557723 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl Date: Thu Jul 19 11:36:19 2007 New Revision: 557723 URL: http://svn.apache.org/viewvc?view=revrev=557723 Log: [maven-release-plugin] prepare release maven-changelog-plugin-2.1 Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=557723r1=557722r2=557723 == --- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Thu Jul 19 11:36:19 2007 @@ -28,7 +28,7 @@ artifactIdmaven-changelog-plugin/artifactId packagingmaven-plugin/packaging nameMaven Changelog Plug-in/name - version2.1-SNAPSHOT/version + version2.1/version descriptionProduce SCM changelog reports./description prerequisites maven2.0/maven @@ -278,4 +278,10 @@ properties maven-scm.version1.0/maven-scm.version /properties + + scm + connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.1/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.1/url + /scm /project
svn commit: r557724 - in /maven/plugins/tags/maven-changelog-plugin-2.1: ./ pom.xml src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java src/site/apt/examples/using-perforce.apt src/si
Author: dennisl Date: Thu Jul 19 11:36:29 2007 New Revision: 557724 URL: http://svn.apache.org/viewvc?view=revrev=557724 Log: [maven-scm] copy for tag maven-changelog-plugin-2.1 Added: maven/plugins/tags/maven-changelog-plugin-2.1/ - copied from r557062, maven/plugins/trunk/maven-changelog-plugin/ maven/plugins/tags/maven-changelog-plugin-2.1/pom.xml - copied unchanged from r557723, maven/plugins/trunk/maven-changelog-plugin/pom.xml maven/plugins/tags/maven-changelog-plugin-2.1/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java - copied unchanged from r557720, maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java maven/plugins/tags/maven-changelog-plugin-2.1/src/site/apt/examples/using-perforce.apt - copied unchanged from r557721, maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/using-perforce.apt maven/plugins/tags/maven-changelog-plugin-2.1/src/site/apt/index.apt - copied unchanged from r557712, maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt maven/plugins/tags/maven-changelog-plugin-2.1/src/site/site.xml - copied unchanged from r557712, maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml
svn commit: r557725 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl Date: Thu Jul 19 11:36:34 2007 New Revision: 557725 URL: http://svn.apache.org/viewvc?view=revrev=557725 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=557725r1=557724r2=557725 == --- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Thu Jul 19 11:36:34 2007 @@ -28,7 +28,7 @@ artifactIdmaven-changelog-plugin/artifactId packagingmaven-plugin/packaging nameMaven Changelog Plug-in/name - version2.1/version + version2.2-SNAPSHOT/version descriptionProduce SCM changelog reports./description prerequisites maven2.0/maven @@ -278,10 +278,4 @@ properties maven-scm.version1.0/maven-scm.version /properties - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.1/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.1/url - /scm /project
svn commit: r557792 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
Author: jdcasey
Date: Thu Jul 19 15:19:40 2007
New Revision: 557792
URL: http://svn.apache.org/viewvc?view=revrev=557792
Log:
Fixing artifact resolution to be MNG-1577 compatible (using the dependency
management for the resolve call).
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?view=diffrev=557792r1=557791r2=557792
==
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
Thu Jul 19 15:19:40 2007
@@ -9,6 +9,12 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.plugin.assembly.utils.FilterUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
@@ -19,14 +25,16 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
* @plexus.component
role=org.apache.maven.plugin.assembly.artifact.DependencyResolver
role-hint=default
- *
+ *
* @author jdcasey
*/
public class DefaultDependencyResolver
@@ -82,11 +90,18 @@
Set dependencyArtifacts =
MavenMetadataSource.createArtifacts( factory,
project.getDependencies(), null, filter, project );
-ArtifactResolutionResult result =
-resolver.resolveTransitively( dependencyArtifacts, artifact,
localRepository, repos, metadataSource, filter );
-
+ArtifactResolutionResult result;
+try
+{
+result = resolver.resolveTransitively( dependencyArtifacts,
artifact, getManagedVersionMap( project ), localRepository, repos,
metadataSource, filter );
+}
+catch ( InvalidVersionSpecificationException e )
+{
+throw new InvalidDependencyVersionException( e.getMessage(), e );
+}
+
getLogger().debug( While resolving dependencies of +
project.getId() + : );
-
+
FilterUtils.reportFilteringStatistics( Collections.singleton( filter
), getLogger() );
return result.getArtifacts();
@@ -95,23 +110,23 @@
private List aggregateRemoteArtifactRepositories( List remoteRepositories,
MavenProject project )
{
List repoLists = new ArrayList();
-
+
repoLists.add( remoteRepositories );
repoLists.add( project.getRemoteArtifactRepositories() );
-
+
List remoteRepos = new ArrayList();
Set encounteredUrls = new HashSet();
for ( Iterator listIterator = repoLists.iterator();
listIterator.hasNext(); )
{
List repositoryList = ( List ) listIterator.next();
-
-if ( repositoryList != null !repositoryList.isEmpty() )
+
+if ( ( repositoryList != null ) !repositoryList.isEmpty() )
{
for ( Iterator it = repositoryList.iterator(); it.hasNext(); )
{
ArtifactRepository repo = ( ArtifactRepository ) it.next();
-
+
if ( !encounteredUrls.contains( repo.getUrl() ) )
{
remoteRepos.add( repo );
@@ -124,4 +139,65 @@
return remoteRepos;
}
+// TODO: Remove this, once we can depend on Maven 2.0.7 or later...in which
+// MavenProject.getManagedVersionMap() exists. This is from MNG-1577.
+private Map getManagedVersionMap( MavenProject project )
+throws InvalidVersionSpecificationException
+{
+DependencyManagement dependencyManagement =
project.getModel().getDependencyManagement();
+
+Map map = null;
+List deps;
+if ( ( dependencyManagement != null ) ( ( deps =
dependencyManagement.getDependencies() ) != null )
+ ( deps.size() 0 ) )
svn commit: r557799 - /maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Author: handyande
Date: Thu Jul 19 15:34:23 2007
New Revision: 557799
URL: http://svn.apache.org/viewvc?view=revrev=557799
Log:
The component configurator has a role hint
Modified:
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Modified:
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?view=diffrev=557799r1=557798r2=557799
==
---
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
(original)
+++
maven/shared/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
Thu Jul 19 15:34:23 2007
@@ -68,7 +68,7 @@
{
super.setUp();
-configurator = (ComponentConfigurator) getContainer().lookup(
ComponentConfigurator.ROLE );
+configurator = (ComponentConfigurator) getContainer().lookup(
ComponentConfigurator.ROLE, basic );
//projectBuilder = (MavenProjectBuilder) getContainer().lookup(
MavenProjectBuilder.ROLE );
}
svn commit: r557829 - in /maven/plugins/branches/maven-dependency-plugin-MDEP-47/src: main/java/org/apache/maven/plugin/dependency/ main/java/org/apache/maven/plugin/dependency/fromConfiguration/ site
Author: brianf
Date: Thu Jul 19 17:55:05 2007
New Revision: 557829
URL: http://svn.apache.org/viewvc?view=revrev=557829
Log:
applied patch from Damian Bradicich for MDEP-47
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/site/apt/examples/unpacking-artifacts.apt
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/site/apt/examples/unpacking-project-dependencies.apt
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/site/apt/usage.apt
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?view=diffrev=557829r1=557828r2=557829
==
---
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
(original)
+++
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
Thu Jul 19 17:55:05 2007
@@ -47,7 +47,7 @@
{
/**
* A comma separated list of file patterns to include when unpacking the
- * artifact.
+ * artifact. i.e. **\/*.xml,**\/*.properties
*
* @parameter expression=${mdep.unpack.includes}
*/
@@ -55,7 +55,7 @@
/**
* A comma separated list of file patterns to exclude when unpacking the
- * artifact.
+ * artifact. i.e. **\/*.xml,**\/*.properties
*
* @parameter expression=${mdep.unpack.excludes}
*/
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java?view=diffrev=557829r1=557828r2=557829
==
---
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
(original)
+++
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
Thu Jul 19 17:55:05 2007
@@ -104,16 +104,12 @@
/**
* A comma separated list of file patterns to include when unpacking the
* artifact.
- *
- * @parameter expression=${mdep.artifact.item.unpack.includes}
*/
private String includes;
/**
* A comma separated list of file patterns to exclude when unpacking the
* artifact.
- *
- * @parameter expression=${mdep.artifact.item.unpack.excludes}
*/
private String excludes;
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?view=diffrev=557829r1=557828r2=557829
==
---
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
(original)
+++
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
Thu Jul 19 17:55:05 2007
@@ -57,15 +57,15 @@
/**
* A comma separated list of file patterns to include when unpacking the
- * artifact.
- *
+ * artifact. i.e. **\/*.xml,**\/*.properties
+ *
* @parameter expression=${mdep.unpack.includes}
*/
private String includes;
/**
* A comma separated list of file patterns to exclude when unpacking the
- * artifact.
+ * artifact. i.e. **\/*.xml,**\/*.properties
*
* @parameter expression=${mdep.unpack.excludes}
*/
@@ -118,22
svn commit: r557831 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/main/java/org/apache/maven/plugin/dependency/ src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ src/main
Author: brianf Date: Thu Jul 19 17:59:13 2007 New Revision: 557831 URL: http://svn.apache.org/viewvc?view=revrev=557831 Log: applied patches from Damian Bradicich for MDEP-47 Added: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java - copied unchanged from r557829, maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackDependenciesMojo.java - copied unchanged from r557829, maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java - copied unchanged from r557829, maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java - copied unchanged from r557829, maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/testUtils/stubs/StubUnpackFileMarkerHandler.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java - copied unchanged from r557829, maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java maven/plugins/trunk/maven-dependency-plugin/src/test/resources/unit/unpack-dependencies-test/test.zip - copied unchanged from r557829, maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/resources/unit/unpack-dependencies-test/test.zip Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-project-dependencies.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?view=diffrev=557831r1=557830r2=557831 == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Jul 19 17:59:13 2007 @@ -77,6 +77,29 @@ build plugins plugin + artifactIdmaven-enforcer-plugin/artifactId + version1.0-alpha-3/version + executions + execution + goals + goalenforce/goal + /goals + idensure-no-container-api/id + configuration + rules + bannedDependencies + excludes + excludeorg.codehaus.plexus:plexus-component-api/exclude + /excludes + messageThe new containers are not supported. You probably added a dependency that is missing the exclusions./message + /bannedDependencies + /rules + failtrue/fail +
svn commit: r557832 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/ main/java/org/apache/maven/plugin/dependency/fromConfiguration/ site/apt/ site/
Author: brianf
Date: Thu Jul 19 18:11:20 2007
New Revision: 557832
URL: http://svn.apache.org/viewvc?view=revrev=557832
Log:
minor site updates
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?view=diffrev=557832r1=557831r2=557832
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
Thu Jul 19 18:11:20 2007
@@ -48,7 +48,7 @@
/**
* A comma separated list of file patterns to include when unpacking the
* artifact. i.e. **\/*.xml,**\/*.properties
- *
+ * @since 2.0-alpha-5
* @parameter expression=${mdep.unpack.includes}
*/
private String includes;
@@ -56,7 +56,7 @@
/**
* A comma separated list of file patterns to exclude when unpacking the
* artifact. i.e. **\/*.xml,**\/*.properties
- *
+ * @since 2.0-alpha-5
* @parameter expression=${mdep.unpack.excludes}
*/
private String excludes;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?view=diffrev=557832r1=557831r2=557832
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
Thu Jul 19 18:11:20 2007
@@ -58,7 +58,7 @@
/**
* A comma separated list of file patterns to include when unpacking the
* artifact. i.e. **\/*.xml,**\/*.properties
- *
+ * @since 2.0-alpha-5
* @parameter expression=${mdep.unpack.includes}
*/
private String includes;
@@ -66,7 +66,7 @@
/**
* A comma separated list of file patterns to exclude when unpacking the
* artifact. i.e. **\/*.xml,**\/*.properties
- *
+ * @since 2.0-alpha-5
* @parameter expression=${mdep.unpack.excludes}
*/
private String excludes;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt?view=diffrev=557832r1=557831r2=557832
==
---
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/unpacking-artifacts.apt
Thu Jul 19 18:11:20 2007
@@ -107,8 +107,8 @@
overWrite[ true or false ]/overWrite
outputDirectory[ output directory ]/outputDirectory
destFileName[ filename ]/destFileName
- includes[ comma seperated list of file filters ]/includes
- excludes[ comma seperated list of file filters ]/excludes
+ includes[ comma separated list of file filters ]/includes
+ excludes[ comma separated list of file filters ]/excludes
/artifactItem
/artifactItems
!-- other configurations here --
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt?view=diffrev=557832r1=557831r2=557832
==
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Thu Jul
19 18:11:20 2007
@@ -269,8 +269,8 @@
overWrite[ true or false ]/overWrite
outputDirectory[ output directory ]/outputDirectory
destFileName[ filename ]/destFileName
- includes[ comma
svn commit: r557845 - /maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt
Author: brianf Date: Thu Jul 19 18:59:34 2007 New Revision: 557845 URL: http://svn.apache.org/viewvc?view=revrev=557845 Log: fixed docs to match actual string parameter Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt?view=diffrev=557845r1=557844r2=557845 == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt Thu Jul 19 18:59:34 2007 @@ -40,9 +40,7 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-release-plugin/artifactId configuration - preparationGoals -preparationGoalyour-goal-here/preparationGoal - /preparationGoals +preparationGoalsclean verify/preparationGoals /configuration /plugin [...]
