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

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
index 845ca85e144bf37f9c5f22e967fc8c635b3cc6f5..c037acaea0f25468fbefd7eb193863b6b058dca5 100644 (file)
--- 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 6eae6c2d282561b855ce5ff25412f31aa3630329..503ec512e4373a9ef3d28fcf520110d0106c8132 100644 (file)
--- 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 0f98f5827734a866be3b61712d2093369dcfb4d9..7200aa9bf71bb81bc54734146b2f8a57fc500764 100644 (file)
--- 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 c27c13e25da68e80409e70a8dccffe070d4168d9..79e2591ac5570da159d3eceeae35c1a79e201230 100644 (file)
--- 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());
 //             }