You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by mi...@apache.org on 2024/07/30 18:04:52 UTC
(velocity-engine) branch master updated (86cfcf41 -> 9ca652c9)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
from 86cfcf41 [VELOCITY-977] Upgrade Java Compiler Compiler to Version 7.0.13
new 8945a787 Fix log messages
new 9ca652c9 Replace defunct FindBugs with SpotBugs
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:
velocity-engine-core/pom.xml | 10 +++++-----
.../etc/build/{findbugs-exclude.xml => spotbugs-exclude.xml} | 3 +--
.../main/java/org/apache/velocity/runtime/ParserPoolImpl.java | 2 +-
.../main/java/org/apache/velocity/runtime/RuntimeInstance.java | 4 ++--
.../velocity/runtime/parser/node/BooleanPropertyExecutor.java | 2 +-
.../apache/velocity/runtime/parser/node/PropertyExecutor.java | 2 +-
.../velocity/runtime/parser/node/PublicFieldExecutor.java | 2 +-
7 files changed, 12 insertions(+), 13 deletions(-)
rename velocity-engine-core/src/etc/build/{findbugs-exclude.xml => spotbugs-exclude.xml} (97%)
mode change 100755 => 100644
(velocity-engine) 02/02: Replace defunct FindBugs with SpotBugs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit 9ca652c9ccdc45aa41111dda26e840f8d055a1eb
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jul 30 20:04:29 2024 +0200
Replace defunct FindBugs with SpotBugs
---
velocity-engine-core/pom.xml | 10 +++++-----
.../etc/build/{findbugs-exclude.xml => spotbugs-exclude.xml} | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml
index 1fe6fba3..ab44cf81 100644
--- a/velocity-engine-core/pom.xml
+++ b/velocity-engine-core/pom.xml
@@ -261,15 +261,15 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>4.8.6.0</version>
<configuration>
<xmlOutput>true</xmlOutput>
<threshold>Low</threshold>
<effort>Max</effort>
- <excludeFilterFile>src/etc/build/findbugs-exclude.xml</excludeFilterFile>
- <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ <excludeFilterFile>src/etc/build/spotbugs-exclude.xml</excludeFilterFile>
+ <xmlOutputDirectory>${project.reporting.outputDirectory}</xmlOutputDirectory>
</configuration>
</plugin>
</plugins>
diff --git a/velocity-engine-core/src/etc/build/findbugs-exclude.xml b/velocity-engine-core/src/etc/build/spotbugs-exclude.xml
old mode 100755
new mode 100644
similarity index 97%
rename from velocity-engine-core/src/etc/build/findbugs-exclude.xml
rename to velocity-engine-core/src/etc/build/spotbugs-exclude.xml
index ed4a7fbb..482c64a7
--- a/velocity-engine-core/src/etc/build/findbugs-exclude.xml
+++ b/velocity-engine-core/src/etc/build/spotbugs-exclude.xml
@@ -18,8 +18,7 @@
under the License.
-->
-<!-- TODO: We should be putting findBugs exclusions -->
-<!-- as annotations in the source code. But that takes JDK 1.5+. -->
+<!-- TODO: We should be putting SpotBugs exclusions as annotations in the source code. -->
<FindBugsFilter>
(velocity-engine) 01/02: Fix log messages
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit 8945a78742f6bc0e43c2e2abd1b0b2bdbc10cc92
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jul 30 20:00:40 2024 +0200
Fix log messages
---
.../src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java | 2 +-
.../src/main/java/org/apache/velocity/runtime/RuntimeInstance.java | 4 ++--
.../apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java | 2 +-
.../org/apache/velocity/runtime/parser/node/PropertyExecutor.java | 2 +-
.../org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
index 3934f2d0..13d8f58f 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
@@ -54,7 +54,7 @@ public class ParserPoolImpl implements ParserPool {
pool.put(rsvc.createNewParser());
}
- log.debug("Created '{}' parsers.", max);
+ log.debug("Created {} parsers.", max);
}
/**
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
index 3d77055d..0379e651 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
@@ -273,7 +273,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices
initializing = true;
log.trace("*****************************");
- log.debug("Starting Apache Velocity v" + VelocityEngineVersion.VERSION);
+ log.debug("Starting Apache Velocity " + VelocityEngineVersion.VERSION);
log.trace("RuntimeInstance initializing.");
initializeProperties();
@@ -1502,7 +1502,7 @@ public class RuntimeInstance implements RuntimeConstants, RuntimeServices
}
catch(Exception e)
{
- String msg = "RuntimeInstance.render(): init exception for tag = "+logTag;
+ String msg = "RuntimeInstance.render(): init exception for tag '"+logTag + "'";
log.error(msg, e);
throw new VelocityException(msg, e, getLogContext().getStackTrace());
}
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
index 1c834f8c..3bb9fd80 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/BooleanPropertyExecutor.java
@@ -115,7 +115,7 @@ public class BooleanPropertyExecutor extends PropertyExecutor
}
catch(Exception e)
{
- String msg = "Exception while looking for boolean property getter for '" + property;
+ String msg = "Exception while looking for boolean property getter for '" + property + "'";
log.error(msg, e);
throw new VelocityException(msg, e);
}
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
index 7763724c..644cc8cf 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
@@ -129,7 +129,7 @@ public class PropertyExecutor extends AbstractExecutor
}
catch(Exception e)
{
- String msg = "Exception while looking for property getter for '" + property;
+ String msg = "Exception while looking for property getter for '" + property + "'";
log.error(msg, e);
throw new VelocityException(msg, e);
}
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java
index 643f9817..599bc804 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/PublicFieldExecutor.java
@@ -110,7 +110,7 @@ public class PublicFieldExecutor extends AbstractExecutor
}
catch(Exception e)
{
- String msg = "Exception while looking for public field '" + property;
+ String msg = "Exception while looking for public field '" + property + "'";
log.error(msg, e);
throw new VelocityException(msg, e);
}