Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
[TM-353] Bump GeoTools from 25.3 to 25.4 (#3017)
Browse files Browse the repository at this point in the history
* Bump GeoTools from 25.3 to 25.4

also bump b3p-commons-csw

* remove urls of deprecated commons-lang and use commons-lang3

* Bump closure-compiler-maven-plugin to 2.22.0

* Bump oracle.version 21.3.0.0 -> 21.4.0.0.1

* Revert "Bump closure-compiler-maven-plugin to 2.22.0"

This reverts commit d882b4b.

this is a Java 11 only binary
  • Loading branch information
mprins authored Dec 28, 2021
2 parents e1a2107 + 75c1aed commit b5480b4
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion viewer/src/main/java/nl/b3p/viewer/util/FlamingoCQL.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b5480b4

Please sign in to comment.