From b519a332188ca514e4ba82a44bed3283fe23a312678030d0e8edec14323c38a8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 5 Oct 2019 16:55:00 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-wagon?expand=0&rev=3 --- maven-wagon.changes | 5 +++++ maven-wagon.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/maven-wagon.changes b/maven-wagon.changes index eed69ba..a59964b 100644 --- a/maven-wagon.changes +++ b/maven-wagon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 5 16:53:43 UTC 2019 - Fridrich Strba + +- Avoid unversioned dependencies + ------------------------------------------------------------------- Fri Mar 15 11:16:53 UTC 2019 - Fridrich Strba diff --git a/maven-wagon.spec b/maven-wagon.spec index 33434ce..60c1512 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -156,6 +156,8 @@ done org.apache.maven.wagon %{version}" wagon-provider-api +%pom_change_dep -r -f ::::: ::::: + %build mkdir -p lib build-jar-repository -s lib \ From 4e0f48115b031d3bfacb56f2159734ee6657fda8e84d12fbf6e5be91c6e0bc3e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Oct 2019 09:19:53 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-wagon?expand=0&rev=4 --- maven-wagon-build.tar.xz | 4 +-- maven-wagon.spec | 61 +++++++++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/maven-wagon-build.tar.xz b/maven-wagon-build.tar.xz index ae10800..1afefb9 100644 --- a/maven-wagon-build.tar.xz +++ b/maven-wagon-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb5b972aacb660a3d03fceb76578de0ed2c7e4cc8e5b78e67d95cbb7fc9469a7 -size 4316 +oid sha256:aba7557c166d0cc9a5e01c99035ac44ece330de952b1fed690167b897d0f450a +size 4704 diff --git a/maven-wagon.spec b/maven-wagon.spec index 60c1512..322a70e 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -32,7 +32,11 @@ BuildRequires: fdupes BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core BuildRequires: javapackages-local +BuildRequires: jsch +BuildRequires: jsch-agent-proxy-connector-factory +BuildRequires: jsch-agent-proxy-jsch BuildRequires: jsoup +BuildRequires: plexus-interactivity-api BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils BuildRequires: slf4j @@ -115,6 +119,40 @@ Requires: mvn(org.codehaus.plexus:plexus-utils) %description http-lightweight The http-lightweight module for %{name}. +%package ssh-common +Summary: The ssh-common module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-interactivity-api) +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description ssh-common +The ssh-common module for %{name} + +%package ssh +Summary: The ssh module for %{name} +Group: Development/Libraries/Java +Requires: mvn(com.jcraft:jsch) +Requires: mvn(com.jcraft:jsch.agentproxy.connector-factory) +Requires: mvn(com.jcraft:jsch.agentproxy.jsch) +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.apache.maven.wagon:wagon-ssh-common) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-interactivity-api) +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description ssh +The ssh module for %{name} + +%package ssh-external +Summary: The ssh-external module for %{name} +Group: Development/Libraries/Java +Requires: mvn(org.apache.maven.wagon:wagon-provider-api) = %{version} +Requires: mvn(org.apache.maven.wagon:wagon-ssh-common) = %{version} +Requires: mvn(org.codehaus.plexus:plexus-utils) + +%description ssh-external +The ssh-external module for %{name} + %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML @@ -141,11 +179,7 @@ Javadoc for %{name}. %pom_disable_module wagon-scm wagon-providers -%pom_disable_module wagon-ssh wagon-providers -%pom_disable_module wagon-ssh-common wagon-providers -%pom_disable_module wagon-ssh-external wagon-providers - -for i in file ftp http http-shared http-lightweight; do +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do %pom_remove_parent wagon-providers/wagon-${i} %pom_xpath_inject "pom:project" " org.apache.maven.wagon @@ -161,9 +195,10 @@ done %build mkdir -p lib build-jar-repository -s lib \ - commons-io commons-net \ + commons-io commons-net jsch \ + jsch.agentproxy.core jsch.agentproxy.jsch jsch.agentproxy.connector-factory \ httpcomponents/httpclient httpcomponents/httpcore \ - jsoup/jsoup plexus/utils slf4j/api + jsoup/jsoup plexus/utils plexus/interactivity-api slf4j/api # tests are disabled because of missing dependencies %{ant} package javadoc @@ -171,14 +206,14 @@ build-jar-repository -s lib \ # jars install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 wagon-provider-api/target/wagon-provider-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/provider-api.jar -for i in file ftp http http-shared http-lightweight; do +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do install -pm 0644 wagon-providers/wagon-${i}/target/wagon-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar done # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 wagon-provider-api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/provider-api.pom %add_maven_depmap %{name}/provider-api.pom %{name}/provider-api.jar -f provider-api -for i in file ftp http http-shared http-lightweight; do +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do install -pm 0644 wagon-providers/wagon-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom if [ x${i} = xhttp ]; then # Maven requires Wagon HTTP with classifier "shaded" @@ -190,7 +225,7 @@ done # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/provider-api cp -pr wagon-provider-api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/provider-api -for i in file ftp http http-shared http-lightweight; do +for i in file ftp http http-shared http-lightweight ssh-common ssh ssh-external; do install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} cp -pr wagon-providers/wagon-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ done @@ -210,6 +245,12 @@ done %files http-lightweight -f .mfiles-http-lightweight +%files ssh-common -f .mfiles-ssh-common + +%files ssh -f .mfiles-ssh + +%files ssh-external -f .mfiles-ssh-external + %files javadoc %license LICENSE NOTICE %doc DEPENDENCIES From e2ad6d7e2ae38190b99522d7adbc955b2017de386c4a20e80ce6c8bc3c0ed5a2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Oct 2019 09:40:23 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-wagon?expand=0&rev=5 --- maven-wagon.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maven-wagon.changes b/maven-wagon.changes index a59964b..f767fce 100644 --- a/maven-wagon.changes +++ b/maven-wagon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 7 09:39:56 UTC 2019 - Fridrich Strba + +- Build also the ssh* providers + ------------------------------------------------------------------- Sat Oct 5 16:53:43 UTC 2019 - Fridrich Strba