From 62dd5ff66545f23a3d5ab4651f7109c9469342123407c34e89190bc43926c4ca Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 26 Nov 2018 10:27:59 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=38 --- apache-ivy-2.3.0-src.tar.gz | 3 - ...-jdk9.patch => apache-ivy-2.4.0-jdk9.patch | 32 +- apache-ivy-2.4.0-src.tar.gz | 3 + apache-ivy.changes | 8 + apache-ivy.spec | 22 +- ivy-2.3.0.pom => ivy-2.4.0.pom | 350 ++++++++++-------- 6 files changed, 230 insertions(+), 188 deletions(-) delete mode 100644 apache-ivy-2.3.0-src.tar.gz rename apache-ivy-2.3.0-jdk9.patch => apache-ivy-2.4.0-jdk9.patch (94%) create mode 100644 apache-ivy-2.4.0-src.tar.gz rename ivy-2.3.0.pom => ivy-2.4.0.pom (82%) diff --git a/apache-ivy-2.3.0-src.tar.gz b/apache-ivy-2.3.0-src.tar.gz deleted file mode 100644 index 4528df5..0000000 --- a/apache-ivy-2.3.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20f9ba64b6f24328497394d8b3e24b8e15e12ad230958be9c76d6f8cccf081de -size 2790722 diff --git a/apache-ivy-2.3.0-jdk9.patch b/apache-ivy-2.4.0-jdk9.patch similarity index 94% rename from apache-ivy-2.3.0-jdk9.patch rename to apache-ivy-2.4.0-jdk9.patch index fe3322b..486e6a1 100644 --- a/apache-ivy-2.3.0-jdk9.patch +++ b/apache-ivy-2.4.0-jdk9.patch @@ -1,22 +1,22 @@ --- 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.4 -+ivy.minimum.javaversion=1.8 - debug.mode=on - ivy.install.version=1.4.1 - + 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 @@ - - - -- -+ - - - + + + +- ++ + + + diff --git a/apache-ivy-2.4.0-src.tar.gz b/apache-ivy-2.4.0-src.tar.gz new file mode 100644 index 0000000..ea0453b --- /dev/null +++ b/apache-ivy-2.4.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6 +size 3616939 diff --git a/apache-ivy.changes b/apache-ivy.changes index c479786..f633501 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 26 10:25:21 UTC 2018 - Fridrich Strba + +- Upgrade to version 2.4.0 +- Modified patch: + * apache-ivy-2.3.0-jdk9.patch -> apache-ivy-2.4.0-jdk9.patch + + rediff to changed context + ------------------------------------------------------------------- Tue May 15 13:26:55 UTC 2018 - fstrba@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index 8a3f489..acb46fb 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -12,25 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: apache-ivy -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Java-based dependency manager License: Apache-2.0 Group: Development/Tools/Building -Url: http://ant.apache.org/ivy/ +URL: http://ant.apache.org/ivy/ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 -Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom -Patch0: apache-ivy-2.3.0-jdk9.patch +Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom +Patch0: apache-ivy-2.4.0-jdk9.patch BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient -BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -61,9 +60,6 @@ JavaDoc documentation for %{name} %setup -q %patch0 -p1 -# Fix messed-up encodings -dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt - #TODO: return back when bouncycastle-pgp will be available rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle @@ -77,6 +73,9 @@ rm -rf src/java/org/apache/ivy/plugins/repository/vfs \ sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \ src/java/org/apache/ivy/core/settings/typedef.properties +rm -r src/java/org/apache/ivy/plugins/repository/{ssh,sftp} +rm src/java/org/apache/ivy/plugins/resolver/*{Ssh,SFTP}*.java + %build # Craft class path mkdir -p lib @@ -113,8 +112,8 @@ install -d %{buildroot}%{_mandir}/man1 install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1 %files -%defattr(-,root,root,-) -%doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README +%license LICENSE +%doc NOTICE README %config %{_sysconfdir}/ant.d/%{name} %{_javadir}/ivy.jar %attr(755,root,root) %{_bindir}/* @@ -123,7 +122,6 @@ install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1 %{_datadir}/maven-metadata/%{name}.xml %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/* %changelog diff --git a/ivy-2.3.0.pom b/ivy-2.4.0.pom similarity index 82% rename from ivy-2.3.0.pom rename to ivy-2.4.0.pom index 10ee384..81116e1 100644 --- a/ivy-2.3.0.pom +++ b/ivy-2.4.0.pom @@ -1,157 +1,193 @@ - - - - - 4.0.0 - - org.apache - apache - 7 - - org.apache.ivy - ivy - 2.3.0 - Apache Ivy - http://ant.apache.org/ivy/ - - scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/ - scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk - http://svn.apache.org/repos/asf/ant/ivy/core/trunk - - - - Ant/Ivy Developers List - dev-subscribe@ant.apache.org - dev-unsubscribe@ant.apache.org - dev@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-dev - - - Ivy Users List - ivy-user-subscribe@ant.apache.org - ivy-user-unsubscribe@ant.apache.org - ivy-user@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-ivy-user - - - - jira - http://issues.apache.org/jira/browse/IVY - - - - org.apache.ant - ant - 1.7.1 - true - - - org.apache.ant - ant-nodeps - 1.7.1 - true - - - org.apache.ant - ant-trax - 1.7.1 - true - - - commons-httpclient - commons-httpclient - 3.0 - true - - - oro - oro - 2.0.8 - true - - - commons-vfs - commons-vfs - 1.0 - true - - - com.jcraft - jsch - 0.1.31 - true - - - org.bouncycastle - bcpg-jdk14 - 1.45 - true - - - org.bouncycastle - bcprov-jdk14 - 1.45 - true - - - junit - junit - 3.8.2 - test - - - commons-lang - commons-lang - 2.6 - test - - - org.apache.ant - ant-testutil - 1.7.0 - test - - - ant - ant-launcher - 1.6.2 - test - - - ant-contrib - ant-contrib - 1.0b3 - test - - - xerces - xercesImpl - 2.6.2 - test - - - xerces - xmlParserAPIs - 2.6.2 - test - - - + + + + + 4.0.0 + + org.apache + apache + 7 + + org.apache.ivy + ivy + 2.4.0 + Apache Ivy + http://ant.apache.org/ivy/ + + scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/ + scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk + http://svn.apache.org/repos/asf/ant/ivy/core/trunk + + + + Ant/Ivy Developers List + dev-subscribe@ant.apache.org + dev-unsubscribe@ant.apache.org + dev@ant.apache.org + http://mail-archives.apache.org/mod_mbox/ant-dev + + + Ivy Users List + ivy-user-subscribe@ant.apache.org + ivy-user-unsubscribe@ant.apache.org + ivy-user@ant.apache.org + http://mail-archives.apache.org/mod_mbox/ant-ivy-user + + + + jira + http://issues.apache.org/jira/browse/IVY + + + + org.apache.ant + ant + 1.7.1 + true + + + org.apache.ant + ant-nodeps + 1.7.1 + true + + + org.apache.ant + ant-trax + 1.7.1 + true + + + commons-httpclient + commons-httpclient + 3.0 + true + + + oro + oro + 2.0.8 + true + + + commons-vfs + commons-vfs + 1.0 + true + + + com.jcraft + jsch + 0.1.50 + true + + + com.jcraft + jsch.agentproxy + 0.0.6 + true + + + com.jcraft + jsch.agentproxy.connector-factory + 0.0.6 + true + + + com.jcraft + jsch.agentproxy.jsch + 0.0.6 + true + + + org.bouncycastle + bcpg-jdk14 + 1.45 + true + + + org.bouncycastle + bcprov-jdk14 + 1.45 + true + + + junit + junit + 3.8.2 + test + + + commons-lang + commons-lang + 2.6 + test + + + org.apache.ant + ant-testutil + 1.7.0 + test + + + * + * + + + + + ant + ant-launcher + 1.6.2 + test + + + * + * + + + + + ant-contrib + ant-contrib + 1.0b3 + test + + + * + * + + + + + xerces + xercesImpl + 2.6.2 + test + + + xerces + xmlParserAPIs + 2.6.2 + test + + + From 008d35336338d09431b6495c59bc7f3a1f22df753d60cd8be7be0279f3564c3e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 26 Nov 2018 10:38:44 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=39 --- apache-ivy-global-settings.patch | 27 +++++++++++++++++++++++++++ apache-ivy.changes | 3 +++ apache-ivy.spec | 6 ++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 apache-ivy-global-settings.patch diff --git a/apache-ivy-global-settings.patch b/apache-ivy-global-settings.patch new file mode 100644 index 0000000..3cb0fff --- /dev/null +++ b/apache-ivy-global-settings.patch @@ -0,0 +1,27 @@ +From 27cf17a1eea310b8d75efc7fc9d4d733fffcbdc1 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 + diff --git a/apache-ivy.changes b/apache-ivy.changes index f633501..e06d184 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -5,6 +5,9 @@ Mon Nov 26 10:25:21 UTC 2018 - Fridrich Strba - Modified patch: * apache-ivy-2.3.0-jdk9.patch -> apache-ivy-2.4.0-jdk9.patch + rediff to changed context +- Added patch: + * apache-ivy-global-settings.patch + + change global settings ------------------------------------------------------------------- Tue May 15 13:26:55 UTC 2018 - fstrba@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index acb46fb..321bc1a 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -27,6 +27,7 @@ Source0: %{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 BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient @@ -36,8 +37,8 @@ BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jsch BuildRequires: oro -Provides: ivy = %{version} -Obsoletes: ivy < %{version} +Provides: ivy = %{version}-%{release} +Obsoletes: ivy < %{version}-%{release} BuildArch: noarch %description @@ -59,6 +60,7 @@ JavaDoc documentation for %{name} %prep %setup -q %patch0 -p1 +%patch1 -p1 #TODO: return back when bouncycastle-pgp will be available rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle