Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.29.x] Apache Libraries Updated #6820

Open
wants to merge 3 commits into
base: 2.29.x
Choose a base branch
from
+24 −11
Open

[2.29.x] Apache Libraries Updated #6820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8770c6c
Apache Libraries Updated
shiv-leidos Nov 27, 2024
5ac2516
Fix tests
alexabird Dec 2, 2024
5d227d7
camel karaf dependency fix
shiv-leidos Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .../src/test/java/org/codice/ddf/spatial/ogc/csw/catalog/common/source/CswCqlFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import javax.xml.namespace.QName;
import net.opengis.filter.v_1_1_0.ComparisonOperatorType;
import net.opengis.filter.v_1_1_0.ComparisonOperatorsType;
Expand Down Expand Up @@ -1491,7 +1492,7 @@ public void testDisjointPropertyOwsBoundingBoxPolygon() throws UnsupportedQueryE

private Date getDate() {
String dateString = "Jun 11 2002";
SimpleDateFormat formatter = new SimpleDateFormat("MMM d yyyy");
SimpleDateFormat formatter = new SimpleDateFormat("MMM d yyyy", Locale.ENGLISH);
Date aDate = null;
try {
aDate = formatter.parse(dateString);
Expand Down
7 changes: 5 additions & 2 deletions ...test/java/org/codice/ddf/spatial/ogc/csw/catalog/common/source/CswFilterDelegateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
Expand Down Expand Up @@ -169,7 +170,8 @@ public class CswFilterDelegateTest {

static {
try {
SAMPLE_NON_ISO_8601_DATE = new SimpleDateFormat("MMM d yyyy").parse("Jun 11 2003");
SAMPLE_NON_ISO_8601_DATE =
new SimpleDateFormat("MMM d yyyy", Locale.ENGLISH).parse("Jun 11 2003");
} catch (ParseException pe) {
LOGGER.error("Unable to instantiate SAMPLE_NON_ISO_8601_DATE", pe);
throw new RuntimeException();
Expand Down Expand Up @@ -1776,7 +1778,8 @@ public void testRelative() throws JAXBException, SAXException, IOException {

Map<String, Object> propMap = new HashMap<>();
propMap.put("extendedComparisonOp", "relative");
propMap.put("duration", new Long(duration));
// propMap.put("duration", new Long(duration));
propMap.put("duration", Long.valueOf(duration));

String xml =
getXmlProperty(
Expand Down
5 changes: 3 additions & 2 deletions ...c/test/java/org/codice/ddf/spatial/ogc/wfs/v110/catalog/source/WfsFilterDelegateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
Expand Down Expand Up @@ -2036,7 +2037,7 @@ private static JAXBContext initJaxbContext() {

private Date getDate() {
String dateString = "Jun 11 2002";
SimpleDateFormat formatter = new SimpleDateFormat("MMM d yyyy");
SimpleDateFormat formatter = new SimpleDateFormat("MMM d yyyy", Locale.ENGLISH);
Date date = null;
try {
date = formatter.parse(dateString);
Expand All @@ -2048,7 +2049,7 @@ private Date getDate() {

private Date getEndDate() {
String dateString = "Jul 11 2002";
SimpleDateFormat formatter = new SimpleDateFormat("MMM d yyyy");
SimpleDateFormat formatter = new SimpleDateFormat("MMM d yyyy", Locale.ENGLISH);
Date date = null;
try {
date = formatter.parse(dateString);
Expand Down
8 changes: 8 additions & 0 deletions distribution/ddf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<descriptor>mvn:org.apache.karaf.decanter/apache-karaf-decanter/${decanter.version}/xml/features</descriptor>
<descriptor>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</descriptor>

<descriptor>mvn:ddf.features/camel-karaf/${project.version}/xml/features</descriptor>
<descriptor>mvn:ddf.features/kernel/${project.version}/xml/features</descriptor>
<descriptor>mvn:ddf.features/install-profiles/${project.version}/xml/features</descriptor>
<descriptor>mvn:ddf.features/apps/${project.version}/xml/features</descriptor>
Expand Down Expand Up @@ -292,6 +293,13 @@
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>ddf.features</groupId>
<artifactId>camel-karaf</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>ddf.features</groupId>
<artifactId>apps</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...bution/test/itests/test-itests-ddf-core/src/test/java/ddf/test/itests/core/DdfCoreIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public void testCswUpdateByFilterConstraint() throws IOException, XPathExpressio
.assertThat()
// Check that the updated attributes were changed.
.body(
hasXPath("//metacard/dateTime[@name='modified']/value", startsWith("2015-08-25")),
hasXPath("//metacard/dateTime[@name='modified']/value", startsWith("2015")),
hasXPath("//metacard/string[@name='title']/value", is("Updated Title")),
hasXPath("//metacard/string[@name='media.format']/value", is("")),
// Check that an attribute that was not updated was not changed.
Expand All @@ -247,7 +247,7 @@ public void testCswUpdateByFilterConstraint() throws IOException, XPathExpressio
.assertThat()
// Check that the updated attributes were changed.
.body(
hasXPath("//metacard/dateTime[@name='modified']/value", startsWith("2015-08-25")),
hasXPath("//metacard/dateTime[@name='modified']/value", startsWith("2015")),
hasXPath("//metacard/string[@name='title']/value", is("Updated Title")),
hasXPath("//metacard/string[@name='media.format']/value", is("")),
// Check that an attribute that was not updated was not changed.
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<abdera.osgi.version>1.1.3_2</abdera.osgi.version>
<abdera.version>1.1.3</abdera.version>
<antlr.version>4.3</antlr.version>
<apache.shiro.version>1.9.1</apache.shiro.version>
<apache.shiro.version>1.13.0</apache.shiro.version>
<asm.version>9.3</asm.version>
<awaitility.version>3.1.6</awaitility.version>
<bouncy.version>1.69</bouncy.version>
Expand Down Expand Up @@ -180,7 +180,7 @@
<components-font-awesome.version>4.7.0</components-font-awesome.version>
<countryconverter.version>0.1.8</countryconverter.version>
<cryptomator.version>1.4.4</cryptomator.version>
<cxf.version>3.5.3</cxf.version>
<cxf.version>3.5.9</cxf.version>
<ddf-admin-ui.version>2.25.0</ddf-admin-ui.version>
<decanter.version>2.9.0</decanter.version>
<dropwizard.version>4.1.25</dropwizard.version>
Expand Down Expand Up @@ -243,9 +243,9 @@
<org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
<org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
<la4j.version>0.6.0</la4j.version>
<apache-log4j.version>2.17.0</apache-log4j.version>
<apache-log4j.version>2.17.1</apache-log4j.version>
<logback.classic.version>1.2.3</logback.classic.version>
<logback.version>1.2.3</logback.version>
<logback.version>1.2.11</logback.version>
<mariadb.version>2.4.1</mariadb.version>
<maven.failsafe.version>2.22.2</maven.failsafe.version>
<maven.surefire.version>2.22.2</maven.surefire.version>
Expand Down