XDOCKER-100: Upgrade stable version to 11.1.

10/mysql-tomcat/xwiki/hibernate.cfg.xml

@@ -94,10 +94,10 @@
     <property name="dbcp.maxOpenPreparedStatements">20</property>
     <mapping resource="xwiki.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="activitystream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>

10/postgres-tomcat/xwiki/hibernate.cfg.xml

@@ -96,10 +96,10 @@
     <property name="xwiki.virtual_mode">schema</property>
     <mapping resource="xwiki.postgresql.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="activitystream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>

11/mysql-tomcat/.env

 # Default environment values
-XWIKI_VERSION=11.0.3
+XWIKI_VERSION=11.1
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

11/mysql-tomcat/Dockerfile

@@ -44,9 +44,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION=11.0.3
+ENV XWIKI_VERSION=11.1
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ac9b1b917ec86946c7bcdfc53ddc39a9011003d8e563dcd7a77b74cf47aeeadf
+ENV XWIKI_DOWNLOAD_SHA256 a8203a6de2e0c54d4ba0e514c68b44bcff2f5953506d8828c3d4db469ebd7881
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \

11/mysql-tomcat/xwiki/hibernate.cfg.xml

@@ -94,10 +94,10 @@
     <property name="dbcp.maxOpenPreparedStatements">20</property>
     <mapping resource="xwiki.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="eventstream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>

11/postgres-tomcat/.env

 # Default environment values
-XWIKI_VERSION=11.0.3
+XWIKI_VERSION=11.1
 DB_USER=xwiki
 DB_PASSWORD=xwiki
 DB_DATABASE=xwiki

11/postgres-tomcat/Dockerfile

@@ -44,9 +44,9 @@ RUN apt-get update && \
 # Install XWiki as the ROOT webapp context in Tomcat
 # Create the Tomcat temporary directory
 # Configure the XWiki permanent directory
-ENV XWIKI_VERSION=11.0.3
+ENV XWIKI_VERSION=11.1
 ENV XWIKI_URL_PREFIX "http://maven.xwiki.org/releases/org/xwiki/platform/xwiki-platform-distribution-war/${XWIKI_VERSION}"
-ENV XWIKI_DOWNLOAD_SHA256 ac9b1b917ec86946c7bcdfc53ddc39a9011003d8e563dcd7a77b74cf47aeeadf
+ENV XWIKI_DOWNLOAD_SHA256 a8203a6de2e0c54d4ba0e514c68b44bcff2f5953506d8828c3d4db469ebd7881
 RUN rm -rf /usr/local/tomcat/webapps/* && \
   mkdir -p /usr/local/tomcat/temp && \
   mkdir -p /usr/local/xwiki/data && \

11/postgres-tomcat/xwiki/hibernate.cfg.xml

@@ -96,10 +96,10 @@
     <property name="xwiki.virtual_mode">schema</property>
     <mapping resource="xwiki.postgresql.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>
-    <mapping resource="notification-filter-preferences.hbm.xml"/>
+    <mapping resource="eventstream.hbm.xml"/>
 
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>

build.gradle

@@ -39,8 +39,8 @@ def tokens = [
         xwikiSha256: '5b544d8786b71cc51b150a3623efa17aea1dfafda429776caeb97d5a3d2c5343'
     ],
     '11': [
-        xwikiVersion: '11.0.3',
-        xwikiSha256: 'ac9b1b917ec86946c7bcdfc53ddc39a9011003d8e563dcd7a77b74cf47aeeadf'
+        xwikiVersion: '11.1',
+        xwikiSha256: 'a8203a6de2e0c54d4ba0e514c68b44bcff2f5953506d8828c3d4db469ebd7881'
     ]
 ]
 

template/xwiki/hibernate.cfg.xml

@@ -94,7 +94,6 @@
     <property name="dbcp.maxOpenPreparedStatements">20</property>
     <mapping resource="xwiki.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>'''
 
@@ -116,9 +115,13 @@
     <property name="xwiki.virtual_mode">schema</property>
     <mapping resource="xwiki.postgresql.hbm.xml"/>
     <mapping resource="feeds.hbm.xml"/>
-    <mapping resource="activitystream.hbm.xml"/>
     <mapping resource="instance.hbm.xml"/>
     <mapping resource="mailsender.hbm.xml"/>''' %>
-    <% if (!xwikiVersion.startsWith('9.')) println '<mapping resource="notification-filter-preferences.hbm.xml"/>' %>
+    <% if (xwikiVersion.startsWith('11.'))
+          println '<mapping resource="eventstream.hbm.xml"/>'
+       else
+          println '<mapping resource="activitystream.hbm.xml"/>'
+    %>
+    <mapping resource="notification-filter-preferences.hbm.xml"/>
   </session-factory>
 </hibernate-configuration>