From ff6f656e5c0c8ef02cd9c0b7650ca4cfe9bb825c Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Sun, 19 May 2024 15:58:15 +0200
Subject: [PATCH] go back to commons-net 3.9.0 to avoid merge conflicts

---
 core/pom.xml                            | 2 +-
 core/src/main/java/META-INF/MANIFEST.MF | 2 +-
 loader/pom.xml                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d3b4bfaf83..67c1359dd9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -176,7 +176,7 @@
   	<dependency>
   		<groupId>commons-net</groupId>
   		<artifactId>commons-net</artifactId>
-  		<version>3.10.0</version>
+  		<version>3.9.0</version>
       <scope>provided</scope>
   	</dependency>
     <dependency>
diff --git a/core/src/main/java/META-INF/MANIFEST.MF b/core/src/main/java/META-INF/MANIFEST.MF
index 018868c0c1..181968e501 100644
--- a/core/src/main/java/META-INF/MANIFEST.MF
+++ b/core/src/main/java/META-INF/MANIFEST.MF
@@ -326,7 +326,7 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0,
  org.lucee.commons.logging.adapters;bundle-version=1.1.0.0000L,
  org.lucee.commons.logging.api;bundle-version=1.1.0.0000L,
  org.lucee.commons.logging;bundle-version=1.2.0.0000L,
- org.apache.commons.commons-net;bundle-version=3.10.0,
+ org.apache.commons.commons-net;bundle-version=3.9.0,
  org.apache.commons.commons-pool2;bundle-version=2.9.0,
  org.apache.oro;bundle-version=2.0.8,
  org.lucee.log4j-core;bundle-version=2.17.2.0001L,
diff --git a/loader/pom.xml b/loader/pom.xml
index 461b0c624b..249568dcc8 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -406,7 +406,7 @@
   <dependency>
     <groupId>commons-net</groupId>
     <artifactId>commons-net</artifactId>
-    <version>3.10.0</version>
+    <version>3.9.0</version>
     <scope>provided</scope>
   </dependency>
   <dependency>