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 ba23b8c Fixing spring_hibernate sample with JDK11
new a6f039c Merge pull request #175 from coheigea/spring_hibernate
ba23b8c is described below
commit ba23b8cbb132c908713d7711d333f8d894cf71e9
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Nov 11 10:21:50 2019 +0000
Fixing spring_hibernate sample with JDK11
---
samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml | 4 ++--
samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
b/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
index 701541b..6ec3567 100644
--- a/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
+++ b/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
@@ -23,9 +23,9 @@
xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
+ http://www.springframework.org/schema/context/spring-context.xsd";>
<!-- Enable annotation component scanning and autowiring of web package -->
<context:annotation-config/>
diff --git a/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
b/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
index d874db2..a60566d 100644
--- a/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
+++ b/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
- version="3.1">
+ version="3.1"
+ metadata-complete="true">
<!-- ===================================================================
- Context parameters
