You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2022/01/11 17:13:36 UTC
svn commit: r1896916 - in /cxf/web: pom.xml src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Author: dkulp
Date: Tue Jan 11 17:13:36 2022
New Revision: 1896916
URL: http://svn.apache.org/viewvc?rev=1896916&view=rev
Log:
Upgrade to cxf 3.5.0
Modified:
cxf/web/pom.xml
cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Modified: cxf/web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/web/pom.xml?rev=1896916&r1=1896915&r2=1896916&view=diff
==============================================================================
--- cxf/web/pom.xml (original)
+++ cxf/web/pom.xml Tue Jan 11 17:13:36 2022
@@ -28,7 +28,7 @@
<properties>
<enforcer.skip>true</enforcer.skip>
- <cxf.version>3.1.15</cxf.version>
+ <cxf.version>3.5.0</cxf.version>
<extra.arg></extra.arg>
<svn.arg1></svn.arg1>
<svn.arg2></svn.arg2>
@@ -66,10 +66,8 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- <!--artifactId>velocity-engine-core</artifactId>
- <version>${cxf.velocity.version}</version-->
+ <artifactId>velocity-engine-core</artifactId>
+ <version>${cxf.velocity.version}</version>
</dependency>
<dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>
@@ -92,7 +90,7 @@
<build>
<pluginManagement>
<plugins>
- <!--plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
@@ -102,7 +100,7 @@
<maxmem>256M</maxmem>
<fork>true</fork>
</configuration>
- </plugin-->
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Modified: cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
URL: http://svn.apache.org/viewvc/cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java?rev=1896916&r1=1896915&r2=1896916&view=diff
==============================================================================
--- cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java (original)
+++ cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java Tue Jan 11 17:13:36 2022
@@ -188,7 +188,7 @@ public class SiteExporter implements Run
props.put("resource.loader", "url");
props.put("url.resource.loader.class", clzName);
props.put("url.resource.loader.root", "");
- //props.put("url.resource.loader.timeout", 10000);
+ props.put("url.resource.loader.timeout", 10000);
VelocityEngine engine = new VelocityEngine();
engine.init(props);