From aaa85676932e54bf14ed108f4473630aa0c0063e Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Thu, 18 Jan 2024 10:38:17 -0700 Subject: [PATCH] Add apache dependency used in CatalogViewContextParser --- tds-platform/build.gradle | 1 + tds-testing-platform/build.gradle | 1 - tds/build.gradle | 1 + .../thredds/server/catalogservice/CatalogViewContextParser.java | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tds-platform/build.gradle b/tds-platform/build.gradle index 59ba725af4..40b400f431 100644 --- a/tds-platform/build.gradle +++ b/tds-platform/build.gradle @@ -88,6 +88,7 @@ dependencies { api "org.hibernate.validator:hibernate-validator:${depVersion.hibernateValidator}" api "org.hibernate.validator:hibernate-validator-annotation-processor:${depVersion.hibernateValidator}" api 'jakarta.el:jakarta.el-api' + api'org.apache.commons:commons-lang3:3.4' runtime 'org.glassfish:javax.el:3.0.0' runtime "jaxen:jaxen:${depVersion.jaxen}" diff --git a/tds-testing-platform/build.gradle b/tds-testing-platform/build.gradle index 7f94373263..cf0f7c48c9 100644 --- a/tds-testing-platform/build.gradle +++ b/tds-testing-platform/build.gradle @@ -39,7 +39,6 @@ dependencies { api 'org.hamcrest:hamcrest-core:2.2' // only needed for it subproject - api 'org.apache.commons:commons-lang3:3.4' // replace? api 'org.xmlunit:xmlunit-core:2.7.0' // For comparing catalog XML. } diff --git a/tds/build.gradle b/tds/build.gradle index 298f16b894..4cc3f73db7 100644 --- a/tds/build.gradle +++ b/tds/build.gradle @@ -50,6 +50,7 @@ dependencies { compile 'com.google.code.findbugs:jsr305' compile 'com.google.guava:guava' compile 'joda-time:joda-time' + compile 'org.apache.commons:commons-lang3' // WaterML compile 'org.apache.xmlbeans:xmlbeans' diff --git a/tds/src/main/java/thredds/server/catalogservice/CatalogViewContextParser.java b/tds/src/main/java/thredds/server/catalogservice/CatalogViewContextParser.java index fca61d8d25..9f555d9967 100644 --- a/tds/src/main/java/thredds/server/catalogservice/CatalogViewContextParser.java +++ b/tds/src/main/java/thredds/server/catalogservice/CatalogViewContextParser.java @@ -1,6 +1,6 @@ package thredds.server.catalogservice; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired;