From b099623ba776970addbd1eaba277b7a29d38537418122ca9520d0c25a0c103ce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Jun 2019 14:33:50 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=49 --- apache-ivy.spec | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index 3529e7b..0afc1ae 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -16,6 +16,8 @@ # +%bcond_without ssh +%bcond_without vfs Name: apache-ivy Version: 2.4.0 Release: 0 @@ -39,6 +41,14 @@ BuildRequires: oro Provides: ivy = %{version}-%{release} Obsoletes: ivy < %{version}-%{release} BuildArch: noarch +%if %{with vfs} +BuildRequires: apache-commons-vfs2 +%endif +%if %{with ssh} +BuildRequires: jsch-agent-proxy-connector-factory +BuildRequires: jsch-agent-proxy-core +BuildRequires: jsch-agent-proxy-jsch +%endif %description Apache Ivy is a tool for managing (recording, tracking, resolving and @@ -62,7 +72,7 @@ JavaDoc documentation for %{name} cp %{SOURCE2} pom.xml -%pom_remove_parent . +%{pom_remove_parent} . #TODO: return back when bouncycastle-pgp will be available rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle @@ -70,23 +80,37 @@ rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle # Remove prebuilt documentation rm -rf doc build/doc -# How to properly disable a plugin? -# we disable vfs plugin since commons-vfs is not available -rm -rf src/java/org/apache/ivy/plugins/repository/vfs \ - src/java/org/apache/ivy/plugins/resolver/VfsResolver.java +# 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 +%endif %build # Craft class path mkdir -p lib build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient +export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient) +%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-agent-proxy +export CLASSPATH=${CLASSPATH}:$(build-classpath jsch-agent-proxy) +%endif # Build -export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient) ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc %install From 043cbd961ab3c38c5c695a69faa1835608ccd11c039cfcc9503b8910a406742d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Jun 2019 14:36:33 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=50 --- apache-ivy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index 0afc1ae..68d2799 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -72,7 +72,7 @@ JavaDoc documentation for %{name} cp %{SOURCE2} pom.xml -%{pom_remove_parent} . +%pom_remove_parent . #TODO: return back when bouncycastle-pgp will be available rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle From 463a9d2b1b8077cfdf53ad9d2b106178f2e67c932184503f91807c2e349289c4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 27 Jun 2019 14:40:05 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=51 --- apache-ivy.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index 68d2799..8ea3064 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -16,8 +16,8 @@ # -%bcond_without ssh -%bcond_without vfs +%bcond_with ssh +%bcond_with vfs Name: apache-ivy Version: 2.4.0 Release: 0 From 129288f82ad9684e685e7a04d7d51e61fbfb611360272519616529082cf58e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 28 Jun 2019 12:00:39 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=52 --- apache-ivy.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index 8ea3064..6299050 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -16,7 +16,7 @@ # -%bcond_with ssh +%bcond_without ssh %bcond_with vfs Name: apache-ivy Version: 2.4.0 @@ -106,8 +106,10 @@ build-jar-repository lib commons-vfs2 export CLASSPATH=${CLASSPATH}:$(build-classpath commons-vfs2) %endif %if %{with ssh} -build-jar-repository lib jsch-agent-proxy -export CLASSPATH=${CLASSPATH}:$(build-classpath jsch-agent-proxy) +build-jar-repository 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 From f6fb0a04cbb21c635c3f7e5ff24abcaeaaa7f56a3b291e1710ca6acccae877fb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 28 Jun 2019 12:21:37 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=53 --- apache-ivy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index 6299050..1189b90 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -17,7 +17,7 @@ %bcond_without ssh -%bcond_with vfs +%bcond_without vfs Name: apache-ivy Version: 2.4.0 Release: 0 From 91206ee5e1572d3db3a673f245341541b58562673c2d8c8d0e9bf5af59677f7d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Jul 2019 09:23:41 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=54 --- apache-ivy.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-ivy.changes b/apache-ivy.changes index 5c1b034..3d4b395 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 2 09:22:21 UTC 2019 - Fridrich Strba + +- Add possibility to build with ssh and vfs integration, since + we have all the dependencies in openSUSE. + ------------------------------------------------------------------- Mon Apr 8 18:12:07 UTC 2019 - Fridrich Strba