MLE-26437 Bumping dependencies to eliminate CVEs

.copyrightconfig

@@ -11,4 +11,4 @@ startyear: 2018
 #   - Dotfiles already skipped automatically
 # Enable by removing the leading '# ' from the next line and editing values.
 # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
-filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat
+filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **pom.xml, **src/test/resources/**, docs/**, gradle-wrapper.jar, *.json

.gitignore

@@ -1,3 +1,4 @@
+.gradle
 target
 .project
 .settings

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline{
   environment{
     JAVA_HOME_DIR="/home/builder/java/jdk-21.0.1"
     GRADLE_DIR   =".gradle"
-    MAVEN_HOME_DIR="/home/builder/mvn/apache-maven-3.9.6/"
+    MAVEN_HOME_DIR="/home/builder/mvn/apache-maven-3.9.11/"
     DMC_USER     = credentials('MLBUILD_USER')
     DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
   }
@@ -22,8 +22,11 @@ pipeline{
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
           cd nifi-connector/test-app
-          ./gradlew hubInit
-          ./gradlew mlDeploy
+          echo "Running hubInit"
+          ../gradlew hubInit
+          rm -rf gradle
+          echo "Running mlDeploy"
+          ../gradlew mlDeploy
         '''
         sh label:'test', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR

README.md

@@ -3,7 +3,7 @@
 The MarkLogic NiFi connector simplifies integrating [Apache NiFi](https://nifi.apache.org/) with MarkLogic, allowing for 
 data to be easily written to and read from MarkLogic. The connector consists of a set of custom NiFi processors and 
 controller services which can be used in NiFi flows for integrating with MarkLogic. The connector has been developed 
-and tested on NiFi 2.3.0; it may work in more recent versions of NiFi too. 
+and tested on NiFi 2.5.0; it may work in more recent versions of NiFi too. 
 
 Please see the [Getting Started guide](https://marklogic.github.io/nifi/getting-started) 
 for information on obtaining the connector, installing it, and using it. 

docs/index.md

@@ -10,7 +10,7 @@ export data to and from MarkLogic, along with running batch processes on data al
 The connector has the following system requirements:
 
 * Apache NiFi 2.0 or higher; the connector may run successfully on earlier versions of NiFi but it is only 
-  actively tested on NiFi 2.3.0 and higher.
+  actively tested on NiFi 2.5.0 and higher.
 * MarkLogic 10 or higher, though processors that do not depend on any functionality in MarkLogic 10 or later will 
   run fine on MarkLogic 9.
 

test-app/gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

nifi-marklogic-processors/flows-for-manual-testing.json

@@ -34,7 +34,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "ORIGINAL",
@@ -153,7 +153,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "FAILURE",
@@ -272,7 +272,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "RESULTS",
@@ -642,7 +642,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "FAILURE!!!!",
@@ -761,7 +761,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "QUERY RESULT",
@@ -1137,7 +1137,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "character-set": "UTF-8",
@@ -1230,7 +1230,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "AFTER:",
@@ -1649,7 +1649,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "RESULTS",
@@ -1866,7 +1866,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "LOGERROR!!!",
@@ -1985,7 +1985,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "character-set": "UTF-8",
@@ -2078,7 +2078,7 @@
                         "bundle": {
                             "group": "org.apache.nifi",
                             "artifact": "nifi-standard-nar",
-                            "version": "2.3.0"
+                            "version": "2.5.0"
                         },
                         "properties": {
                             "Log prefix": "ORIGINAL",
@@ -2536,4 +2536,4 @@
     "flowEncodingVersion": "1.0",
     "parameterProviders": {},
     "latest": false
-}
+}

nifi-marklogic-processors/pom.xml

@@ -48,7 +48,7 @@
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>marklogic-data-hub</artifactId>
-      <version>6.2.0</version>
+      <version>6.2.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.nifi</groupId>
@@ -118,7 +118,30 @@
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>marklogic-junit5</artifactId>
-      <version>1.4.0</version>
+      <version>1.5.0</version>
+      <scope>test</scope>
+      <!-- Use latest Spring dependencies and ml-javaclient-util from DHF -->
+      <exclusions>
+        <exclusion>
+          <groupId>com.marklogic</groupId>
+          <artifactId>ml-javaclient-util</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-context</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
 

nifi-marklogic-services-api/pom.xml

@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>ml-javaclient-util</artifactId>
-      <version>5.0.0</version>
+      <version>6.0.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.springframework</groupId>

pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-extension-bundles</artifactId>
-    <version>2.3.0</version>
+    <version>2.5.0</version>
   </parent>
 
   <version>2.0.0</version>
@@ -33,13 +33,27 @@
   <properties>
     <!-- Nifi 2 requires Java 21 -->
     <maven.compiler.release>21</maven.compiler.release>
-    <nifi.version>2.3.0</nifi.version>
+    <nifi.version>2.5.0</nifi.version>
     <marklogicnar.version>2.0.0</marklogicnar.version>
-    <marklogicclientapi.version>7.1.0</marklogicclientapi.version>
+    <marklogicclientapi.version>7.2.0</marklogicclientapi.version>
+    <spring.version>6.2.11</spring.version>
     <sonar.host.url>http://localhost:9000</sonar.host.url>
     <sonar.projectKey>nifi</sonar.projectKey>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <!-- Force latest Spring 6.x version to minimize vulnerabilities. -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>${spring.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <modules>
     <module>nifi-marklogic-services-api</module>
     <module>nifi-marklogic-services-api-nar</module>

test-app/.gitignore

@@ -11,3 +11,6 @@ src/main/ml-config/databases/final-triggers-database.json
 src/main/ml-config/databases/modules-database.json
 src/main/ml-config/servers/final-server.json
 src/main/entity-config
+gradle
+gradlew
+gradlew.bat

test-app/build.gradle

@@ -4,5 +4,5 @@
  */
 plugins {
   id 'net.saliman.properties' version '1.5.2'
-  id 'com.marklogic.ml-data-hub' version '6.2.0'
+  id 'com.marklogic.ml-data-hub' version '6.2.1'
 }