From 05684690071adcc07c01db5261f4a8a65a929b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:48:47 +0100 Subject: [PATCH 1/5] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index ae848d7..0130fa3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -58,8 +58,8 @@ ram.runtime = "1G" [resources.sources] [resources.sources.main] - url = "https://nexus.xwiki.org/nexus/content/groups/public/org/xwiki/platform/xwiki-platform-distribution-jetty-hsqldb/15.10/xwiki-platform-distribution-jetty-hsqldb-15.10.zip" - sha256 = "ca8f7f17ed93470c2776e85815f84eab4433f18c6bccb53a705ce2b8a73771e7" + url = "https://nexus.xwiki.org/nexus/content/groups/public/org/xwiki/platform/xwiki-platform-distribution-jetty-hsqldb/15.10.1/xwiki-platform-distribution-jetty-hsqldb-15.10.1.zip" + sha256 = "76efd6e1c58b8557034a3e25271963392b8b5e125af97d932210823510586e9f" format = "zip" [resources.sources.jdbc] From 524c0de59a7a7e44501bda83a80b963688e29093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:49:03 +0100 Subject: [PATCH 2/5] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0130fa3..37f7c92 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "xWiki" description.en = "Collaboration tool based on the wiki principle" description.fr = "Outil de collaboration basé sur le principe du wiki" -version = "15.10~ynh1" +version = "15.10.1~ynh1" maintainers = [""] From 00075add963bdc9822be026d1f54e1aaea19fa23 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 19 Dec 2023 12:49:08 +0000 Subject: [PATCH 3/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a5bd0ee..9d4f9d3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in XWiki is an Open Source wiki engine (LGPLv2) suitable for use by workgroups (associations, companies, etc.). The software allows the rapid creation of small applications to meet different information management needs. -**Shipped version:** 15.10~ynh1 +**Shipped version:** 15.10.1~ynh1 **Demo:** https://playground.xwiki.org/xwiki/bin/view/Main/WebHome diff --git a/README_fr.md b/README_fr.md index e19f0df..6b4bcf2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po XWiki est un moteur de wiki Open Source (LGPLv2) adapté à un usage pour des groupes de travail (associations, entreprises…). Le logiciel permet la création rapide de petites applications pour répondre à différents besoins de gestion de l'information. -**Version incluse :** 15.10~ynh1 +**Version incluse :** 15.10.1~ynh1 **Démo :** https://playground.xwiki.org/xwiki/bin/view/Main/WebHome From 46ec944fe86de93bc380f750037ab48d246bba9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:51:42 +0100 Subject: [PATCH 4/5] Update manifest.toml --- manifest.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 37f7c92..afcd224 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,11 +18,14 @@ userdoc = "https://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/" code = "https://github.com/xwiki/xwiki-platform" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "500M" ram.build = "0M" ram.runtime = "1G" @@ -36,7 +39,7 @@ ram.runtime = "1G" default = "/xwiki" [install.install_standard_flavor] - ask.en = "Would you like to install the Standard Flavor ?" + ask.en = "Would you like to install the Standard Flavor?" help.en = "See https://extensions.xwiki.org/xwiki/bin/view/Extension/XWiki%20Standard%20Flavor/ for more informations." type = "boolean" default = true From 313c10ec1992d9330009b1f63711648e23804989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:52:49 +0100 Subject: [PATCH 5/5] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 77186af..4d4bdd7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ super_admin_config='#' systemd_match_start_line='oxtjl.NotifyListener:main: ----------------------------------' -flavor_version='15.10' +flavor_version='15.10.1' ldap_version='9.12.0' if [ $install_standard_flavor -eq 1 ]; then