[shiro] branch main updated: [SHIRO-885] Use OWASP Java Encoder with OSGi manifest

[fpapon]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/main by this push:
     new 8c3b3858 [SHIRO-885] Use OWASP Java Encoder with OSGi manifest
     new bd81ec1f Merge pull request #366 from fpapon/SHIRO-885
8c3b3858 is described below

commit 8c3b3858780ee8f45587cef0c9b976f82e93ceef
Author: francois papon <fpa...@apache.org>
AuthorDate: Wed Jun 29 22:40:36 2022 +0200

    [SHIRO-885] Use OWASP Java Encoder with OSGi manifest
---
 pom.xml                                          | 2 +-
 support/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec480c2c..b8507598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
         <jdk.version>1.8</jdk.version>
         <jetty.version>9.4.34.v20201102</jetty.version>
-        <owasp.java.encoder.version>1.2.2</owasp.java.encoder.version>
+        <owasp.java.encoder.version>1.2.3</owasp.java.encoder.version>
         <!-- Don't change this version without also changing the shiro-quartz 
and shiro-features
              modules' OSGi metadata: -->
         <quartz.version>2.3.2</quartz.version>
diff --git a/support/features/src/main/resources/features.xml 
b/support/features/src/main/resources/features.xml
index 5c6e94d5..dd2f490b 100644
--- a/support/features/src/main/resources/features.xml
+++ b/support/features/src/main/resources/features.xml
@@ -40,7 +40,7 @@
     <feature name="shiro-web" version="${project.version}">
         <feature version="${project.version}">shiro-core</feature>
         <feature version="[2,5)">war</feature>
-        
<bundle>wrap:mvn:org.owasp.encoder/encoder/${owasp.java.encoder.version}</bundle>
+        
<bundle>mvn:org.owasp.encoder/encoder/${owasp.java.encoder.version}</bundle>
         <bundle>mvn:org.apache.shiro/shiro-web/${project.version}</bundle>
     </feature>