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 2021/12/23 15:32:48 UTC
svn commit: r1896320 - in /cxf/web: bin/update-site pom.xml src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Author: dkulp
Date: Thu Dec 23 15:32:48 2021
New Revision: 1896320
URL: http://svn.apache.org/viewvc?rev=1896320&view=rev
Log:
Revert to working CXF
Modified:
cxf/web/bin/update-site
cxf/web/pom.xml
cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Modified: cxf/web/bin/update-site
URL: http://svn.apache.org/viewvc/cxf/web/bin/update-site?rev=1896320&r1=1896319&r2=1896320&view=diff
==============================================================================
--- cxf/web/bin/update-site (original)
+++ cxf/web/bin/update-site Thu Dec 23 15:32:48 2021
@@ -1,4 +1,18 @@
#!/bin/sh
+echo "/home/buildslave/slave/tools/maven/"
+ls /home/buildslave/slave/tools/maven/
+echo "/home/buildslave/slave/tools/java/"
+ls /home/buildslave/slave/tools/java/
+
+
+echo "/home/cmsslave/slave/tools/maven/"
+ls /home/cmsslave/slave/tools/maven/
+echo "/home/cmsslave/slave/tools/java/"
+ls /home/cmsslave/slave/tools/java/
+
+echo "/usr/local/maven/"
+ls /usr/local/maven/
+
which mvn
mvn --version
mvn -Pconfluence,nochecks -e package exec:java $@
Modified: cxf/web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/web/pom.xml?rev=1896320&r1=1896319&r2=1896320&view=diff
==============================================================================
--- cxf/web/pom.xml (original)
+++ cxf/web/pom.xml Thu Dec 23 15:32:48 2021
@@ -28,7 +28,7 @@
<properties>
<enforcer.skip>true</enforcer.skip>
- <cxf.version>3.5.0</cxf.version>
+ <cxf.version>3.1.15</cxf.version>
<extra.arg></extra.arg>
<svn.arg1></svn.arg1>
<svn.arg2></svn.arg2>
@@ -66,8 +66,10 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${cxf.velocity.version}</version>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ <!--artifactId>velocity-engine-core</artifactId>
+ <version>${cxf.velocity.version}</version-->
</dependency>
<dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>
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=1896320&r1=1896319&r2=1896320&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 Thu Dec 23 15:32:48 2021
@@ -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);