From 84db17c6e78d82c642f589a4cf5c26ba9e56c308 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 5 May 2019 19:54:26 +0000
Subject: [PATCH] CCM NG: Updated Thorntail and Shiro dependencies

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@6013 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle-devel-thorntail/pom.xml                     |  6 +++---
 .../src/main/resources/shiro.ini                       |  2 ++
 .../src/main/resources/shiro.ini                       |  2 ++
 ccm-cms/src/test/resources/configs/shiro.ini           |  2 ++
 ccm-core/src/test/resources/configs/shiro.ini          |  2 ++
 ccm-shortcuts/src/test/resources/configs/shiro.ini     |  4 +++-
 pom.xml                                                | 10 +++++-----
 7 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml
index 605a93761..8ebfa3c5a 100644
--- a/ccm-bundle-devel-thorntail/pom.xml
+++ b/ccm-bundle-devel-thorntail/pom.xml
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>io.thorntail</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.3.0.Final</version>
+                <version>2.4.0.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.1.4.jre7</version>
+            <version>42.2.5.jre7</version>
         </dependency>
         
         <dependency>
@@ -147,7 +147,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs</artifactId>
-            <version>2.3.5</version>
+            <version>2.3.6</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
diff --git a/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini b/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini
index 469c812fa..056b076e5 100644
--- a/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini
+++ b/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini
@@ -1,5 +1,7 @@
 [main]
 
+filterChainResolver = org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver
+
 passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher
 passwordService = org.apache.shiro.authc.credential.DefaultPasswordService
 passwordMatcher.passwordService = $passwordService
diff --git a/ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini b/ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini
index 469c812fa..056b076e5 100644
--- a/ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini
+++ b/ccm-bundle-devel-wildfly-web/src/main/resources/shiro.ini
@@ -1,5 +1,7 @@
 [main]
 
+filterChainResolver = org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver
+
 passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher
 passwordService = org.apache.shiro.authc.credential.DefaultPasswordService
 passwordMatcher.passwordService = $passwordService
diff --git a/ccm-cms/src/test/resources/configs/shiro.ini b/ccm-cms/src/test/resources/configs/shiro.ini
index 83ba88a37..ff6d7012f 100644
--- a/ccm-cms/src/test/resources/configs/shiro.ini
+++ b/ccm-cms/src/test/resources/configs/shiro.ini
@@ -1,5 +1,7 @@
 [main]
 
+filterChainResolver = org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver
+
 passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher
 passwordService = org.apache.shiro.authc.credential.DefaultPasswordService
 passwordMatcher.passwordService = $passwordService
diff --git a/ccm-core/src/test/resources/configs/shiro.ini b/ccm-core/src/test/resources/configs/shiro.ini
index f313a39e8..364c1fc38 100644
--- a/ccm-core/src/test/resources/configs/shiro.ini
+++ b/ccm-core/src/test/resources/configs/shiro.ini
@@ -1,5 +1,7 @@
 [main]
 
+filterChainResolver = org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver
+
 passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher
 passwordService = org.apache.shiro.authc.credential.DefaultPasswordService
 passwordMatcher.passwordService = $passwordService
diff --git a/ccm-shortcuts/src/test/resources/configs/shiro.ini b/ccm-shortcuts/src/test/resources/configs/shiro.ini
index f313a39e8..914b226dc 100644
--- a/ccm-shortcuts/src/test/resources/configs/shiro.ini
+++ b/ccm-shortcuts/src/test/resources/configs/shiro.ini
@@ -1,5 +1,7 @@
 [main]
 
+filterChainResolver = org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver
+
 passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher
 passwordService = org.apache.shiro.authc.credential.DefaultPasswordService
 passwordMatcher.passwordService = $passwordService
@@ -7,4 +9,4 @@ passwordMatcher.passwordService = $passwordService
 ccmRealm = org.libreccm.security.CcmShiroRealm
 ccmRealm.credentialsMatcher = $passwordMatcher
 
-securityManager.realms = $ccmRealm
\ No newline at end of file
+securityManager.realms = $ccmRealm
diff --git a/pom.xml b/pom.xml
index b2f988b8c..a13cdb99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,7 +276,7 @@
                 <plugin>
                     <groupId>io.thorntail</groupId>
                     <artifactId>thorntail-maven-plugin</artifactId>
-                    <version>2.3.0.Final</version>
+                    <version>2.4.0.Final</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -467,12 +467,12 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
-                <version>1.2.5</version>
+                <version>1.4.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-web</artifactId>
-                <version>1.3.2</version>
+                <version>1.4.0</version>
             </dependency>
             
             <!-- Json Web Token support -->
@@ -724,13 +724,13 @@
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-managed</artifactId>
-                <version>2.1.1.Final</version>
+                <version>2.2.0.Final</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-remote</artifactId>
-                <version>2.1.1.Final</version>
+                <version>2.2.0.Final</version>
                 <scope>test</scope>
             </dependency>