From 2e599fcd1adb6ac867f9d307c845d78303bc0906 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 25 Oct 2021 13:07:33 +0200
Subject: [PATCH] [Misc] Remove all version checks for no-longer supported
XWiki versions * After template execution
---
12/mysql-tomcat/Dockerfile | 4 ++--
12/mysql-tomcat/xwiki/hibernate.cfg.xml | 1 -
12/postgres-tomcat/Dockerfile | 4 ++--
12/postgres-tomcat/xwiki/hibernate.cfg.xml | 1 -
13/mysql-tomcat/Dockerfile | 4 ++--
13/mysql-tomcat/xwiki/hibernate.cfg.xml | 1 -
13/postgres-tomcat/Dockerfile | 4 ++--
13/postgres-tomcat/xwiki/hibernate.cfg.xml | 1 -
8 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index ec3f45c..79bfde2 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
# _/ /'`\ \_ \ /\ / | | | |`\ \ | |
# |____||____| \/ \/ [___][__| \_][___]
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
# Note: when using docker-compose, the ENV values below are overridden from the .env file.
diff --git a/12/mysql-tomcat/xwiki/hibernate.cfg.xml b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
index 06fd127..27f0836 100644
--- a/12/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/12/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -99,6 +99,5 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="notification-filter-preferences.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
- <mapping resource="activitystream.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index a45a44e..871e7b5 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
# _/ /'`\ \_ \ /\ / | | | |`\ \ | |
# |____||____| \/ \/ [___][__| \_][___]
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
# Note: when using docker-compose, the ENV values below are overridden from the .env file.
diff --git a/12/postgres-tomcat/xwiki/hibernate.cfg.xml b/12/postgres-tomcat/xwiki/hibernate.cfg.xml
index f0c065d..da57a10 100644
--- a/12/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/12/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -103,6 +103,5 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="notification-filter-preferences.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
- <mapping resource="activitystream.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index 963fac7..15f0877 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
# _/ /'`\ \_ \ /\ / | | | |`\ \ | |
# |____||____| \/ \/ [___][__| \_][___]
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
# Note: when using docker-compose, the ENV values below are overridden from the .env file.
diff --git a/13/mysql-tomcat/xwiki/hibernate.cfg.xml b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
index 06fd127..27f0836 100644
--- a/13/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/13/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -99,6 +99,5 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="notification-filter-preferences.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
- <mapping resource="activitystream.hbm.xml"/>
</session-factory>
</hibernate-configuration>
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 9d590af..2534896 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jdk11-temurin
+FROM tomcat:9
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -26,7 +26,7 @@ FROM tomcat:8-jdk11-temurin
# _/ /'`\ \_ \ /\ / | | | |`\ \ | |
# |____||____| \/ \/ [___][__| \_][___]
-MAINTAINER Vincent Massol <vincent@massol.net>
+MAINTAINER XWiki Committers
# Note: when using docker-compose, the ENV values below are overridden from the .env file.
diff --git a/13/postgres-tomcat/xwiki/hibernate.cfg.xml b/13/postgres-tomcat/xwiki/hibernate.cfg.xml
index f0c065d..da57a10 100644
--- a/13/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/13/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -103,6 +103,5 @@
<mapping resource="instance.hbm.xml"/>
<mapping resource="notification-filter-preferences.hbm.xml"/>
<mapping resource="mailsender.hbm.xml"/>
- <mapping resource="activitystream.hbm.xml"/>
</session-factory>
</hibernate-configuration>
--
GitLab