Merge pull request #231 from bmhm/SHIRO-773-groovy

[SHIRO-773] update groovy for JDK14 builds.
apache · May 9, 2020 · 72c6b16 · 72c6b16
2 parents 930380c + 98dbd5c
commit 72c6b16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/crypto/cipher/src/main/java/org/apache/shiro/crypto/AesCipherService.java b/crypto/cipher/src/main/java/org/apache/shiro/crypto/AesCipherService.java
@@ -95,6 +95,7 @@ public AesCipherService() {
         setMode(OperationMode.GCM);
         setStreamingMode(OperationMode.GCM);
         setPaddingScheme(PaddingScheme.NONE);
+        setStreamingPaddingScheme(PaddingScheme.NONE);
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -109,7 +109,7 @@
         <!-- Test 3rd-party dependencies: -->
         <easymock.version>4.0.2</easymock.version>
         <gmaven.version>1.8.0</gmaven.version>
-        <groovy.version>2.5.8</groovy.version>
+        <groovy.version>3.0.3</groovy.version>
         <junit.version>4.12</junit.version>
         <junit.server.jetty.version>0.11.0</junit.server.jetty.version>
         <hibernate.version>5.4.3.Final</hibernate.version>