From 53cafafae829cfa7797d03486a9c6949261898b1 Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@meta.com>
Date: Thu, 19 Oct 2023 14:39:26 -0600
Subject: [PATCH] See #23218: Remove unnecessary ivy_settings.xml file

build-common.xml loads the equivalent common ivysettings.xml file from JOSM core.

Also update jackson to match version from jackson plugin.
---
 ivy.xml          | 2 +-
 ivy_settings.xml | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 ivy_settings.xml

diff --git a/ivy.xml b/ivy.xml
index 9b860f4c..9fbbf698 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,7 +1,7 @@
 <ivy-module version="2.0">
   <info organisation="org.openstreetmap.josm.plugins" module="wikipedia"/>
   <dependencies>
-    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.11.3" conf="default->default" />
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.15.3" conf="default->default" />
     <dependency org="org.wikidata.wdtk" name="wdtk-wikibaseapi" rev="0.11.1" conf="default->default" />
     <dependency org="org.wikidata.wdtk" name="wdtk-dumpfiles" rev="0.11.1" conf="default->default" />
   </dependencies>
diff --git a/ivy_settings.xml b/ivy_settings.xml
deleted file mode 100644
index 847930cd..00000000
--- a/ivy_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ivysettings>
-  <settings defaultResolver="josm-nexus"/>
-  <resolvers>
-    <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
-  </resolvers>
-</ivysettings>