NMS-15717 : DeviceConfig via Minion fails if sshScript output contain…

…s control characters.(upgrade library - draft).
OpenNMS · Jan 14, 2025 · dfb15c6 · dfb15c6
1 parent 2537b17
commit dfb15c6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 168 deletions.
diff --git a/features/poller/api/src/main/java/org/opennms/netmgt/poller/DeviceConfig.java b/features/poller/api/src/main/java/org/opennms/netmgt/poller/DeviceConfig.java
@@ -45,7 +45,6 @@ public class DeviceConfig {
     private String filename;
 
     @XmlAttribute(name="scriptOutput")
-    @XmlJavaTypeAdapter(EscapeSequenceAdapter.class)
     private String scriptOutput;
 
     public DeviceConfig(String scriptOutput) {

diff --git a/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java b/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java
diff --git a/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java b/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java
diff --git a/pom.xml b/pom.xml
@@ -1658,7 +1658,7 @@
     <dropwizardMetricsVersion>3.1.2</dropwizardMetricsVersion>
     <ecjVersion>4.4.2</ecjVersion>
     <eclipseGeminiVersion>2.1.0.RELEASE</eclipseGeminiVersion>
-    <eclipselinkVersion>2.5.1</eclipselinkVersion>
+    <eclipselinkVersion>2.7.6</eclipselinkVersion>
     <eddsaVersion>0.3.0</eddsaVersion>
     <elasticsearchNettyVersion>4.1.69.Final</elasticsearchNettyVersion>
     <elasticsearchTargetVersion>7.6.2</elasticsearchTargetVersion>