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 7f56870 SHIRO-706 - Switch to use Guice4 by default
new 17aafef Merge pull request #150 from coheigea/guice
7f56870 is described below
commit 7f568703e1fc815c63d1fc1575a4821cf0550c18
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Jun 18 10:32:43 2019 +0100
SHIRO-706 - Switch to use Guice4 by default
---
integration-tests/guice3/pom.xml | 6 +++++-
integration-tests/guice4/pom.xml | 6 +-----
pom.xml | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/integration-tests/guice3/pom.xml b/integration-tests/guice3/pom.xml
index c6a4d3c..aed0ffb 100644
--- a/integration-tests/guice3/pom.xml
+++ b/integration-tests/guice3/pom.xml
@@ -31,6 +31,10 @@
<name>Apache Shiro :: ITs :: Guice 3</name>
<packaging>war</packaging>
+ <properties>
+ <guice.version>3.0</guice.version>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -114,4 +118,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/integration-tests/guice4/pom.xml b/integration-tests/guice4/pom.xml
index 69d8a1d..0eaa941 100644
--- a/integration-tests/guice4/pom.xml
+++ b/integration-tests/guice4/pom.xml
@@ -31,10 +31,6 @@
<name>Apache Shiro :: ITs :: Guice 4</name>
<packaging>war</packaging>
- <properties>
- <guice.version>4.1.0</guice.version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -127,4 +123,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index bb155eb..5bc103f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
<log4j.version>1.2.17</log4j.version>
<spring.version>5.1.7.RELEASE</spring.version>
<spring-boot.version>2.1.5.RELEASE</spring-boot.version>
- <guice.version>3.0</guice.version>
+ <guice.version>4.2.2</guice.version>
<jaxrs.api.version>2.0.1</jaxrs.api.version>
<htmlunit.version>2.35.0</htmlunit.version>
