You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/01/21 14:25:00 UTC
svn commit: r1061800 - in /maven/shared/trunk/maven-doxia-tools: pom.xml src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Author: ltheussl
Date: Fri Jan 21 13:24:59 2011
New Revision: 1061800

URL: http://svn.apache.org/viewvc?rev=1061800&view=rev
Log:
upgrade plexus-utils

Modified:
    maven/shared/trunk/maven-doxia-tools/pom.xml
    maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Modified: maven/shared/trunk/maven-doxia-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=1061800&r1=1061799&r2=1061800&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/pom.xml (original)
+++ maven/shared/trunk/maven-doxia-tools/pom.xml Fri Jan 21 13:24:59 2011
@@ -129,7 +129,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4.5</version>
+      <version>2.0.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+      <version>1.14</version>
     </dependency>
 
     <!-- test -->

Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1061800&r1=1061799&r2=1061800&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Fri Jan 21 13:24:59 2011
@@ -65,10 +65,11 @@ import org.codehaus.plexus.logging.Abstr
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
-import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
-import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
-import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
+import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**
@@ -615,7 +616,14 @@ public class DefaultSiteTool
 
         interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
 
-        interpolatedSiteDescriptorContent = interpolator.interpolate( interpolatedSiteDescriptorContent, "project" );
+        try
+        {
+            interpolatedSiteDescriptorContent = interpolator.interpolate( interpolatedSiteDescriptorContent, "project" );
+        }
+        catch ( InterpolationException e )
+        {
+            throw new SiteToolException( "Cannot interpolate site descriptor: " + e.getMessage(), e );
+        }
 
         props.put( "inputEncoding", inputEncoding );