From a75f679a34af5015abe53bd730c5fa43d1525cd1 Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Tue, 28 Dec 2021 14:50:25 +0100 Subject: [PATCH 1/5] Bump GeoTools from 25.3 to 25.4 also bump b3p-commons-csw --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 80d9769abc..a99948721f 100644 --- a/pom.xml +++ b/pom.xml @@ -48,8 +48,8 @@ UTF-8 UTF-8 - 25.3 - 6.7 + 25.4 + 6.8 2.0.9 2.5.2 viewer-config-hsqldb From 061b577b4a9ddb42d1e079f6a4cb1aae0686e18f Mon Sep 17 00:00:00 2001 From: Mark Prins <1165786+mprins@users.noreply.github.com> Date: Tue, 28 Dec 2021 15:56:00 +0100 Subject: [PATCH 2/5] remove urls of deprecated commons-lang and use commons-lang3 --- .../b3p/viewer/admin/stripes/ChooseApplicationActionBean.java | 2 +- .../src/main/java/nl/b3p/viewer/features/ShapeDownloader.java | 2 +- .../main/java/nl/b3p/viewer/stripes/ApplicationActionBean.java | 2 +- viewer/src/main/java/nl/b3p/viewer/stripes/I18nActionBean.java | 2 +- .../nl/b3p/viewer/stripes/LocalizableApplicationActionBean.java | 2 +- viewer/src/main/java/nl/b3p/viewer/stripes/PrintActionBean.java | 2 +- viewer/src/main/java/nl/b3p/viewer/util/FlamingoCQL.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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; From d882b4b0bc7072e666a943ec39a6a3625ed7650c Mon Sep 17 00:00:00 2001 From: Mark Prins <1165786+mprins@users.noreply.github.com> Date: Tue, 28 Dec 2021 16:07:34 +0100 Subject: [PATCH 3/5] Bump closure-compiler-maven-plugin to 2.22.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a99948721f..b7c3389084 100644 --- a/pom.xml +++ b/pom.xml @@ -666,7 +666,7 @@ com.github.blutorange closure-compiler-maven-plugin - 2.21.0 + 2.22.0 org.apache.maven.plugins From 3aad62e79bbde829d6d8d9fe3896ed976651da0f Mon Sep 17 00:00:00 2001 From: Mark Prins <1165786+mprins@users.noreply.github.com> Date: Tue, 28 Dec 2021 16:09:40 +0100 Subject: [PATCH 4/5] Bump oracle.version 21.3.0.0 -> 21.4.0.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b7c3389084..73adc77d28 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ viewer-config-hsqldb 42.3.1 9.4.1.jre8 - 21.3.0.0 + 21.4.0.0.1 5.1.0 1.6.7 4.5.13 From 75c1aedc33d7a527fe7bb5dc71a12bd5f804af7e Mon Sep 17 00:00:00 2001 From: Mark Prins Date: Tue, 28 Dec 2021 16:14:50 +0100 Subject: [PATCH 5/5] Revert "Bump closure-compiler-maven-plugin to 2.22.0" This reverts commit d882b4b0bc7072e666a943ec39a6a3625ed7650c. this is a Java 11 only binary --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73adc77d28..6c62493ffa 100644 --- a/pom.xml +++ b/pom.xml @@ -666,7 +666,7 @@ com.github.blutorange closure-compiler-maven-plugin - 2.22.0 + 2.21.0 org.apache.maven.plugins