OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=61

apache-ivy-2.4.0-jdk9.patch

@@ -1,14 +1,3 @@
---- apache-ivy-2.3.0/build.properties	2012-04-02 23:11:30.000000000 +0200
-+++ apache-ivy-2.3.0/build.properties	2017-09-07 14:13:28.647597540 +0200
-@@ -42,7 +42,7 @@
- checkstyle.src.dir=${basedir}/src/etc/checkstyle
- rat.report.dir=${reports.dir}/rat
- 
--ivy.minimum.javaversion=1.5
-+ivy.minimum.javaversion=1.8
- debug.mode=on
- ivy.install.version=1.4.1
- 
 --- apache-ivy-2.3.0/build.xml	2012-04-09 08:58:36.000000000 +0200
 +++ apache-ivy-2.3.0/build.xml	2017-09-07 14:46:13.128164218 +0200
 @@ -517,7 +517,7 @@

apache-ivy-2.5.0-src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:109583a8d10b5d9a71c57c539719ca3648ebb8ca4af867976128e7fa657312b7
+size 2719181

apache-ivy-global-settings.patch

@@ -1,27 +1,11 @@
-From 27cf17a1eea310b8d75efc7fc9d4d733fffcbdc1 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Fri, 19 Oct 2018 15:25:30 +0200
-Subject: [PATCH] Change global settings
-
----
- src/java/org/apache/ivy/ant/IvyAntSettings.java | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/java/org/apache/ivy/ant/IvyAntSettings.java b/src/java/org/apache/ivy/ant/IvyAntSettings.java
-index 660ebbe..85cf97f 100644
 --- a/src/java/org/apache/ivy/ant/IvyAntSettings.java
 +++ b/src/java/org/apache/ivy/ant/IvyAntSettings.java
-@@ -354,6 +354,10 @@ public class IvyAntSettings extends DataType {
+@@ -345,7 +345,7 @@ public class IvyAntSettings extends DataType {
-                 break;
+         File[] settingsLocations = new File[] {
-             }
+                 new File(getProject().getBaseDir(), settingsFileName),
-         }
+                 new File(getProject().getBaseDir(), "ivyconf.xml"), new File(settingsFileName),
-+        if (!file.exists() && task.getProject().getProperty("ivy.mode") != null) {
+-                new File("ivyconf.xml")};
-+            file = new File("/etc/ivy/ivysettings.xml");
++                new File("ivyconf.xml"), new File("/etc/ivy/ivysettings.xml")};
-+            task.log("searching settings file: trying " + file, Project.MSG_VERBOSE);
+         for (File settingsFile : settingsLocations) {
-+        }
+             task.log("searching settings file: trying " + settingsFile, Project.MSG_VERBOSE);
-         if (!file.exists()) {
+             if (settingsFile.exists()) {
-             file = null;
-             if (Boolean.valueOf(getProject().getProperty("ivy.14.compatible")).booleanValue()) {
--- 
-2.17.2
-

apache-ivy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-ivy
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,23 @@
 #
 
 
-%bcond_without  ssh
+%bcond_without  httpclient
+%bcond_without  oro
+%bcond_without  sftp
 %bcond_without  vfs
 Name:           apache-ivy
-Version:        2.4.0
+Version:        2.5.0
 Release:        0
 Summary:        Java-based dependency manager
 License:        Apache-2.0
 Group:          Development/Tools/Building
-URL:            http://ant.apache.org/ivy/
+URL:            https://ant.apache.org/ivy/
-Source0:        %{name}-%{version}-src.tar.gz
+Source0:        https://archive.apache.org/dist/ant/ivy/%{version}/%{name}-%{version}-src.tar.gz
 Source1:        ivy.1
-Source2:        http://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom
+Source2:        https://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom
-Patch0:         apache-ivy-2.4.0-jdk9.patch
+Patch0:         apache-ivy-global-settings.patch
-Patch1:         apache-ivy-global-settings.patch
-Patch2:         port-to-bc-1.52.patch
 BuildRequires:  ant
 BuildRequires:  bouncycastle-pg
-BuildRequires:  commons-httpclient
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
@@ -45,11 +44,17 @@ BuildArch:      noarch
 %if %{with vfs}
 BuildRequires:  apache-commons-vfs2
 %endif
-%if %{with ssh}
+%if %{with sftp}
 BuildRequires:  jsch-agent-proxy-connector-factory
 BuildRequires:  jsch-agent-proxy-core
 BuildRequires:  jsch-agent-proxy-jsch
 %endif
+%if %{with httpclient}
+BuildRequires:  httpcomponents-client
+%endif
+%if %{with oro}
+BuildRequires:  oro
+%endif
 
 %description
 Apache Ivy is a tool for managing (recording, tracking, resolving and
@@ -69,50 +74,74 @@ JavaDoc documentation for %{name}
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 cp %{SOURCE2} pom.xml
 
 %pom_remove_parent .
 
-# Remove prebuilt documentation
+%pom_remove_dep :jsch.agentproxy
-rm -rf doc build/doc
 
-# Port from commons-vfs 1.x to 2.x
+%if %{without httpclient}
-%if %{with vfs}
+%pom_remove_dep :httpclient
-sed -i "s/commons.vfs/&2/" {src,test}/java/org/apache/ivy/plugins/repository/vfs/*
+rm src/java/org/apache/ivy/util/url/HttpClientHandler.java
-%else
-sed -i /commons-vfs/d ivy.xml
-sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
-        src/java/org/apache/ivy/core/settings/typedef.properties
-rm -rf src/java/org/apache/ivy/plugins/repository/vfs
-rm -rf src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
 %endif
 
-%if %{without ssh}
+%if %{without oro}
-rm -r src/java/org/apache/ivy/plugins/repository/{ssh,sftp}
+%pom_remove_dep :oro
-rm src/java/org/apache/ivy/plugins/resolver/*{Ssh,SFTP}*.java
+rm src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java
+%endif
+
+%if %{without vfs}
+%pom_remove_dep :commons-vfs2
+rm src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java
+rm src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java
+rm src/java/org/apache/ivy/plugins/repository/vfs/ivy_vfs.xml
+rm src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
+%endif
+
+%if %{without sftp}
+%pom_remove_dep :jsch
+%pom_remove_dep :jsch.agentproxy.connector-factory
+%pom_remove_dep :jsch.agentproxy.jsch
+rm src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
+rm src/java/org/apache/ivy/plugins/repository/sftp/SFTPResource.java
+rm src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java
+rm src/java/org/apache/ivy/plugins/repository/ssh/RemoteScpException.java
+rm src/java/org/apache/ivy/plugins/repository/ssh/Scp.java
+rm src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java
+rm src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java
+rm src/java/org/apache/ivy/plugins/repository/ssh/SshResource.java
+rm src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java
+rm src/java/org/apache/ivy/plugins/resolver/SFTPResolver.java
+rm src/java/org/apache/ivy/plugins/resolver/SshResolver.java
 %endif
 
 %build
 # Craft class path
 mkdir -p lib
-build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient bcprov bcpg
+build-jar-repository -s lib ant ant/ant-nodeps jsch bcprov bcpg
-export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient bcprov bcpg)
+export CLASSPATH=$(build-classpath ant ant/ant-nodeps jsch httpcomponents bcprov bcpg)
+%if %{with httpclient}
+build-jar-repository lib httpcomponents
+export CLASSPATH=${CLASSPATH}:$(build-classpath httpcomponents)
+%endif
+%if %{with oro}
+build-jar-repository lib oro
+export CLASSPATH=${CLASSPATH}:$(build-classpath oro)
+%endif
 %if %{with vfs}
 build-jar-repository lib commons-vfs2
 export CLASSPATH=${CLASSPATH}:$(build-classpath commons-vfs2)
 %endif
-%if %{with ssh}
+%if %{with sftp}
-build-jar-repository lib jsch.agentproxy.core \
+build-jar-repository -s lib jsch.agentproxy.core \
                          jsch.agentproxy.connector-factory \
                          jsch.agentproxy.jsch
 export CLASSPATH=${CLASSPATH}:$(build-classpath jsch.agentproxy.core jsch.agentproxy.connector-factory jsch.agentproxy.jsch)
 %endif
 
 # Build
-ant -Dtarget.ivy.version=%{version} -Dbundle.version=%{version} /localivy /offline jar javadoc
+%{ant} -v -Dtarget.ivy.version=%{version} -Dbundle.version=%{version} /localivy /offline jar javadoc
 
 %install
 # Code
@@ -127,7 +156,7 @@ install -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
 
 # API Documentation
 install -d %{buildroot}%{_javadocdir}/%{name}
-cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name}
+cp -rp build/reports/api/. %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 # Command line script
@@ -143,7 +172,7 @@ install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1
 
 %files -f .mfiles
 %license LICENSE NOTICE
-%doc README
+%doc README.adoc
 %config %{_sysconfdir}/ant.d/%{name}
 %{_javadir}/%{name}
 %attr(755,root,root) %{_bindir}/*

ivy-2.5.0.pom

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>7</version>
+  </parent>
+  <groupId>org.apache.ivy</groupId>
+  <artifactId>ivy</artifactId>
+  <version>2.5.0</version>
+  <name>Apache Ivy</name>
+  <url>http://ant.apache.org/ivy/</url>
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk</developerConnection>
+    <url>https://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
+  </scm>
+  <mailingLists>
+    <mailingList>
+      <name>Ant/Ivy Developers List</name>
+      <subscribe>dev-subscribe@ant.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
+      <post>dev@ant.apache.org</post>
+      <archive>https://mail-archives.apache.org/mod_mbox/ant-dev</archive>
+    </mailingList>
+    <mailingList>
+      <name>Ivy Users List</name>
+      <subscribe>ivy-user-subscribe@ant.apache.org</subscribe>
+      <unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe>
+      <post>ivy-user@ant.apache.org</post>
+      <archive>https://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
+    </mailingList>
+  </mailingLists>
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/IVY</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.9.14</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.9</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-vfs2</artifactId>
+      <version>2.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch</artifactId>
+      <version>0.1.55</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch.agentproxy</artifactId>
+      <version>0.0.9</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch.agentproxy.connector-factory</artifactId>
+      <version>0.0.9</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch.agentproxy.jsch</artifactId>
+      <version>0.0.9</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpg-jdk15on</artifactId>
+      <version>1.62</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.62</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-testutil</artifactId>
+      <version>1.9.14</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-launcher</artifactId>
+      <version>1.9.14</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-junit</artifactId>
+      <version>1.9.14</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-junit4</artifactId>
+      <version>1.9.14</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>ant-contrib</groupId>
+      <artifactId>ant-contrib</artifactId>
+      <version>1.0b3</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.6</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>