From 5785c34e47c8a299889ff88cb379c518bffc6d5d Mon Sep 17 00:00:00 2001 From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com> Date: Wed, 8 May 2024 16:06:48 +0300 Subject: [PATCH 1/5] Back to devel --- docs/HISTORY.txt | 3 +++ eea/api/dataconnector/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 84e55a3..ccc4426 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +10.2-dev0 - (unreleased) +--------------------------- + 10.1 - (2024-05-08) --------------------------- * Change: Release diff --git a/eea/api/dataconnector/version.txt b/eea/api/dataconnector/version.txt index ae425d6..0add245 100644 --- a/eea/api/dataconnector/version.txt +++ b/eea/api/dataconnector/version.txt @@ -1 +1 @@ -10.1 +10.2-dev0 From 30c3b6e5a5f896e32c7bb3fa11471df6919df731 Mon Sep 17 00:00:00 2001 From: Claudia Ifrim Date: Wed, 8 May 2024 16:48:17 +0300 Subject: [PATCH 2/5] fix: - ConfigurationError: ('Unknown directive', 'http://namespaces.plone.org/plone', 'service') - include plone restapi package --- eea/api/dataconnector/api/configure.zcml | 2 -- eea/api/dataconnector/configure.zcml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eea/api/dataconnector/api/configure.zcml b/eea/api/dataconnector/api/configure.zcml index 8c2c861..e3d8bc6 100644 --- a/eea/api/dataconnector/api/configure.zcml +++ b/eea/api/dataconnector/api/configure.zcml @@ -5,8 +5,6 @@ xmlns:plone="http://namespaces.plone.org/plone" i18n_domain="eea.dataconnector"> - - + From fa94d361b032087c49afeaa5fe9c0254f59d57cf Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Wed, 8 May 2024 16:55:49 +0300 Subject: [PATCH 3/5] Updated version to 10.2 --- eea/api/dataconnector/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/api/dataconnector/version.txt b/eea/api/dataconnector/version.txt index 0add245..e2498ea 100644 --- a/eea/api/dataconnector/version.txt +++ b/eea/api/dataconnector/version.txt @@ -1 +1 @@ -10.2-dev0 +10.2 From 04ff5fa405b44430c362f4befd333ab29a539cac Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Wed, 8 May 2024 16:55:52 +0300 Subject: [PATCH 4/5] Updated changelog - removed develop information --- docs/HISTORY.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index ccc4426..3c2a755 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,8 +1,10 @@ Changelog ========= -10.2-dev0 - (unreleased) +10.2 - (2024-05-08) --------------------------- +* Change: Release + [claudiaifrim] 10.1 - (2024-05-08) --------------------------- From 4058884f8d20205dfbbdcf46fbd32ec27db2a193 Mon Sep 17 00:00:00 2001 From: Claudia Ifrim Date: Wed, 8 May 2024 19:30:13 +0300 Subject: [PATCH 5/5] revert changes - commit 30c3b6e5a5f896e32c7bb3fa11471df6919df731 --- eea/api/dataconnector/api/configure.zcml | 2 ++ eea/api/dataconnector/configure.zcml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eea/api/dataconnector/api/configure.zcml b/eea/api/dataconnector/api/configure.zcml index e3d8bc6..8c2c861 100644 --- a/eea/api/dataconnector/api/configure.zcml +++ b/eea/api/dataconnector/api/configure.zcml @@ -5,6 +5,8 @@ xmlns:plone="http://namespaces.plone.org/plone" i18n_domain="eea.dataconnector"> + + -