Hello community, here is the log from the commit of package maven-wagon for openSUSE:Factory checked in at 2019-10-07 13:50:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-wagon (Old) and /work/SRC/openSUSE:Factory/.maven-wagon.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-wagon" Mon Oct 7 13:50:19 2019 rev:2 rq:735646 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-wagon/maven-wagon.changes 2019-04-03 10:50:15.925913306 +0200 +++ /work/SRC/openSUSE:Factory/.maven-wagon.new.2352/maven-wagon.changes 2019-10-07 14:14:31.318822964 +0200 @@ -1,0 +2,10 @@ +Mon Oct 7 09:39:56 UTC 2019 - Fridrich Strba <[email protected]> + +- Build also the ssh* providers + +------------------------------------------------------------------- +Sat Oct 5 16:53:43 UTC 2019 - Fridrich Strba <[email protected]> + +- Avoid unversioned dependencies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-wagon.spec ++++++ --- /var/tmp/diff_new_pack.TFL2Sg/_old 2019-10-07 14:14:32.738819066 +0200 +++ /var/tmp/diff_new_pack.TFL2Sg/_new 2019-10-07 14:14:32.738819066 +0200 @@ -32,7 +32,11 @@ 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 @@ %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 @@ %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" " <groupId>org.apache.maven.wagon</groupId> @@ -156,12 +190,15 @@ <groupId>org.apache.maven.wagon</groupId> <version>%{version}</version>" wagon-provider-api +%pom_change_dep -r -f ::::: ::::: + %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 @@ -169,14 +206,14 @@ # 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" @@ -188,7 +225,7 @@ # 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 @@ -208,6 +245,12 @@ %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 ++++++ maven-wagon-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wagon-providers/build.xml new/wagon-providers/build.xml --- old/wagon-providers/build.xml 2019-03-15 11:14:11.617617536 +0100 +++ new/wagon-providers/build.xml 2019-10-07 10:57:00.365312137 +0200 @@ -12,6 +12,9 @@ <ant antfile="build.xml" dir="wagon-http-shared" target="clean"/> <ant antfile="build.xml" dir="wagon-http" target="clean"/> <ant antfile="build.xml" dir="wagon-http-lightweight" target="clean"/> + <ant antfile="build.xml" dir="wagon-ssh-common" target="clean"/> + <ant antfile="build.xml" dir="wagon-ssh" target="clean"/> + <ant antfile="build.xml" dir="wagon-ssh-external" target="clean"/> </target> <!-- ====================================================================== --> @@ -24,6 +27,9 @@ <ant antfile="build.xml" dir="wagon-http-shared" target="compile"/> <ant antfile="build.xml" dir="wagon-http" target="compile"/> <ant antfile="build.xml" dir="wagon-http-lightweight" target="compile"/> + <ant antfile="build.xml" dir="wagon-ssh-common" target="compile"/> + <ant antfile="build.xml" dir="wagon-ssh" target="compile"/> + <ant antfile="build.xml" dir="wagon-ssh-external" target="compile"/> </target> <!-- ====================================================================== --> @@ -36,6 +42,9 @@ <ant antfile="build.xml" dir="wagon-http-shared" target="compile-tests"/> <ant antfile="build.xml" dir="wagon-http" target="compile-tests"/> <ant antfile="build.xml" dir="wagon-http-lightweight" target="compile-tests"/> + <ant antfile="build.xml" dir="wagon-ssh-common" target="compile-tests"/> + <ant antfile="build.xml" dir="wagon-ssh" target="compile-tests"/> + <ant antfile="build.xml" dir="wagon-ssh-external" target="compile-tests"/> </target> <!-- ====================================================================== --> @@ -48,6 +57,9 @@ <ant antfile="build.xml" dir="wagon-http-shared" target="test"/> <ant antfile="build.xml" dir="wagon-http" target="test"/> <ant antfile="build.xml" dir="wagon-http-lightweight" target="test"/> + <ant antfile="build.xml" dir="wagon-ssh-common" target="test"/> + <ant antfile="build.xml" dir="wagon-ssh" target="test"/> + <ant antfile="build.xml" dir="wagon-ssh-external" target="test"/> </target> <!-- ====================================================================== --> @@ -60,6 +72,9 @@ <ant antfile="build.xml" dir="wagon-http-shared" target="javadoc"/> <ant antfile="build.xml" dir="wagon-http" target="javadoc"/> <ant antfile="build.xml" dir="wagon-http-lightweight" target="javadoc"/> + <ant antfile="build.xml" dir="wagon-ssh-common" target="javadoc"/> + <ant antfile="build.xml" dir="wagon-ssh" target="javadoc"/> + <ant antfile="build.xml" dir="wagon-ssh-external" target="javadoc"/> </target> <!-- ====================================================================== --> @@ -72,6 +87,9 @@ <ant antfile="build.xml" dir="wagon-http-shared" target="package"/> <ant antfile="build.xml" dir="wagon-http" target="package"/> <ant antfile="build.xml" dir="wagon-http-lightweight" target="package"/> + <ant antfile="build.xml" dir="wagon-ssh-common" target="package"/> + <ant antfile="build.xml" dir="wagon-ssh" target="package"/> + <ant antfile="build.xml" dir="wagon-ssh-external" target="package"/> </target> </project>
