Hello community,
here is the log from the commit of package apache-ivy for openSUSE:Factory checked in at 2018-12-07 14:30:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old)
and /work/SRC/openSUSE:Factory/.apache-ivy.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-ivy"
Fri Dec 7 14:30:10 2018 rev:14 rq:653636 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2018-07-24 17:30:52.975948116 +0200
+++ /work/SRC/openSUSE:Factory/.apache-ivy.new.19453/apache-ivy.changes 2018-12-07 14:30:13.103456910 +0100
@@ -1,0 +2,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
+- Added patch:
+ * apache-ivy-global-settings.patch
+ + change global settings
+
+-------------------------------------------------------------------
Old:
----
apache-ivy-2.3.0-jdk9.patch
apache-ivy-2.3.0-src.tar.gz
ivy-2.3.0.pom
New:
----
apache-ivy-2.4.0-jdk9.patch
apache-ivy-2.4.0-src.tar.gz
apache-ivy-global-settings.patch
ivy-2.4.0.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-ivy.spec ++++++
--- /var/tmp/diff_new_pack.jABlZ1/_old 2018-12-07 14:30:14.851454739 +0100
+++ /var/tmp/diff_new_pack.jABlZ1/_new 2018-12-07 14:30:14.855454735 +0100
@@ -12,33 +12,33 @@
# 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
+Patch1: apache-ivy-global-settings.patch
BuildRequires: ant
BuildRequires: bouncycastle
BuildRequires: commons-httpclient
-BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: java-devel >= 1.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
@@ -60,9 +60,7 @@
%prep
%setup -q
%patch0 -p1
-
-# Fix messed-up encodings
-dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt
+%patch1 -p1
#TODO: return back when bouncycastle-pgp will be available
rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle
@@ -77,6 +75,9 @@
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 +114,8 @@
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 +124,6 @@
%{_datadir}/maven-metadata/%{name}.xml
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/*
%changelog
++++++ apache-ivy-2.3.0-jdk9.patch -> apache-ivy-2.4.0-jdk9.patch ++++++
--- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy-2.3.0-jdk9.patch 2018-07-24 17:30:52.751947833 +0200
+++ /work/SRC/openSUSE:Factory/.apache-ivy.new.19453/apache-ivy-2.4.0-jdk9.patch 2018-12-07 14:30:11.611458762 +0100
@@ -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 @@
- </target>
-
- <target name="javadoc" unless="skip.javadoc">
-- <javadoc destdir="${javadoc.build.dir}" useexternalfile="true">
-+ <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}">
- <fileset dir="${src.dir}" includes="**/*.java" />
- </javadoc>
- </target>
+ </target>
+
+ <target name="javadoc" unless="skip.javadoc">
+- <javadoc destdir="${javadoc.build.dir}" useexternalfile="true">
++ <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}">
+ <fileset dir="${src.dir}" includes="**/*.java" />
+ </javadoc>
+ </target>
++++++ apache-ivy-2.3.0-src.tar.gz -> apache-ivy-2.4.0-src.tar.gz ++++++
++++ 1043547 lines of diff (skipped)
++++++ apache-ivy-global-settings.patch ++++++
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
++++++ ivy-2.3.0.pom -> ivy-2.4.0.pom ++++++
--- /work/SRC/openSUSE:Factory/apache-ivy/ivy-2.3.0.pom 2013-11-08 14:34:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.apache-ivy.new.19453/ivy-2.4.0.pom 2018-12-07 14:30:14.247455489 +0100
@@ -1,157 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-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">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>7</version>
- </parent>
- <groupId>org.apache.ivy</groupId>
- <artifactId>ivy</artifactId>
- <version>2.3.0</version>
- <name>Apache Ivy</name>
- <url>http://ant.apache.org/ivy/</url>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
- </scm>
- <mailingLists>
- <mailingList>
- <name>Ant/Ivy Developers List</name>
- <subscribe>dev-subscribe@ant.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
- <post>dev@ant.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
- </mailingList>
- <mailingList>
- <name>Ivy Users List</name>
- <subscribe>ivy-user-subscribe@ant.apache.org</subscribe>
- <unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe>
- <post>ivy-user@ant.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
- </mailingList>
- </mailingLists>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/IVY</url>
- </issueManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.7.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-vfs</groupId>
- <artifactId>commons-vfs</artifactId>
- <version>1.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.31</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk14</artifactId>
- <version>1.45</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>1.45</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-testutil</artifactId>
- <version>1.7.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
+ <groupId>org.apache.ivy</groupId>
+ <artifactId>ivy</artifactId>
+ <version>2.4.0</version>
+ <name>Apache Ivy</name>
+ <url>http://ant.apache.org/ivy/</url>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ant/ivy/core/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
+ </scm>
+ <mailingLists>
+ <mailingList>
+ <name>Ant/Ivy Developers List</name>
+ <subscribe>dev-subscribe@ant.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
+ <post>dev@ant.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Ivy Users List</name>
+ <subscribe>ivy-user-subscribe@ant.apache.org</subscribe>
+ <unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe>
+ <post>ivy-user@ant.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
+ </mailingList>
+ </mailingLists>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/IVY</url>
+ </issueManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.7.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <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>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpg-jdk14</artifactId>
+ <version>1.45</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>1.45</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <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>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>