Skip to content

Commit

Permalink
go back to commons-net 3.9.0 to avoid merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
zspitzer committed May 19, 2024
1 parent ca2962a commit ff6f656
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit ff6f656

Please sign in to comment.