This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5347-digester
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2379bed8b3b597c153eaf27d6e9c8bbfab085911
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Wed Sep 27 08:17:05 2023 +0200
WW-5347 Upgrades to commons-digester3 ver 3.2
---
bundles/demo/pom.xml | 4 ++--
core/pom.xml | 5 -----
plugins/osgi/pom.xml | 4 ++--
plugins/tiles/pom.xml | 4 ++--
.../digester/DigesterDefinitionsReader.java | 25 ++++++++--------------
pom.xml | 18 ++--------------
6 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 647be8c9c..884bdce3a 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index bbd397ba7..ea2f9ec5d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -217,11 +217,6 @@
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 34168ccc6..a5b4ed0ad 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -85,8 +85,8 @@
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
</dependency>
<dependency>
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 61bb1f7ea..440f6ee79 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -67,8 +67,8 @@
<dependencies>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
diff --git
a/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
b/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
index ccbed0a81..e4fedbe21 100644
---
a/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
+++
b/plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java
@@ -19,8 +19,8 @@
package org.apache.tiles.core.definition.digester;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.Rule;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.Rule;
import org.apache.struts2.StrutsException;
import org.apache.tiles.api.Attribute;
import org.apache.tiles.api.Definition;
@@ -68,13 +68,6 @@ import java.util.Map;
*/
public class DigesterDefinitionsReader implements DefinitionsReader {
- /**
- * Digester validation parameter name.
- */
- public static final String PARSER_VALIDATE_PARAMETER_NAME =
"org.apache.tiles.definition.digester.DigesterDefinitionsReader.PARSER_VALIDATE";
-
- // Digester rules constants for tag interception.
-
/**
* Intercepts a <definition> tag.
*/
@@ -147,7 +140,7 @@ public class DigesterDefinitionsReader implements
DefinitionsReader {
/** {@inheritDoc} */
@Override
public void begin(String namespace, String name, Attributes
attributes) {
- Definition definition = (Definition) digester.peek();
+ Definition definition = digester.peek();
definition.setName(attributes.getValue("name"));
definition.setPreparer(attributes.getValue("preparer"));
String extendsAttribute = attributes.getValue("extends");
@@ -179,7 +172,7 @@ public class DigesterDefinitionsReader implements
DefinitionsReader {
/** {@inheritDoc} */
@Override
public void begin(String namespace, String name, Attributes
attributes) {
- Attribute attribute = (Attribute) digester.peek();
+ Attribute attribute = digester.peek();
attribute.setValue(attributes.getValue("value"));
String expression = attributes.getValue("expression");
attribute.setExpressionObject(Expression
@@ -200,8 +193,8 @@ public class DigesterDefinitionsReader implements
DefinitionsReader {
/** {@inheritDoc} */
@Override
public void begin(String namespace, String name, Attributes
attributes) {
- Attribute attribute = (Attribute) digester.peek(0);
- Definition definition = (Definition) digester.peek(1);
+ Attribute attribute = digester.peek(0);
+ Definition definition = digester.peek(1);
definition.putAttribute(attributes.getValue("name"), attribute,
"true".equals(attributes.getValue("cascade")));
}
@@ -218,11 +211,11 @@ public class DigesterDefinitionsReader implements
DefinitionsReader {
/** {@inheritDoc} */
@Override
public void begin(String namespace, String name, Attributes
attributes) {
- Definition definition = (Definition) digester.peek(0);
+ Definition definition = digester.peek(0);
if (definition.getName() == null) {
definition.setName(getNextUniqueDefinitionName(definitions));
}
- Attribute attribute = (Attribute) digester.peek(1);
+ Attribute attribute = digester.peek(1);
attribute.setValue(definition.getName());
attribute.setRenderer("definition");
}
@@ -232,7 +225,7 @@ public class DigesterDefinitionsReader implements
DefinitionsReader {
* <code>Digester</code> object used to read Definition data
* from the source.
*/
- protected Digester digester;
+ protected static Digester digester;
/**
* The set of public identifiers, and corresponding resource names for
diff --git a/pom.xml b/pom.xml
index c93c77b97..4b9e12356 100644
--- a/pom.xml
+++ b/pom.xml
@@ -760,13 +760,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
<version>3.2</version>
- <optional>true</optional>
- <!-- Prevent inclusion of ASM 3.3.1 via transitive dependency
from velocity-tools-view/commons-digester3/cglib 2.2.2
- (its presence creates classpath conflicts / duplicate ASM
jars due to ASM groupId changing after 3.x). -->
<exclusions>
<exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -876,17 +873,6 @@
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
</dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
