From 69b43f313b8fa7791070d85ae06d3ffe2b938da7 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 25 Oct 2021 12:47:38 +0200
Subject: [PATCH] [Misc] Remove all version checks for no-longer supported
XWiki versions
---
template/Dockerfile | 6 +-----
template/xwiki/hibernate.cfg.xml | 3 ---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/template/Dockerfile b/template/Dockerfile
index 23feb58..b65a19f 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,11 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-<% if (xwikiVersion.startsWith('10.'))
- print 'FROM tomcat:8-jdk8-temurin'
- else
- print 'FROM tomcat:8-jdk11-temurin'
-%>
+FROM tomcat:9
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/template/xwiki/hibernate.cfg.xml b/template/xwiki/hibernate.cfg.xml
index 8765173..ecf468d 100644
--- a/template/xwiki/hibernate.cfg.xml
+++ b/template/xwiki/hibernate.cfg.xml
@@ -125,8 +125,5 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="notification-filter-preferences.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>''' %>
- <% if (!xwikiVersion.startsWith('11.'))
- print '<mapping resource="activitystream.hbm.xml"/>'
- %>
</session-factory>
</hibernate-configuration>
--
GitLab