From 74bd74238adbd326c1d6d6c2d7b0a5f6f8076447 Mon Sep 17 00:00:00 2001
From: Guillaume Delhumeau <guillaume.delhumeau@xwiki.com>
Date: Tue, 26 Feb 2019 11:44:26 +0100
Subject: [PATCH] XDOCKER-100: Upgrade stable version to 11.1.
---
10/mysql-tomcat/xwiki/hibernate.cfg.xml | 1 -
10/postgres-tomcat/xwiki/hibernate.cfg.xml | 1 -
11/mysql-tomcat/xwiki/hibernate.cfg.xml | 1 -
11/postgres-tomcat/xwiki/hibernate.cfg.xml | 1 -
template/xwiki/hibernate.cfg.xml | 4 ++--
5 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
index 402e96f..baff61e 100644
--- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -97,7 +97,6 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-
<mapping resource="notification-filter-preferences.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
index 3efb601..a5afc01 100644
--- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -99,7 +99,6 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-
<mapping resource="notification-filter-preferences.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/11/mysql-tomcat/xwiki/hibernate.cfg.xml b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
index ef2cdce..5694751 100644
--- a/11/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -97,7 +97,6 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
<mapping resource="eventstream.hbm.xml"/>
-
<mapping resource="notification-filter-preferences.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/11/postgres-tomcat/xwiki/hibernate.cfg.xml b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
index 481e530..5c6dc7d 100644
--- a/11/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -99,7 +99,6 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
<mapping resource="eventstream.hbm.xml"/>
-
<mapping resource="notification-filter-preferences.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml
index 181c124..ad8b3f7 100644
--- a/template/xwiki/hibernate.cfg.xml
+++ b/template/xwiki/hibernate.cfg.xml
@@ -118,9 +118,9 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>''' %>
<% if (xwikiVersion.startsWith('11.'))
- println '<mapping resource="eventstream.hbm.xml"/>'
+ print '<mapping resource="eventstream.hbm.xml"/>'
else
- println '<mapping resource="activitystream.hbm.xml"/>'
+ print '<mapping resource="activitystream.hbm.xml"/>'
%>
<mapping resource="notification-filter-preferences.hbm.xml"/>
</session-factory>
--
GitLab