Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apache-ivy for openSUSE:Factory checked in at 2022-03-28 16:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old) and /work/SRC/openSUSE:Factory/.apache-ivy.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-ivy" Mon Mar 28 16:59:42 2022 rev:20 rq:964692 version:2.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2019-12-23 22:37:30.473821978 +0100 +++ /work/SRC/openSUSE:Factory/.apache-ivy.new.1900/apache-ivy.changes 2022-03-28 17:00:21.316952592 +0200 @@ -1,0 +2,16 @@ +Sat Mar 19 13:22:59 UTC 2022 - Fridrich Strba <[email protected]> + +- 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 +- Modified patch: + * apache-ivy-global-settings.patch + + implement the same functionality with a bit of less code +- Removed patches: + * apache-ivy-2.4.0-jdk9.patch + * port-to-bc-1.52.patch + + not needed with this version + +------------------------------------------------------------------- Old: ---- apache-ivy-2.4.0-jdk9.patch apache-ivy-2.4.0-src.tar.gz ivy-2.4.0.pom port-to-bc-1.52.patch New: ---- apache-ivy-2.5.0-src.tar.gz ivy-2.5.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-ivy.spec ++++++ --- /var/tmp/diff_new_pack.3wwFIY/_old 2022-03-28 17:00:23.916956124 +0200 +++ /var/tmp/diff_new_pack.3wwFIY/_new 2022-03-28 17:00:23.920956129 +0200 @@ -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,40 +16,46 @@ # -%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/ -Source0: %{name}-%{version}-src.tar.gz +URL: https://ant.apache.org/ivy/ +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 -Patch0: apache-ivy-2.4.0-jdk9.patch -Patch1: apache-ivy-global-settings.patch -Patch2: port-to-bc-1.52.patch +Source2: https://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom +Patch0: apache-ivy-global-settings.patch BuildRequires: ant BuildRequires: bouncycastle-pg -BuildRequires: commons-httpclient BuildRequires: fdupes 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 %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 +75,74 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 cp %{SOURCE2} pom.xml %pom_remove_parent . -# Remove prebuilt documentation -rm -rf doc build/doc +%pom_remove_dep :jsch.agentproxy -# Port from commons-vfs 1.x to 2.x -%if %{with vfs} -sed -i "s/commons.vfs/&2/" {src,test}/java/org/apache/ivy/plugins/repository/vfs/* -%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} -rm -r src/java/org/apache/ivy/plugins/repository/{ssh,sftp} -rm src/java/org/apache/ivy/plugins/resolver/*{Ssh,SFTP}*.java +%if %{without httpclient} +%pom_remove_dep :httpclient +rm src/java/org/apache/ivy/util/url/HttpClientHandler.java +%endif + +%if %{without oro} +%pom_remove_dep :oro +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 -export CLASSPATH=$(build-classpath 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 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} -build-jar-repository lib jsch.agentproxy.core \ +%if %{with sftp} +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 +157,7 @@ # 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 +173,7 @@ %files -f .mfiles %license LICENSE NOTICE -%doc README +%doc README.adoc %config %{_sysconfdir}/ant.d/%{name} %{_javadir}/%{name} %attr(755,root,root) %{_bindir}/* ++++++ apache-ivy-2.4.0-src.tar.gz -> apache-ivy-2.5.0-src.tar.gz ++++++ ++++ 454019 lines of diff (skipped) ++++++ apache-ivy-global-settings.patch ++++++ --- /var/tmp/diff_new_pack.3wwFIY/_old 2022-03-28 17:00:25.676958515 +0200 +++ /var/tmp/diff_new_pack.3wwFIY/_new 2022-03-28 17:00:25.680958520 +0200 @@ -1,28 +1,12 @@ -From 27cf17a1eea310b8d75efc7fc9d4d733fffcbdc1 Mon Sep 17 00:00:00 2001 -From: Marian Koncek <[email protected]> -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 { - break; - } - } -+ if (!file.exists() && task.getProject().getProperty("ivy.mode") != null) { -+ file = new File("/etc/ivy/ivysettings.xml"); -+ task.log("searching settings file: trying " + file, Project.MSG_VERBOSE); -+ } - if (!file.exists()) { - file = null; - if (Boolean.valueOf(getProject().getProperty("ivy.14.compatible")).booleanValue()) { --- -2.17.2 - +@@ -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), +- new File("ivyconf.xml")}; ++ new File("ivyconf.xml"), new File("/etc/ivy/ivysettings.xml")}; + for (File settingsFile : settingsLocations) { + task.log("searching settings file: trying " + settingsFile, Project.MSG_VERBOSE); + if (settingsFile.exists()) { ++++++ ivy-2.4.0.pom -> ivy-2.5.0.pom ++++++ --- /work/SRC/openSUSE:Factory/apache-ivy/ivy-2.4.0.pom 2018-12-07 14:30:14.247455489 +0100 +++ /work/SRC/openSUSE:Factory/.apache-ivy.new.1900/ivy-2.5.0.pom 2022-03-28 17:00:21.368952663 +0200 @@ -8,7 +8,7 @@ "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + 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 @@ -28,13 +28,13 @@ </parent> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> - <version>2.4.0</version> + <version>2.5.0</version> <name>Apache Ivy</name> <url>http://ant.apache.org/ivy/</url> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection> + <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>http://svn.apache.org/repos/asf/ant/ivy/core/trunk</url> + <url>https://svn.apache.org/repos/asf/ant/ivy/core/trunk</url> </scm> <mailingLists> <mailingList> @@ -42,43 +42,31 @@ <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <post>[email protected]</post> - <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive> + <archive>https://mail-archives.apache.org/mod_mbox/ant-dev</archive> </mailingList> <mailingList> <name>Ivy Users List</name> <subscribe>[email protected]</subscribe> <unsubscribe>[email protected]</unsubscribe> <post>[email protected]</post> - <archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive> + <archive>https://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive> </mailingList> </mailingLists> <issueManagement> <system>jira</system> - <url>http://issues.apache.org/jira/browse/IVY</url> + <url>https://issues.apache.org/jira/browse/IVY</url> </issueManagement> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.1</version> + <version>1.9.14</version> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.7.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.5.9</version> <optional>true</optional> </dependency> <dependency> @@ -88,63 +76,69 @@ <optional>true</optional> </dependency> <dependency> - <groupId>commons-vfs</groupId> - <artifactId>commons-vfs</artifactId> - <version>1.0</version> + <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.50</version> + <version>0.1.55</version> <optional>true</optional> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy</artifactId> - <version>0.0.6</version> + <version>0.0.9</version> <optional>true</optional> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.connector-factory</artifactId> - <version>0.0.6</version> + <version>0.0.9</version> <optional>true</optional> </dependency> <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch.agentproxy.jsch</artifactId> - <version>0.0.6</version> + <version>0.0.9</version> <optional>true</optional> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk14</artifactId> - <version>1.45</version> + <artifactId>bcpg-jdk15on</artifactId> + <version>1.62</version> <optional>true</optional> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk14</artifactId> - <version>1.45</version> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.62</version> <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.2</version> + <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>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <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.7.0</version> + <version>1.9.14</version> <scope>test</scope> <exclusions> <exclusion> @@ -154,9 +148,9 @@ </exclusions> </dependency> <dependency> - <groupId>ant</groupId> + <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.6.2</version> + <version>1.9.14</version> <scope>test</scope> <exclusions> <exclusion> @@ -166,9 +160,9 @@ </exclusions> </dependency> <dependency> - <groupId>ant-contrib</groupId> - <artifactId>ant-contrib</artifactId> - <version>1.0b3</version> + <groupId>org.apache.ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.9.14</version> <scope>test</scope> <exclusions> <exclusion> @@ -178,16 +172,40 @@ </exclusions> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> + <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>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>2.6.2</version> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.6</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project>
