You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2020/05/09 17:25:45 UTC
[shiro] branch master updated: [SHIRO-773] update groovy for JDK14
builds.
This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new 98dbd5c [SHIRO-773] update groovy for JDK14 builds.
new 72c6b16 Merge pull request #231 from bmhm/SHIRO-773-groovy
98dbd5c is described below
commit 98dbd5c9e5dbf192e8f54dd6d04a3e699e9fad32
Author: Benjamin Marwell <bm...@gmail.com>
AuthorDate: Sat May 9 15:11:27 2020 +0200
[SHIRO-773] update groovy for JDK14 builds.
---
.../cipher/src/main/java/org/apache/shiro/crypto/AesCipherService.java | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 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
index 435b998..c1cd209 100644
--- 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 class AesCipherService extends DefaultBlockCipherService {
setMode(OperationMode.GCM);
setStreamingMode(OperationMode.GCM);
setPaddingScheme(PaddingScheme.NONE);
+ setStreamingPaddingScheme(PaddingScheme.NONE);
}
@Override
diff --git a/pom.xml b/pom.xml
index e154ead..87fc50f 100644
--- 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>