You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/01/10 10:54:43 UTC
[jackrabbit-oak] branch 1.22 updated: OAK-10059: webapp: avoid use of Jackrabbit's transitive commons-collections dependency (#815)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new dcf7e2d0a1 OAK-10059: webapp: avoid use of Jackrabbit's transitive commons-collections dependency (#815)
dcf7e2d0a1 is described below
commit dcf7e2d0a1fd3716178962e175b5ba6830d26bea
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Jan 10 09:24:26 2023 +0100
OAK-10059: webapp: avoid use of Jackrabbit's transitive commons-collections dependency (#815)
---
oak-examples/webapp/pom.xml | 5 +++++
.../src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml
index 453ce35296..bd462c74fe 100644
--- a/oak-examples/webapp/pom.xml
+++ b/oak-examples/webapp/pom.xml
@@ -118,6 +118,11 @@
<artifactId>json-simple</artifactId>
<version>1.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.4</version>
+ </dependency>
<!-- Required for Felix WebConsole -->
<dependency>
diff --git a/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java b/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
index 4c2c4b2ef3..2d005bdd0d 100644
--- a/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
+++ b/oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/AbstractConfig.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.j2ee;
-import org.apache.commons.collections.BeanMap;
+import org.apache.commons.beanutils.BeanMap;
import org.apache.jackrabbit.util.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;