diff --git a/pom.xml b/pom.xml
index 80d9769abc..6c62493ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,14 +48,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- when updating geotools also check b3p-commons-csw or you will end up in transitive dependency hell -->
-        <geotools.version>25.3</geotools.version>
-        <b3p-commons-csw.version>6.7</b3p-commons-csw.version>
+        <geotools.version>25.4</geotools.version>
+        <b3p-commons-csw.version>6.8</b3p-commons-csw.version>
         <powermock.version>2.0.9</powermock.version>
         <hsqldb.version>2.5.2</hsqldb.version>
         <test.persistence.unit>viewer-config-hsqldb</test.persistence.unit>
         <postgresql.version>42.3.1</postgresql.version>
         <mssql.version>9.4.1.jre8</mssql.version>
-        <oracle.version>21.3.0.0</oracle.version>
+        <oracle.version>21.4.0.0.1</oracle.version>
         <apache.poi.version>5.1.0</apache.poi.version>
         <jakarta.mail.version>1.6.7</jakarta.mail.version>
         <apache.httpcomponents.version>4.5.13</apache.httpcomponents.version>
diff --git a/viewer-admin/src/main/java/nl/b3p/viewer/admin/stripes/ChooseApplicationActionBean.java b/viewer-admin/src/main/java/nl/b3p/viewer/admin/stripes/ChooseApplicationActionBean.java
index 4226fd8eef..3c84e1cf75 100644
--- a/viewer-admin/src/main/java/nl/b3p/viewer/admin/stripes/ChooseApplicationActionBean.java
+++ b/viewer-admin/src/main/java/nl/b3p/viewer/admin/stripes/ChooseApplicationActionBean.java
@@ -32,7 +32,7 @@
 import nl.b3p.viewer.config.metadata.Metadata;
 import nl.b3p.viewer.config.security.Group;
 import nl.b3p.viewer.util.SelectedContentCache;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.*;
diff --git a/viewer/src/main/java/nl/b3p/viewer/features/ShapeDownloader.java b/viewer/src/main/java/nl/b3p/viewer/features/ShapeDownloader.java
index 27c1fce398..89e2dd1b6c 100644
--- a/viewer/src/main/java/nl/b3p/viewer/features/ShapeDownloader.java
+++ b/viewer/src/main/java/nl/b3p/viewer/features/ShapeDownloader.java
@@ -30,7 +30,7 @@
 import nl.b3p.viewer.config.app.ConfiguredAttribute;
 import nl.b3p.viewer.config.services.AttributeDescriptor;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.geotools.data.simple.SimpleFeatureSource;
diff --git a/viewer/src/main/java/nl/b3p/viewer/stripes/ApplicationActionBean.java b/viewer/src/main/java/nl/b3p/viewer/stripes/ApplicationActionBean.java
index 70bdf98297..c153d2793f 100644
--- a/viewer/src/main/java/nl/b3p/viewer/stripes/ApplicationActionBean.java
+++ b/viewer/src/main/java/nl/b3p/viewer/stripes/ApplicationActionBean.java
@@ -32,7 +32,7 @@
 import nl.b3p.viewer.config.security.Authorizations;
 import nl.b3p.viewer.config.security.User;
 import nl.b3p.viewer.util.SelectedContentCache;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.stripesstuff.stripersist.Stripersist;
diff --git a/viewer/src/main/java/nl/b3p/viewer/stripes/I18nActionBean.java b/viewer/src/main/java/nl/b3p/viewer/stripes/I18nActionBean.java
index 26174367a2..2211c4eb96 100644
--- a/viewer/src/main/java/nl/b3p/viewer/stripes/I18nActionBean.java
+++ b/viewer/src/main/java/nl/b3p/viewer/stripes/I18nActionBean.java
@@ -4,7 +4,7 @@
 import net.sourceforge.stripes.validation.Validate;
 import nl.b3p.i18n.ResourceBundleToJsProvider;
 import nl.b3p.i18n.ResourceBundleProvider;
-import org.apache.commons.lang.LocaleUtils;
+import org.apache.commons.lang3.LocaleUtils;
 
 import java.io.StringReader;
 import java.util.Locale;
diff --git a/viewer/src/main/java/nl/b3p/viewer/stripes/LocalizableApplicationActionBean.java b/viewer/src/main/java/nl/b3p/viewer/stripes/LocalizableApplicationActionBean.java
index bd20846c62..892644b370 100644
--- a/viewer/src/main/java/nl/b3p/viewer/stripes/LocalizableApplicationActionBean.java
+++ b/viewer/src/main/java/nl/b3p/viewer/stripes/LocalizableApplicationActionBean.java
@@ -8,7 +8,7 @@
 import net.sourceforge.stripes.controller.LifecycleStage;
 import nl.b3p.viewer.config.app.Application;
 import nl.b3p.i18n.ResourceBundleProvider;
-import org.apache.commons.lang.LocaleUtils;
+import org.apache.commons.lang3.LocaleUtils;
 
 /**
  * Abstract ActionBean which can be implemented by ActionBeans
diff --git a/viewer/src/main/java/nl/b3p/viewer/stripes/PrintActionBean.java b/viewer/src/main/java/nl/b3p/viewer/stripes/PrintActionBean.java
index f21e4d0ee4..f286a8cb93 100644
--- a/viewer/src/main/java/nl/b3p/viewer/stripes/PrintActionBean.java
+++ b/viewer/src/main/java/nl/b3p/viewer/stripes/PrintActionBean.java
@@ -31,7 +31,7 @@
 import nl.b3p.viewer.util.FeaturePropertiesArrayHelper;
 import nl.b3p.viewer.util.FeatureToJson;
 import nl.b3p.viewer.util.FlamingoCQL;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
diff --git a/viewer/src/main/java/nl/b3p/viewer/util/FlamingoCQL.java b/viewer/src/main/java/nl/b3p/viewer/util/FlamingoCQL.java
index 34078bd0a3..6c435bed1c 100644
--- a/viewer/src/main/java/nl/b3p/viewer/util/FlamingoCQL.java
+++ b/viewer/src/main/java/nl/b3p/viewer/util/FlamingoCQL.java
@@ -17,7 +17,7 @@
 package nl.b3p.viewer.util;
 
 import nl.b3p.viewer.config.services.*;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.geotools.factory.CommonFactoryFinder;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryCollection;