You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/08/14 02:42:39 UTC
svn commit: r685736 -
/portals/jetspeed-2/portal/branches/JS2-869/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java
Author: ate
Date: Wed Aug 13 17:42:39 2008
New Revision: 685736
URL: http://svn.apache.org/viewvc?rev=685736&view=rev
Log:
Synchronizing with trunk update of the MvnMojo:
If the .m2/settings.xml defines a custom </localRepository> location, executing jetspeed-mvn for a custom pom *and* a custom jetspeed-mvn-settings.xml,
the custom jetspeed-mvn-settings.xml also needs to be configured using that same </localRepository>, otherwise locally installled artifacts might not be resolved.
As this is quit a common case but easily forgotten, the currently defined localRepository path is now automatically passed onto the spawned maven execution for a custom pom as well.
Modified:
portals/jetspeed-2/portal/branches/JS2-869/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java
Modified: portals/jetspeed-2/portal/branches/JS2-869/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-869/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java?rev=685736&r1=685735&r2=685736&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-869/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-869/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java Wed Aug 13 17:42:39 2008
@@ -331,6 +331,10 @@
request.setShowErrors(getLog().isErrorEnabled());
request.setDebug(getLog().isDebugEnabled());
request.setOffline(settings.isOffline());
+ if (settings.getLocalRepository() != null)
+ {
+ request.setLocalRepositoryDirectory(new File(settings.getLocalRepository()));
+ }
String mavenOpts = props.getProperty("jetspeed.mvn.mavenOpts", null);
if (StringUtils.isEmpty(mavenOpts) && !StringUtils.isEmpty(target.mavenOpts))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org