svn commit: r1865686 - in /velocity/tools/trunk/velocity-tools-generic: pom.xml src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java

[cb...@apache.org]

Author: cbrisson
Date: Thu Aug 22 14:19:27 2019
New Revision: 1865686

URL: http://svn.apache.org/viewvc?rev=1865686&view=rev
Log:
[VELTOOLS-183] Fix generic tools configuration for beanutils 1.9.4+

Modified:
    velocity/tools/trunk/velocity-tools-generic/pom.xml
    velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java

Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1865686&r1=1865685&r2=1865686&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-generic/pom.xml Thu Aug 22 14:19:27 2019
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.9.3</version>
+      <version>1.9.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

Modified: velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java?rev=1865686&r1=1865685&r2=1865686&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java (original)
+++ velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfiguration.java Thu Aug 22 14:19:27 2019
@@ -21,6 +21,9 @@ package org.apache.velocity.tools.config
 
 import java.io.IOException;
 import java.net.URL;
+
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector;
 import org.xml.sax.SAXException;
 import org.apache.commons.digester3.Digester;
 import org.apache.commons.digester3.RuleSet;
@@ -99,6 +102,9 @@ public class XmlFactoryConfiguration ext
      */
     protected void readImpl(URL url) throws IOException
     {
+        // since beanutils 1.9.4, we need to relax access to the 'class' method
+        BeanUtilsBean.getInstance().getPropertyUtils().removeBeanIntrospector(SuppressPropertiesBeanIntrospector.SUPPRESS_CLASS);
+
         Digester digester = new Digester();
         digester.setNamespaceAware(true);
         digester.setXIncludeAware(true);