Author: markh
Date: Fri Jun 29 01:57:06 2007
New Revision: 551827
URL: http://svn.apache.org/viewvc?view=rev&rev=551827
Log:
[MNG-612] implement conflict resolution techniques
o Changed conflict resolvers POM property name to use Java variable name
conventions
Modified:
maven/components/branches/MNG-612/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
Modified:
maven/components/branches/MNG-612/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-612/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java?view=diff&rev=551827&r1=551826&r2=551827
==============================================================================
---
maven/components/branches/MNG-612/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
(original)
+++
maven/components/branches/MNG-612/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
Fri Jun 29 01:57:06 2007
@@ -43,7 +43,7 @@
/**
* The POM property name for the comma-separated list of conflict resolver
types.
*/
- private static final String CONFLICT_RESOLVERS_PROPERTY =
"maven.conflict.resolvers";
+ private static final String CONFLICT_RESOLVERS_PROPERTY =
"mavenConflictResolvers";
private ProjectUtils()
{
@@ -120,8 +120,8 @@
/**
* Gets a list of conflict resolvers for the specified project. The
project's conflict resolvers are defined by the
- * POM property <code>maven.conflict.resolvers</code> as a comma-separated
list of conflict resolver types.
- * Conflict resolver instances for these types are then obtained from the
factory and returned.
+ * POM property <code>mavenConflictResolvers</code> as a comma-separated
list of conflict resolver types. Conflict
+ * resolver instances for these types are then obtained from the factory
and returned.
*
* @param project
* the project
