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 b8c8e24 SHIRO-700 - Minor version updates to Spring, Spring Boot +
SLF4J
new af440fa Merge pull request #144 from coheigea/spring_minor
b8c8e24 is described below
commit b8c8e240bceec8d0bd958199f1d46b6e4aaef62e
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Jun 7 10:33:05 2019 +0100
SHIRO-700 - Minor version updates to Spring, Spring Boot + SLF4J
---
pom.xml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1f940cb..70072f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,11 +98,11 @@
<!-- Don't change this version without also changing the shiro-quartz
and shiro-features
modules' OSGi metadata: -->
<quartz.version>1.6.1</quartz.version>
- <slf4j.version>1.7.21</slf4j.version>
+ <slf4j.version>1.7.26</slf4j.version>
<logback.version>1.1.7</logback.version>
<log4j.version>1.2.17</log4j.version>
- <spring.version>4.3.22.RELEASE</spring.version>
- <spring-boot.version>1.5.19.RELEASE</spring-boot.version>
+ <spring.version>4.3.24.RELEASE</spring.version>
+ <spring-boot.version>1.5.21.RELEASE</spring-boot.version>
<guice.version>3.0</guice.version>
<jaxrs.api.version>2.0.1</jaxrs.api.version>
<htmlunit.version>2.35.0</htmlunit.version>
@@ -114,7 +114,6 @@
<junit.version>4.12</junit.version>
<junit.server.jetty.version>0.11.0</junit.server.jetty.version>
<hibernate.version>4.2.21.Final</hibernate.version>
-
<hibernate.annotations.version>3.5.6-Final</hibernate.annotations.version>
<taglib.standard.version>1.1.2</taglib.standard.version>
<!-- so we can mock static methods in 3rd party libraries that
sometimes don't use proper interfaces
ahem, hazelcast, ahem... -->
@@ -1059,12 +1058,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${hibernate.annotations.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
