Merge branch 'master' of https://github.com/katysaintin/phoebus.git

Author: katysaintin

app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/xml/XmlModelReader.java

@@ -283,7 +283,7 @@ private void processPV(final AlarmClientNode parent, final Element node) throws
         }
 
 
-        pv.setLatching(XMLUtil.getChildBoolean(node, TAG_LATCHING).orElse(false));
+        pv.setLatching(XMLUtil.getChildBoolean(node, TAG_LATCHING).orElse(true));
         pv.setAnnunciating(XMLUtil.getChildBoolean(node, TAG_ANNUNCIATING).orElse(false));
 
         XMLUtil.getChildString(node, TAG_DESCRIPTION).ifPresent(pv::setDescription);

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ByteMonitorRepresentation.java

@@ -428,7 +428,7 @@ public void updateChanges()
                 for (int i = 0; i < N; i++)
                 {
                     leds[i].setFill(save_values[i]);
-                    if (save_labels[i] != null)
+                    if (save_labels[i] != null && square_led)
                     {
                         // Compare brightness of LED with text.
                         final double brightness = Brightness.of(save_values[i]);
@@ -448,4 +448,4 @@ public void updateChanges()
             }
         }
     }
-}
+}

app/logbook/olog/client-es/pom.xml

@@ -10,22 +10,10 @@
     <artifactId>app-logbook-olog-client-es</artifactId>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/com.sun.jersey/jersey-core -->
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-            <version>1.19</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.19</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.sun.jersey.contribs/jersey-multipart -->
-        <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>1.19</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

app/logbook/olog/client-es/src/main/java/org/phoebus/applications/logbook/OlogESLogbook.java

@@ -2,7 +2,7 @@
 
 import org.phoebus.logbook.LogClient;
 import org.phoebus.logbook.LogFactory;
-import org.phoebus.olog.es.api.OlogClient.OlogClientBuilder;
+import org.phoebus.olog.es.api.OlogHttpClient;
 import org.phoebus.security.tokens.SimpleAuthenticationToken;
 
 import java.util.logging.Level;
@@ -33,7 +33,7 @@ public String getId() {
     @Override
     public LogClient getLogClient() {
         try {
-            return OlogClientBuilder.serviceURL().create();
+            return OlogHttpClient.builder().build();
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Failed to create olog es client", e);
         }
@@ -50,8 +50,8 @@ public LogClient getLogClient(Object authToken) {
         try {
             if (authToken instanceof SimpleAuthenticationToken) {
                 SimpleAuthenticationToken token = (SimpleAuthenticationToken) authToken;
-                return OlogClientBuilder.serviceURL().withHTTPAuthentication(true).username(token.getUsername()).password(token.getPassword())
-                        .create();
+                return OlogHttpClient.builder().username(token.getUsername()).password(token.getPassword())
+                        .build();
             } else {
                 return getLogClient();
             }

app/logbook/olog/client-es/src/main/java/org/phoebus/applications/logbook/authentication/OlogServiceAuthenticationProvider.java

@@ -18,8 +18,7 @@
 
 package org.phoebus.applications.logbook.authentication;
 
-import org.phoebus.olog.es.api.OlogClient;
-import org.phoebus.olog.es.api.OlogClient.OlogClientBuilder;
+import org.phoebus.olog.es.api.OlogHttpClient;
 import org.phoebus.security.authorization.ServiceAuthenticationProvider;
 import org.phoebus.security.tokens.AuthenticationScope;
 
@@ -30,12 +29,11 @@ public class OlogServiceAuthenticationProvider implements ServiceAuthenticationP
 
     @Override
     public void authenticate(String username, String password){
-        OlogClient ologClient = OlogClientBuilder.serviceURL().create();
         try {
-            ologClient.authenticate(username, password);
+            OlogHttpClient.builder().build().authenticate(username, password);
         } catch (Exception e) {
             Logger.getLogger(OlogServiceAuthenticationProvider.class.getName())
-                    .log(Level.WARNING, "Failed to authenticate user " + username + " against Olog service", e);
+                    .log(Level.WARNING, "Failed to authenticate user " + username + " with logbook service", e);
             throw new RuntimeException(e);
         }
     }