You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by po...@apache.org on 2022/01/11 19:50:49 UTC
[creadur-whisker] branch master updated (bc6c3a5 -> a51304a)
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git.
from bc6c3a5 Migrate to jdom2 to fix CVE-2021-33813
new 5dd52f0 Upgrade to Velocity2 - Remove logging configurability and fix imports to commons-collection
new a51304a Fix build warning about missing scope
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-whisker-maven-plugin/pom.xml | 1 +
.../apache/creadur/whisker/it/CheckClosure.java | 2 +-
.../whisker/it/CheckHasPassedPredicate.java | 4 +-
.../apache/creadur/whisker/it/CheckHelpers.java | 2 +-
.../apache/creadur/whisker/it/DoCheckClosure.java | 2 +-
.../apache/creadur/whisker/it/ReportClosure.java | 2 +-
apache-whisker-velocity/pom.xml | 2 +-
.../whisker/out/velocity/RenderingHelper.java | 2 +-
.../whisker/out/velocity/VelocityReports.java | 93 +---------------------
pom.xml | 4 +-
10 files changed, 12 insertions(+), 102 deletions(-)
[creadur-whisker] 02/02: Fix build warning about missing scope
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git
commit a51304a26f2fcc7b90aca352935c70146adda1b3
Author: P. Ottlinger <po...@apache.org>
AuthorDate: Tue Jan 11 20:49:02 2022 +0100
Fix build warning about missing scope
---
apache-whisker-maven-plugin/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/apache-whisker-maven-plugin/pom.xml b/apache-whisker-maven-plugin/pom.xml
index 22766b9..2bf749b 100644
--- a/apache-whisker-maven-plugin/pom.xml
+++ b/apache-whisker-maven-plugin/pom.xml
@@ -31,6 +31,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.8.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
[creadur-whisker] 01/02: Upgrade to Velocity2 - Remove logging configurability and fix imports to commons-collection
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-whisker.git
commit 5dd52f003d88fb7093b5b63bc221763b79a20c33
Author: P. Ottlinger <po...@apache.org>
AuthorDate: Tue Jan 11 20:46:57 2022 +0100
Upgrade to Velocity2 - Remove logging configurability and fix imports to commons-collection
---
.../apache/creadur/whisker/it/CheckClosure.java | 2 +-
.../whisker/it/CheckHasPassedPredicate.java | 4 +-
.../apache/creadur/whisker/it/CheckHelpers.java | 2 +-
.../apache/creadur/whisker/it/DoCheckClosure.java | 2 +-
.../apache/creadur/whisker/it/ReportClosure.java | 2 +-
apache-whisker-velocity/pom.xml | 2 +-
.../whisker/out/velocity/RenderingHelper.java | 2 +-
.../whisker/out/velocity/VelocityReports.java | 93 +---------------------
pom.xml | 4 +-
9 files changed, 11 insertions(+), 102 deletions(-)
diff --git a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckClosure.java b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckClosure.java
index 73ff64e..b8f4a7e 100644
--- a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckClosure.java
+++ b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckClosure.java
@@ -18,7 +18,7 @@
*/
package org.apache.creadur.whisker.it;
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
public abstract class CheckClosure implements Closure {
diff --git a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHasPassedPredicate.java b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHasPassedPredicate.java
index a31a82b..d9daa15 100644
--- a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHasPassedPredicate.java
+++ b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHasPassedPredicate.java
@@ -19,8 +19,8 @@
package org.apache.creadur.whisker.it;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.NotPredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.NotPredicate;
public class CheckHasPassedPredicate implements Predicate {
diff --git a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHelpers.java b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHelpers.java
index c742919..ad87bb6 100644
--- a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHelpers.java
+++ b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/CheckHelpers.java
@@ -19,7 +19,7 @@
package org.apache.creadur.whisker.it;
-import static org.apache.commons.collections.CollectionUtils.*;
+import static org.apache.commons.collections4.CollectionUtils.*;
import static org.apache.creadur.whisker.it.CheckHasPassedPredicate.*;
import static org.apache.creadur.whisker.it.Not.*;
diff --git a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/DoCheckClosure.java b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/DoCheckClosure.java
index 264f991..741aa7f 100644
--- a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/DoCheckClosure.java
+++ b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/DoCheckClosure.java
@@ -19,7 +19,7 @@
package org.apache.creadur.whisker.it;
-import static org.apache.commons.collections.CollectionUtils.*;
+import static org.apache.commons.collections4.CollectionUtils.*;
import java.util.Collection;
diff --git a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/ReportClosure.java b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/ReportClosure.java
index 3b48e31..a692598 100644
--- a/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/ReportClosure.java
+++ b/apache-whisker-maven-plugin/src/test/java/org/apache/creadur/whisker/it/ReportClosure.java
@@ -19,7 +19,7 @@
package org.apache.creadur.whisker.it;
-import static org.apache.commons.collections.CollectionUtils.*;
+import static org.apache.commons.collections4.CollectionUtils.*;
import java.util.Collection;
diff --git a/apache-whisker-velocity/pom.xml b/apache-whisker-velocity/pom.xml
index 884adae..fb324c4 100644
--- a/apache-whisker-velocity/pom.xml
+++ b/apache-whisker-velocity/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
diff --git a/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/RenderingHelper.java b/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/RenderingHelper.java
index 86c4947..ae6d443 100644
--- a/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/RenderingHelper.java
+++ b/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/RenderingHelper.java
@@ -18,7 +18,7 @@
*/
package org.apache.creadur.whisker.out.velocity;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.creadur.whisker.app.Configuration;
import org.apache.creadur.whisker.model.ByOrganisation;
import org.apache.creadur.whisker.model.Descriptor;
diff --git a/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/VelocityReports.java b/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/VelocityReports.java
index 5648357..37b68d2 100644
--- a/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/VelocityReports.java
+++ b/apache-whisker-velocity/src/main/java/org/apache/creadur/whisker/out/velocity/VelocityReports.java
@@ -32,13 +32,11 @@ import org.apache.creadur.whisker.model.Descriptor;
import org.apache.creadur.whisker.scan.Directory;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.log.LogChute;
/**
* Wraps velocity engine.
*/
-public class VelocityReports implements LogChute {
+public class VelocityReports {
/** XML generation template. */
private static final Product[] PRODUCTS_THAT_GENERATE_TEMPLATES
= {Product.XML_TEMPLATE};
@@ -69,7 +67,6 @@ public class VelocityReports implements LogChute {
this.writerFactory = writerFactory;
this.log = log;
engine = new VelocityEngine();
- engine.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, this);
engine.setProperty(VelocityEngine.RESOURCE_LOADER, "classpath");
engine.setProperty("classpath.resource.loader.class",
"org.apache.velocity.runtime.resource.loader."
@@ -78,94 +75,6 @@ public class VelocityReports implements LogChute {
}
/**
- * Unused.
- * @param services unused
- * @see LogChute#init(RuntimeServices)
- */
- public final void init(final RuntimeServices services) { }
-
- /**
- * Indicates whether logging is enabled.
- * @param level at this level
- * @return true when log level is enabled, false otherwise
- * @see LogChute#isLevelEnabled(int)
- */
- public final boolean isLevelEnabled(final int level) {
- switch (level) {
- case DEBUG_ID:
- return log.isDebugEnabled();
- case TRACE_ID:
- return log.isTraceEnabled();
- case INFO_ID:
- return log.isInfoEnabled();
- case WARN_ID:
- return log.isWarnEnabled();
- case ERROR_ID:
- return log.isErrorEnabled();
- default:
- return false;
- }
- }
-
- /**
- * Logs a message.
- * @param level at level
- * @param message possibly null
- * @see LogChute#log(int, String)
- */
- public final void log(final int level, final String message) {
- switch (level) {
- case DEBUG_ID:
- log.debug(message);
- break;
- case TRACE_ID:
- log.trace(message);
- break;
- case INFO_ID:
- log.info(message);
- break;
- case WARN_ID:
- log.warn(message);
- break;
- case ERROR_ID:
- log.error(message);
- break;
- default:
- log.trace(message);
- }
- }
-
- /**
- * Logs a message from Velocity.
- * @param level log level
- * @param message possibly null
- * @param throwable possibly null
- * @see LogChute#log(int, String, Throwable)
- */
- public final void log(final int level,
- final String message, final Throwable throwable) {
- switch (level) {
- case DEBUG_ID:
- log.debug(message, throwable);
- break;
- case TRACE_ID:
- log.trace(message, throwable);
- break;
- case INFO_ID:
- log.info(message, throwable);
- break;
- case WARN_ID:
- log.warn(message, throwable);
- break;
- case ERROR_ID:
- log.error(message, throwable);
- break;
- default:
- log.trace(message, throwable);
- }
- }
-
- /**
* Reports on work.
* @param work not null
* @param configuration not null
diff --git a/pom.xml b/pom.xml
index 3e5a13b..01fbac0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>