From 071fc2586760403525642051b2227cf22df5a113352fe80248d695f93bb2b10a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 19 Mar 2022 13:24:49 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=62

---
 apache-ivy.changes | 9 +++++++++
 apache-ivy.spec    | 1 +
 2 files changed, 10 insertions(+)

diff --git a/apache-ivy.changes b/apache-ivy.changes
index 446eb22..78d0c33 100644
--- a/apache-ivy.changes
+++ b/apache-ivy.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Mar 19 13:22:59 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 2.5.0
+- Force building with JDK < 14, since it imports statically a class
+  removed in JDK14
+- Change dependencies for the httpclient to httpcomponents-client
+  instead of apache-commons-httpclient
+
 -------------------------------------------------------------------
 Tue Dec 10 22:39:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-ivy.spec b/apache-ivy.spec
index a5fcef1..88464c1 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -38,6 +38,7 @@ BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  jsch
 BuildRequires:  oro
+BuildConflicts: java-devel >= 14
 Provides:       ivy = %{version}-%{release}
 Obsoletes:      ivy < %{version}-%{release}
 BuildArch:      noarch