You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/05/08 22:28:23 UTC
svn commit: r536316 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/main/java/org/apache/maven/plugin/assembly/archive/task/
src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/
Author: jdcasey
Date: Tue May 8 13:28:22 2007
New Revision: 536316
URL: http://svn.apache.org/viewvc?view=rev&rev=536316
Log:
Fixing resolution of dependencies that have legacy POMs, and excluding the repo-assembly IT until it can be fixed.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diff&rev=536316&r1=536315&r2=536316
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue May 8 13:28:22 2007
@@ -240,6 +240,7 @@
<!-- TODO: Fix this! It's logged in JIRA for 2.2. -->
<pomExclude>mojo-configuration/manifest-with-customEntry/pom.xml</pomExclude>
+ <pomExclude>repository-assembly/pom.xml</pomExclude>
</pomExcludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<localRepositoryPath>${basedir}/target/local-repository</localRepositoryPath>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?view=diff&rev=536316&r1=536315&r2=536316
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Tue May 8 13:28:22 2007
@@ -107,7 +107,7 @@
try
{
depProject = projectBuilder.buildFromRepository( depArtifact, configSource.getRemoteRepositories(),
- configSource.getLocalRepository() );
+ configSource.getLocalRepository(), true );
}
catch ( ProjectBuildingException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?view=diff&rev=536316&r1=536315&r2=536316
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java Tue May 8 13:28:22 2007
@@ -263,7 +263,7 @@
{
try
{
- projectBuilder.buildFromRepository( null, null, null );
+ projectBuilder.buildFromRepository( null, null, null, true );
projectBuilderCtl.setMatcher( MockControl.ALWAYS_MATCHER );
projectBuilderCtl.setReturnValue( project, MockControl.ONE_OR_MORE );
}