Should these rules be codified in corresponding tests of some sort? I
can imagine digging back through the logs to find out why they were
set that way will be a pain later :)
Cheers,
Brett
On 20/11/2008, at 12:31 PM, [EMAIL PROTECTED] wrote:
Author: sisbell
Date: Wed Nov 19 17:31:24 2008
New Revision: 719151
URL: http://svn.apache.org/viewvc?rev=719151&view=rev
Log:
If DependencyManagement section gave a dependency a scope of
provided, then it would not join with a dependency with a scope of
compile, causing Nexus build to fail. Fixed this rule for scopes of
provided and compile to be treated as same type for purpose of
joining.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/
maven/project/builder/ArtifactModelContainerFactory.java
Modified: maven/components/trunk/maven-project/src/main/java/org/
apache/maven/project/builder/ArtifactModelContainerFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=719151&r1=719150&r2=719151&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/
maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/
maven/project/builder/ArtifactModelContainerFactory.java Wed Nov 19
17:31:24 2008
@@ -149,7 +149,7 @@
type = "jar";
}
- if ( scope == null )
+ if ( scope == null || scope.equals("provided"))
{
scope = "compile";
}
--
Brett Porter
[EMAIL PROTECTED]
http://blogs.exist.com/bporter/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
