pool/apache-ivy
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1241596 from Java:packages

Browse Source 
Upgrade to 2.5.3

OBS-URL: https://build.opensuse.org/request/show/1241596
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=27
This commit is contained in:
Ana Guerrero 2025-02-03 20:40:36 +00:00 committed by Git OBS Bridge
commit 90f96f8773
8 changed files with 455 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
apache-ivy-2.5.2-src.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
apache-ivy-2.5.3-src.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

2
apache-ivy-global-settings.patch
View File

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

10
apache-ivy-pack200.patch
View File

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

96
apache-ivy-publication-date.patch
View File

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

18
apache-ivy.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
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> Sun Sep 29 19:45:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>

4
apache-ivy.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-ivy # spec file for package apache-ivy
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@
%bcond_without vfs %bcond_without vfs
%bcond_with pack200 %bcond_with pack200
Name: apache-ivy Name: apache-ivy
Version: 2.5.2 Version: 2.5.3
Release: 0 Release: 0
Summary: Java-based dependency manager Summary: Java-based dependency manager
License: Apache-2.0 License: Apache-2.0

2
ivy-2.5.2.pom → ivy-2.5.3.pom
View File

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