Merge remote-tracking branch 'origin/foundation-2023' into foundation…

…-2024
OpenNMS · Nov 1, 2024 · 9fc614f · 9fc614f
2 parents 8563b27 + 46c8245
commit 9fc614f
Show file tree

Hide file tree

Showing 9 changed files with 11,012 additions and 12,268 deletions.
diff --git a/core/web-assets/package-lock.json b/core/web-assets/package-lock.json
diff --git a/core/web-assets/package.json b/core/web-assets/package.json
@@ -18,9 +18,9 @@
         "@babel/plugin-transform-modules-commonjs": "^7.16.5",
         "@babel/plugin-transform-regenerator": "^7.16.5",
         "@babel/plugin-transform-runtime": "^7.16.5",
-        "@babel/polyfill": "^7.12.1",
         "@babel/preset-env": "^7.16.5",
         "@babel/preset-typescript": "^7.16.5",
+        "@babel/runtime-corejs3": "^7.24.8",
         "@rangerrick/moment-javaformat": "^2.0.1",
         "@types/jest": "^29.5.2",
         "@types/lodash": "^4.14.141",
@@ -37,6 +37,7 @@
         "babel-preset-es2015-nostrict": "^6.6.2",
         "cache-loader": "^4.1.0",
         "copy-webpack-plugin": "^6.4.1",
+        "core-js": "^3.38.0",
         "css-loader": "^3.2.0",
         "cssnano": "^4.1.10",
         "eslint": "^8.28.0",
@@ -46,6 +47,7 @@
         "file": "^0.2.2",
         "file-loader": "^6.2.0",
         "html-loader": "^1.3.2",
+        "html-loader": "^1.3.2",
         "identity-obj-proxy": "^3.0.0",
         "imports-loader": "^1.2.0",
         "jasmine": "^5.0.0",
@@ -92,7 +94,7 @@
         "angular-ui-sortable": "^0.19.0",
         "backshift": "github:OpenNMS/backshift#v1.3.3",
         "bootbox": "^6.0.0",
-        "bootstrap": "~4.6.1",
+        "bootstrap": "~4.6.2",
         "c3": "^0.4.24",
         "core-js": "^3.19.3",
         "cron-parser": "^4.2.1",
@@ -113,11 +115,12 @@
         "jquery-migrate": "^3.3.2",
         "jquery-sparkline": "https://github.com/kapusta/jquery.sparkline#2.1.3",
         "jquery-treegrid": "^0.3.0",
-        "jquery-ui": "^1.13.0",
+        "jquery-ui": "~1.13.3",
         "jquery-ui-treemap": "https://github.com/RangerRick/jsTreemap#master",
         "jquery.flot.tooltip": "^0.9.0",
         "leaflet": "^1.9.3",
         "leaflet.markercluster": "^1.5.3",
+        "loader-utils": "^2.0.4",
         "moment": "^2.29.1",
         "popper.js": "^1.16.1",
         "regenerator-runtime": "^0.14.0",
@@ -180,19 +183,26 @@
             "<rootDir>/src/test/java/",
             "<rootDir>/src/test/resources/",
             "<rootDir>/target/"
-        ]
+        ],
+        "globals": {
+            "ts-jest": {
+                "diagnostics": {
+                    "warnOnly": true
+                }
+            }
+        }
     },
     "scripts": {
-        "webpack": "cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --colors --display-error-details --env=development",
-        "webpack-release": "cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --colors --display-error-details --env=production",
+        "webpack": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096 --openssl-legacy-provider\" webpack --colors --display-error-details --env=development",
+        "webpack-release": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096 --openssl-legacy-provider\" webpack --colors --display-error-details --env=production",
         "check-git": "node check-git.js",
         "install-deps": "npm --prefer-offline --no-progress --no-audit ci",
         "build": "npm run check-git && npm run webpack",
         "build-release": "npm run check-git && npm run webpack-release",
-        "build-verbose": "npm run check-git && npm run lint && cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --debug --colors --display-modules --display-chunks --display-error-details --display-origins --display-reasons --env=development",
+        "build-verbose": "npm run check-git && npm run lint && cross-env NODE_OPTIONS=\"--max-old-space-size=4096 --openssl-legacy-provider\" webpack --debug --colors --display-modules --display-chunks --display-error-details --display-origins --display-reasons --env=development",
         "release": "npm run lint && npm run build-release",
-        "watch": "nodetouch package.json && cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --colors --display-error-details --watch --env=development",
-        "watch-release": "nodetouch package.json && cross-env NODE_OPTIONS=--max-old-space-size=4096 webpack --colors --display-error-details --watch --env=production",
+        "watch": "nodetouch package.json && cross-env NODE_OPTIONS=\"--max-old-space-size=4096 --openssl-legacy-provider\" webpack --colors --display-error-details --watch --env=development",
+        "watch-release": "nodetouch package.json && cross-env NODE_OPTIONS=\"--max-old-space-size=4096 --openssl-legacy-provider\" webpack --colors --display-error-details --watch --env=production",
         "lint": "eslint \"src/**/*.[jt]s\"",
         "maven-test": "jest --all --verbose --useStderr=false --color=false",
         "test": "jest"

diff --git a/features/newts-repository-converter/src/test/resources/opennms-home/etc/opennms.properties b/features/newts-repository-converter/src/test/resources/opennms-home/etc/opennms.properties
@@ -6,4 +6,5 @@ org.opennms.newts.config.keyspace=newts
 org.opennms.newts.config.port=9043
 org.opennms.newts.config.max_batch_size=16
 org.opennms.newts.config.max_batch_delay=0
-org.opennms.newts.config.ttl=315360000
+# another ten years before tests will fail, see NMS-16936
+org.opennms.newts.config.ttl=630720000
diff --git a/opennms-webapp-rest/src/main/webapp/WEB-INF/applicationContext-cxf-common.xml b/opennms-webapp-rest/src/main/webapp/WEB-INF/applicationContext-cxf-common.xml
@@ -32,11 +32,6 @@
     <!-- Jackson JAXB JSON provider -->
     <bean id="jacksonJaxbJsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider"/>
 
-    <!-- Atom Serialization @Provider classes -->
-    <bean id="atomEntryProvider"       class="org.apache.cxf.jaxrs.provider.atom.AtomEntryProvider"/>
-    <bean id="atomFeedProvider"        class="org.apache.cxf.jaxrs.provider.atom.AtomFeedProvider"/>
-    <!-- <bean id="atomPojoProvider"        class="org.apache.cxf.jaxrs.provider.atom.AtomPojoProvider"/> -->
-
     <!-- FIQL search @Provider class -->
     <bean id="searchContextProvider" class="org.apache.cxf.jaxrs.ext.search.SearchContextProvider"/>
 

diff --git a/opennms-webapp-rest/src/main/webapp/WEB-INF/applicationContext-cxf-rest-v1.xml b/opennms-webapp-rest/src/main/webapp/WEB-INF/applicationContext-cxf-rest-v1.xml
@@ -78,8 +78,6 @@
         <ref bean="lenientJaxbProvider"/>
         <ref bean="jaxbProvider"/>
         <ref bean="jacksonJaxbJsonProvider"/>
-        <ref bean="atomEntryProvider"/>
-        <ref bean="atomFeedProvider"/>
         <!-- <ref bean="atomPojoProvider"/> -->
         <ref bean="errorResponseProvider" />
         <ref bean="noSuchElementProvider" />

diff --git a/opennms-webapp-rest/src/main/webapp/WEB-INF/applicationContext-cxf-rest-v2.xml b/opennms-webapp-rest/src/main/webapp/WEB-INF/applicationContext-cxf-rest-v2.xml
@@ -94,8 +94,6 @@
         <ref bean="lenientJaxbProvider"/>
         <ref bean="jaxbProvider"/>
         <ref bean="jacksonJaxbJsonProvider"/>
-        <ref bean="atomEntryProvider"/>
-        <ref bean="atomFeedProvider"/>
         <!-- <ref bean="atomPojoProvider"/> -->
         <ref bean="searchContextProvider"/>
         <ref bean="noSuchElementProvider" />

diff --git a/pom.xml b/pom.xml
@@ -1774,7 +1774,7 @@
     <cronParserCoreVersion>3.5</cronParserCoreVersion>
     <c3p0Version>0.9.5.5</c3p0Version>
     <curatorVersion>5.6.0</curatorVersion>
-    <cxfVersion>3.5.9</cxfVersion>
+    <cxfVersion>3.6.2</cxfVersion>
     <cxfXjcVersion>3.3.2</cxfXjcVersion>
     <dhcp4javaVersion>1.1.0</dhcp4javaVersion>
     <serviceMixDnsjavaVersion>3.5.3_1</serviceMixDnsjavaVersion>

diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml
@@ -684,6 +684,10 @@
           <groupId>org.codehaus.groovy</groupId>
           <artifactId>groovy-all</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.opennms.dependencies</groupId>
+          <artifactId>cxf-dependencies</artifactId>
+        </exclusion>
       </exclusions>
       <scope>test</scope>
     </dependency>
@@ -844,7 +848,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.13</version>
+      <version>1.4.8</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -955,6 +959,10 @@
           <groupId>jaxen</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.opennms.dependencies</groupId>
+          <artifactId>cxf-dependencies</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 

diff --git a/smoke-test/src/main/java/org/opennms/smoketest/utils/RestClient.java b/smoke-test/src/main/java/org/opennms/smoketest/utils/RestClient.java
@@ -42,6 +42,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import joptsimple.internal.Strings;
 import org.glassfish.jersey.client.ClientProperties;
 import org.opennms.core.xml.JaxbUtils;
 import org.opennms.netmgt.measurements.model.QueryRequest;
@@ -419,7 +420,7 @@ public JsonNode getBackups() throws IOException {
                 .accept(MediaType.APPLICATION_JSON)
                 .get(String.class);
 
-        if (result == null) {
+        if (Strings.isNullOrEmpty(result)) {
             return null;
         }