Sync from SUSE:SLFO:1.1 apache-ivy revision 89c2d00f184231f1a02ab60b333caf26

apache-ivy-global-settings.patch

@@ -1,6 +1,6 @@
 --- a/src/java/org/apache/ivy/ant/IvyAntSettings.java
 +++ b/src/java/org/apache/ivy/ant/IvyAntSettings.java
-@@ -345,7 +345,7 @@ public class IvyAntSettings extends Data
+@@ -345,7 +345,7 @@ public class IvyAntSettings extends DataType {
          File[] settingsLocations = new File[] {
                  new File(getProject().getBaseDir(), settingsFileName),
                  new File(getProject().getBaseDir(), "ivyconf.xml"), new File(settingsFileName),

apache-ivy-pack200.patch

@@ -1,5 +1,5 @@
---- a/build.xml
-+++ b/build.xml
+--- apache-ivy-2.5.2/build.xml	2023-10-30 16:09:23.892302634 +0100
++++ apache-ivy-2.5.2/build.xml	2023-10-30 16:12:01.143389848 +0100
 @@ -185,6 +185,7 @@
          <javac srcdir="${src.dir}"
                 destdir="${core.classes.build.dir}"
@@ -8,9 +8,9 @@
                 source="${ivy.minimum.javaversion}"
                 target="${ivy.minimum.javaversion}"
                 debug="${debug.mode}"
---- a/src/java/org/apache/ivy/util/FileUtil.java
-+++ b/src/java/org/apache/ivy/util/FileUtil.java
-@@ -46,7 +46,7 @@ import java.util.jar.JarOutputStream;
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/util/FileUtil.java	2023-10-30 16:09:23.928969555 +0100
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/util/FileUtil.java	2023-10-30 16:13:35.547375897 +0100
+@@ -46,7 +46,7 @@
  import java.util.zip.GZIPInputStream;
  import java.util.zip.ZipInputStream;
  

apache-ivy-publication-date.patch

@@ -1,6 +1,6 @@
---- a/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java
-+++ b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java
-@@ -197,7 +197,7 @@ public class AntWorkspaceResolver extend
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java	2023-09-19 08:19:56.002999512 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java	2023-09-19 09:00:48.163799846 +0200
+@@ -197,7 +197,7 @@
                      throw new RuntimeException("Unsupported file path : " + artifactFile, e);
                  }
  
@@ -9,9 +9,9 @@
                          url, null));
              }
  
---- a/src/java/org/apache/ivy/ant/IvyDeliver.java
-+++ b/src/java/org/apache/ivy/ant/IvyDeliver.java
-@@ -374,7 +374,7 @@ public class IvyDeliver extends IvyTask
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/ant/IvyDeliver.java	2023-09-19 08:19:56.002999512 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/ant/IvyDeliver.java	2023-09-19 09:01:57.027624096 +0200
+@@ -374,7 +374,7 @@
          if (revision == null) {
              revision = Ivy.getWorkingRevision();
          }
@@ -20,9 +20,9 @@
          if (pubRevision == null) {
              if (revision.startsWith("working@")) {
                  pubRevision = DateUtil.format(pubdate);
---- a/src/java/org/apache/ivy/ant/IvyPublish.java
-+++ b/src/java/org/apache/ivy/ant/IvyPublish.java
-@@ -273,7 +273,7 @@ public class IvyPublish extends IvyTask
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/ant/IvyPublish.java	2023-09-19 08:19:56.006332869 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/ant/IvyPublish.java	2023-09-19 09:02:18.827779503 +0200
+@@ -273,7 +273,7 @@
          if ("working".equals(revision)) {
              revision = Ivy.getWorkingRevision();
          }
@@ -31,9 +31,9 @@
          if (pubRevision == null) {
              if (revision.startsWith("working@")) {
                  pubRevision = DateUtil.format(pubdate);
---- a/src/java/org/apache/ivy/ant/IvyTask.java
-+++ b/src/java/org/apache/ivy/ant/IvyTask.java
-@@ -177,7 +177,7 @@ public abstract class IvyTask extends Ta
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/ant/IvyTask.java	2023-09-19 08:19:56.006332869 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/ant/IvyTask.java	2023-09-19 09:01:36.900813938 +0200
+@@ -177,7 +177,7 @@
              return def;
          }
          if ("now".equals(date.toLowerCase(Locale.US))) {
@@ -42,9 +42,9 @@
          }
          try {
              return DateUtil.parse(date);
---- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
-+++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
-@@ -1472,7 +1472,7 @@ public class DefaultRepositoryCacheManag
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java	2023-09-19 08:19:56.006332869 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java	2023-09-19 08:20:15.856475360 +0200
+@@ -1472,7 +1472,7 @@
      }
  
      private Artifact getDefaultMetadataArtifact(ModuleRevisionId mrid) {
@@ -53,9 +53,9 @@
      }
  
      // not used any more, but may be useful for finer grained locking when downloading artifacts
---- a/src/java/org/apache/ivy/core/deliver/DeliverOptions.java
-+++ b/src/java/org/apache/ivy/core/deliver/DeliverOptions.java
-@@ -61,7 +61,7 @@ public class DeliverOptions {
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/deliver/DeliverOptions.java	2023-09-19 08:19:56.006332869 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/deliver/DeliverOptions.java	2023-09-19 09:02:47.901319704 +0200
+@@ -61,7 +61,7 @@
       * @return a DeliverOptions instance ready to be used or customized
       */
      public static DeliverOptions newInstance(IvySettings settings) {
@@ -64,9 +64,9 @@
                  settings.doValidate(), true, null);
      }
  
---- a/src/java/org/apache/ivy/core/install/InstallEngine.java
-+++ b/src/java/org/apache/ivy/core/install/InstallEngine.java
-@@ -86,7 +86,7 @@ public class InstallEngine {
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/install/InstallEngine.java	2023-09-19 08:19:56.006332869 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/install/InstallEngine.java	2023-09-19 09:04:45.372153072 +0200
+@@ -86,7 +86,7 @@
  
              DefaultModuleDescriptor md = new DefaultModuleDescriptor(ModuleRevisionId.newInstance(
                  "apache", "ivy-install", "1.0"), settings.getStatusManager().getDefaultStatus(),
@@ -75,9 +75,9 @@
              String resolveId = ResolveOptions.getDefaultResolveId(md);
              md.addConfiguration(new Configuration("default"));
              md.addConflictManager(new ModuleId(ExactPatternMatcher.ANY_EXPRESSION,
---- a/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java
-+++ b/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java
-@@ -100,7 +100,7 @@ public class DefaultArtifact extends Abs
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java	2023-09-19 08:19:56.009666226 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java	2023-09-19 08:20:27.823227936 +0200
+@@ -100,7 +100,7 @@
              throw new NullPointerException("null arid not allowed");
          }
          if (publicationDate == null) {
@@ -86,9 +86,9 @@
          }
          this.publicationDate = publicationDate;
          this.arid = arid;
---- a/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
-+++ b/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
-@@ -272,7 +272,7 @@ public class DefaultModuleDescriptor imp
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java	2023-09-19 08:19:56.009666226 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java	2023-09-19 08:21:12.330214087 +0200
+@@ -272,7 +272,7 @@
          this.resolvedRevId = id;
          this.status = status;
          this.publicationDate = pubDate;
@@ -97,7 +97,7 @@
          this.isDefault = isDefault;
          this.parser = XmlModuleDescriptorParser.getInstance();
      }
-@@ -308,7 +308,7 @@ public class DefaultModuleDescriptor imp
+@@ -308,7 +308,7 @@
      public void setPublicationDate(Date publicationDate) {
          this.publicationDate = publicationDate;
          if (resolvedPublicationDate == null) {
@@ -106,9 +106,9 @@
          }
      }
  
---- a/src/java/org/apache/ivy/core/publish/PublishEngine.java
-+++ b/src/java/org/apache/ivy/core/publish/PublishEngine.java
-@@ -102,7 +102,7 @@ public class PublishEngine {
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/publish/PublishEngine.java	2023-09-19 08:19:56.009666226 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/publish/PublishEngine.java	2023-09-19 09:03:21.054888232 +0200
+@@ -102,7 +102,7 @@
          ModuleDescriptor md = null;
          if (options.getSrcIvyPattern() != null) {
              File ivyFile = settings.resolveFile(IvyPatternHelper.substitute(
@@ -117,7 +117,7 @@
              if (!ivyFile.exists()) {
                  throw new IllegalArgumentException("ivy file to publish not found for " + mrid
                          + ": call deliver before (" + ivyFile + ")");
-@@ -132,7 +132,7 @@ public class PublishEngine {
+@@ -132,7 +132,7 @@
                                              : options.getStatus())
                                      .setRevision(options.getPubrevision())
                                      .setBranch(options.getPubBranch())
@@ -126,9 +126,9 @@
                                              : options.getPubdate())
                                      .setMerge(options.isMerge())
                                      .setMergedDescriptor(md)
---- a/src/java/org/apache/ivy/core/report/ResolveReport.java
-+++ b/src/java/org/apache/ivy/core/report/ResolveReport.java
-@@ -360,7 +360,7 @@ public class ResolveReport {
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/report/ResolveReport.java	2023-09-19 08:19:56.009666226 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/report/ResolveReport.java	2023-09-19 09:04:29.478706979 +0200
+@@ -360,7 +360,7 @@
  
      public ModuleDescriptor toFixedModuleDescriptor(IvySettings settings, List<ModuleId> midToKeep) {
          DefaultModuleDescriptor fixedmd = new DefaultModuleDescriptor(md.getModuleRevisionId(),
@@ -137,9 +137,9 @@
  
          // copy namespaces
          for (Map.Entry<String, String> ns : md.getExtraAttributesNamespaces().entrySet()) {
---- a/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
-+++ b/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
-@@ -572,7 +572,7 @@ public class ResolveEngine {
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/core/resolve/ResolveEngine.java	2023-09-19 08:19:56.009666226 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/core/resolve/ResolveEngine.java	2023-09-19 09:04:13.531927183 +0200
+@@ -572,7 +572,7 @@
          try {
              options.setConfs(confs);
  
@@ -148,9 +148,9 @@
              ResolveData data = context.getResolveData();
              if (data == null) {
                  data = new ResolveData(this, options);
---- a/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
-+++ b/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
-@@ -93,7 +93,7 @@ public class BundleInfoAdapter {
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java	2023-09-19 08:19:56.012999584 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java	2023-09-19 09:06:16.799468326 +0200
+@@ -93,7 +93,7 @@
          md.addExtraAttributeNamespace("o", Ivy.getIvyHomeURL() + "osgi");
          ModuleRevisionId mrid = asMrid(BundleInfo.BUNDLE_TYPE, bundle.getSymbolicName(),
              bundle.getVersion());
@@ -159,9 +159,9 @@
          md.setModuleRevisionId(mrid);
  
          md.addConfiguration(CONF_DEFAULT);
---- a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
-+++ b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
-@@ -201,7 +201,7 @@ public abstract class AbstractOSGiResolv
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java	2023-09-19 08:19:56.012999584 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java	2023-09-19 09:06:27.589544872 +0200
+@@ -201,7 +201,7 @@
              Collections.singletonMap(CAPABILITY_EXTRA_ATTR, md.getModuleRevisionId().toString()));
  
          DefaultModuleDescriptor capabilityMd = new DefaultModuleDescriptor(capabilityRev,
@@ -170,9 +170,9 @@
  
          String useConf = BundleInfoAdapter.CONF_USE_PREFIX + dd.getDependencyRevisionId().getName();
  
---- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
-+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
-@@ -249,7 +249,7 @@ public class PomModuleDescriptorBuilder
+--- apache-ivy-2.5.2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java	2023-09-19 08:19:56.016332941 +0200
++++ apache-ivy-2.5.2/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java	2023-09-19 09:05:45.949249470 +0200
+@@ -249,7 +249,7 @@
              DependencyResolver resolver = parserSettings.getResolver(mrid);
  
              if (resolver != null) {
@@ -181,7 +181,7 @@
                          "jar");
                  ArtifactOrigin artifactOrigin = resolver.locate(artifact);
  
-@@ -268,7 +268,7 @@ public class PomModuleDescriptorBuilder
+@@ -268,7 +268,7 @@
              ext = packaging;
          }
  

apache-ivy.changes

@@ -1,26 +1,3 @@
--------------------------------------------------------------------
-Thu Jan 30 12:51:50 UTC 2025 - Gus Kenion <gus.kenion@suse.com>
-
-- Upgrade to version 2.5.3
-  * Bugfixes:
-    + trying to set safe XML features causes SAXExceptions when
-      used with certain XML parsers (jira:IVY-1647[])
-    + some unit tests failed on Java 8 (jira:IVY-1648[])
-    + cached Ivy files were not valid in some scenarios
-      (jira:IVY-1649[], jira:IVY-1650[])
-  * Documentation:
-    + improved to the documentation regarding the use of patterns
-      in the resolvers and retrieve task (jira:IVY-1651[])
-- Update patch files for compatibility with 2.5.3:
-  * apache-ivy-global-settings.patch
-  * apache-ivy-publication-date.patch
-  * apache-ivy-pack200.patch
-
--------------------------------------------------------------------
-Sun Sep 29 19:45:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Fix build after removal of the default %%{java_home} define
-
 -------------------------------------------------------------------
 Tue Feb 20 10:44:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

apache-ivy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 %bcond_without  vfs
 %bcond_with pack200
 Name:           apache-ivy
-Version:        2.5.3
+Version:        2.5.2
 Release:        0
 Summary:        Java-based dependency manager
 License:        Apache-2.0
@@ -47,9 +47,7 @@ BuildArch:      noarch
 %if %{with pack200}
 BuildRequires:  pack200
 %else
-BuildConflicts: java >= 14
 BuildConflicts: java-devel >= 14
-BuildConflicts: java-headless >= 14
 %endif
 %if %{with vfs}
 BuildRequires:  apache-commons-vfs2

ivy-2.5.2.pom

@@ -28,7 +28,7 @@
   </parent>
   <groupId>org.apache.ivy</groupId>
   <artifactId>ivy</artifactId>
-  <version>2.5.3</version>
+  <version>2.5.2</version>
   <name>Apache Ivy</name>
   <url>http://ant.apache.org/ivy/</url>
   <scm>