From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 29 Jun 2023 03:35:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.23~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=26214ed6322e03f51692745f3325fb6b1282beb2;hp=e6ef18ee583ce840ef25852416fb1d574c65cd7a;p=gpl%2Fargeo-slc.git

Merge remote-tracking branch 'origin/unstable' into testing
---

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
index 845ca85e1..c037acaea 100644
--- a/sdk/branches/testing.bnd
+++ b/sdk/branches/testing.bnd
@@ -2,3 +2,11 @@ major=2
 minor=1
 micro=22
 qualifier=.next
+
+Bundle-Copyright= \
+Copyright 2007-2023 Mathieu Baudier, \
+Copyright 2012-2023 Argeo GmbH
+
+SPDX-License-Identifier= \
+GPL-2.0-or-later \
+OR LicenseRef-argeo2-GPL-2.0-or-later-with-EPL-and-JCR-permissions
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 6eae6c2d2..503ec512e 100644
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,7 +1,7 @@
 major=2
 minor=3
 micro=10
-qualifier=
+qualifier=.next
 
 Bundle-Copyright= \
 Copyright 2007-2023 Mathieu Baudier, \
diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
index 0f98f5827..7200aa9bf 100644
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/monitoring/CmsSessionsView.java
@@ -106,7 +106,7 @@ public class CmsSessionsView {
 			private static final long serialVersionUID = -5234573509093747505L;
 
 			public String getText(Object element) {
-				return ((CmsSession) element).getUuid().toString();
+				return ((CmsSession) element).uuid().toString();
 			}
 
 			public String getToolTipText(Object element) {
diff --git a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
index c27c13e25..79e2591ac 100644
--- a/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
+++ b/swt/org.argeo.tool.devops.e4/src/org/argeo/cms/e4/parts/EgoDashboard.java
@@ -33,7 +33,7 @@ public class EgoDashboard {
 		CmsSession cmsSession = CurrentUser.getCmsSession();
 		ZonedDateTime loggedIndSince = cmsSession.getCreationTime();
 		CmsSwtUtils.lbl(p, "Session:");
-		CmsSwtUtils.txt(p, cmsSession.getUuid().toString());
+		CmsSwtUtils.txt(p, cmsSession.uuid().toString());
 		CmsSwtUtils.lbl(p, "Logged in since:");
 		CmsSwtUtils.txt(p, loggedIndSince.toString());
 //		}