File maven-doxia-tools-update-interpolation.patch of Package maven-doxia-tools

Overview Repositories Revisions Requests Users Attributes Meta

File maven-doxia-tools-update-interpolation.patch of Package maven-doxia-tools (Revision 6db6ecf697631e028597c3e1fed725e8)

Currently displaying revision 6db6ecf697631e028597c3e1fed725e8 , Show latest

Only in maven-doxia-tools-1.2/: .m2
diff -ur maven-doxia-tools-1.2.orig/pom.xml maven-doxia-tools-1.2/pom.xml
--- maven-doxia-tools-1.2.orig/pom.xml	2010-03-25 17:23:24.358735126 +0000
+++ maven-doxia-tools-1.2/pom.xml	2010-03-25 17:39:39.072735547 +0000
@@ -131,6 +131,11 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.4.5</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+      <version>1.13</version>
+    </dependency>
 
     
     <dependency>
diff -ur maven-doxia-tools-1.2.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java maven-doxia-tools-1.2/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
--- maven-doxia-tools-1.2.orig/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2010-03-25 17:23:24.357735585 +0000
+++ maven-doxia-tools-1.2/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2010-03-25 17:40:33.821673446 +0000
@@ -45,10 +45,10 @@
 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.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
@@ -672,7 +672,11 @@
 
         interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
 
-        siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+	try {
+		siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+	} catch (org.codehaus.plexus.interpolation.InterpolationException e) {
+		throw new SiteToolException( "InterpolationException: cannot interpolate environment properties: " + e.getMessage(), e);
+	}
 
         props.put( "inputEncoding", inputEncoding );
 
Only in maven-doxia-tools-1.2/: target

Places

File maven-doxia-tools-update-interpolation.patch of Package maven-doxia-tools (Revision 6db6ecf697631e028597c3e1fed725e8)

Places