OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=38

apache-ivy-2.3.0-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20f9ba64b6f24328497394d8b3e24b8e15e12ad230958be9c76d6f8cccf081de
-size 2790722

apache-ivy-2.4.0-jdk9.patch

@@ -4,7 +4,7 @@
  checkstyle.src.dir=${basedir}/src/etc/checkstyle
  rat.report.dir=${reports.dir}/rat
  
--ivy.minimum.javaversion=1.4
+-ivy.minimum.javaversion=1.5
 +ivy.minimum.javaversion=1.8
  debug.mode=on
  ivy.install.version=1.4.1

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

apache-ivy.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov 26 10:25:21 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- 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
 

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

ivy-2.4.0.pom

@@ -18,7 +18,7 @@
    under the License.    
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -28,7 +28,7 @@
   </parent>
   <groupId>org.apache.ivy</groupId>
   <artifactId>ivy</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
   <name>Apache Ivy</name>
   <url>http://ant.apache.org/ivy/</url>
   <scm>
@@ -96,7 +96,25 @@
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jsch</artifactId>
-      <version>0.1.31</version>
+      <version>0.1.50</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch.agentproxy</artifactId>
+      <version>0.0.6</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch.agentproxy.connector-factory</artifactId>
+      <version>0.0.6</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch.agentproxy.jsch</artifactId>
+      <version>0.0.6</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -128,18 +146,36 @@
       <artifactId>ant-testutil</artifactId>
       <version>1.7.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant-launcher</artifactId>
       <version>1.6.2</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>