rpm/apache-ivy
SHA256
1
0
Fork 0
forked from pool/apache-ivy
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2018-11-26 10:27:59 +00:00 committed by Git OBS Bridge
parent 87415cecd1
commit 62dd5ff665
6 changed files with 230 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache-ivy-2.3.0-src.tar.gz
View File

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

32
apache-ivy-2.3.0-jdk9.patch → apache-ivy-2.4.0-jdk9.patch
View File

@ -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 2012-04-02 23:11:30.000000000 +0200
+++ apache-ivy-2.3.0/build.properties 2017-09-07 14:13:28.647597540 +0200 +++ apache-ivy-2.3.0/build.properties 2017-09-07 14:13:28.647597540 +0200
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
checkstyle.src.dir=${basedir}/src/etc/checkstyle checkstyle.src.dir=${basedir}/src/etc/checkstyle
rat.report.dir=${reports.dir}/rat rat.report.dir=${reports.dir}/rat
-ivy.minimum.javaversion=1.4 -ivy.minimum.javaversion=1.5
+ivy.minimum.javaversion=1.8 +ivy.minimum.javaversion=1.8
debug.mode=on debug.mode=on
ivy.install.version=1.4.1 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 2012-04-09 08:58:36.000000000 +0200
+++ apache-ivy-2.3.0/build.xml 2017-09-07 14:46:13.128164218 +0200 +++ apache-ivy-2.3.0/build.xml 2017-09-07 14:46:13.128164218 +0200
@@ -517,7 +517,7 @@ @@ -517,7 +517,7 @@
</target> </target>
<target name="javadoc" unless="skip.javadoc"> <target name="javadoc" unless="skip.javadoc">
- <javadoc destdir="${javadoc.build.dir}" useexternalfile="true"> - <javadoc destdir="${javadoc.build.dir}" useexternalfile="true">
+ <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}"> + <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}">
<fileset dir="${src.dir}" includes="**/*.java" /> <fileset dir="${src.dir}" includes="**/*.java" />
</javadoc> </javadoc>
</target> </target>

3
apache-ivy-2.4.0-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:202f08ca41f4bdf1c081aa8b2e531565be6c73e9e5e0d68137f454f14eb16ef6
size 3616939

8
apache-ivy.changes
View File

@ -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 Tue May 15 13:26:55 UTC 2018 - fstrba@suse.com

22
apache-ivy.spec
View File

@ -12,25 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Name: apache-ivy
Version: 2.3.0 Version: 2.4.0
Release: 0 Release: 0
Summary: Java-based dependency manager Summary: Java-based dependency manager
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Url: http://ant.apache.org/ivy/ URL: http://ant.apache.org/ivy/
Source0: %{name}-%{version}-src.tar.gz Source0: %{name}-%{version}-src.tar.gz
Source1: ivy.1 Source1: ivy.1
Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/%{version}/ivy-%{version}.pom
Patch0: apache-ivy-2.3.0-jdk9.patch Patch0: apache-ivy-2.4.0-jdk9.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: bouncycastle BuildRequires: bouncycastle
BuildRequires: commons-httpclient BuildRequires: commons-httpclient
BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -61,9 +60,6 @@ JavaDoc documentation for %{name}
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
# Fix messed-up encodings
dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt
#TODO: return back when bouncycastle-pgp will be available #TODO: return back when bouncycastle-pgp will be available
rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle 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 \ sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
src/java/org/apache/ivy/core/settings/typedef.properties 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 %build
# Craft class path # Craft class path
mkdir -p lib mkdir -p lib
@ -113,8 +112,8 @@ install -d %{buildroot}%{_mandir}/man1
install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1 install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1
%files %files
%defattr(-,root,root,-) %license LICENSE
%doc RELEASE_NOTES CHANGES.txt LICENSE NOTICE README %doc NOTICE README
%config %{_sysconfdir}/ant.d/%{name} %config %{_sysconfdir}/ant.d/%{name}
%{_javadir}/ivy.jar %{_javadir}/ivy.jar
%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_bindir}/*
@ -123,7 +122,6 @@ install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1
%{_datadir}/maven-metadata/%{name}.xml %{_datadir}/maven-metadata/%{name}.xml
%files javadoc %files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/* %{_javadocdir}/*
%changelog %changelog

350
ivy-2.3.0.pom → ivy-2.4.0.pom
View File

@ -1,157 +1,193 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file or more contributor license agreements. See the NOTICE file
distributed with this work for additional information distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the KIND, either express or implied. See the License for the
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache</groupId> <groupId>org.apache</groupId>
<artifactId>apache</artifactId> <artifactId>apache</artifactId>
<version>7</version> <version>7</version>
</parent> </parent>
<groupId>org.apache.ivy</groupId> <groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId> <artifactId>ivy</artifactId>
<version>2.3.0</version> <version>2.4.0</version>
<name>Apache Ivy</name> <name>Apache Ivy</name>
<url>http://ant.apache.org/ivy/</url> <url>http://ant.apache.org/ivy/</url>
<scm> <scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/ant/ivy/core/trunk/</connection> <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> <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> <url>http://svn.apache.org/repos/asf/ant/ivy/core/trunk</url>
</scm> </scm>
<mailingLists> <mailingLists>
<mailingList> <mailingList>
<name>Ant/Ivy Developers List</name> <name>Ant/Ivy Developers List</name>
<subscribe>dev-subscribe@ant.apache.org</subscribe> <subscribe>dev-subscribe@ant.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe> <unsubscribe>dev-unsubscribe@ant.apache.org</unsubscribe>
<post>dev@ant.apache.org</post> <post>dev@ant.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive> <archive>http://mail-archives.apache.org/mod_mbox/ant-dev</archive>
</mailingList> </mailingList>
<mailingList> <mailingList>
<name>Ivy Users List</name> <name>Ivy Users List</name>
<subscribe>ivy-user-subscribe@ant.apache.org</subscribe> <subscribe>ivy-user-subscribe@ant.apache.org</subscribe>
<unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe> <unsubscribe>ivy-user-unsubscribe@ant.apache.org</unsubscribe>
<post>ivy-user@ant.apache.org</post> <post>ivy-user@ant.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive> <archive>http://mail-archives.apache.org/mod_mbox/ant-ivy-user</archive>
</mailingList> </mailingList>
</mailingLists> </mailingLists>
<issueManagement> <issueManagement>
<system>jira</system> <system>jira</system>
<url>http://issues.apache.org/jira/browse/IVY</url> <url>http://issues.apache.org/jira/browse/IVY</url>
</issueManagement> </issueManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.7.1</version> <version>1.7.1</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId> <artifactId>ant-nodeps</artifactId>
<version>1.7.1</version> <version>1.7.1</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant-trax</artifactId> <artifactId>ant-trax</artifactId>
<version>1.7.1</version> <version>1.7.1</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
<version>3.0</version> <version>3.0</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>oro</groupId> <groupId>oro</groupId>
<artifactId>oro</artifactId> <artifactId>oro</artifactId>
<version>2.0.8</version> <version>2.0.8</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-vfs</groupId> <groupId>commons-vfs</groupId>
<artifactId>commons-vfs</artifactId> <artifactId>commons-vfs</artifactId>
<version>1.0</version> <version>1.0</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>
<version>0.1.31</version> <version>0.1.50</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>com.jcraft</groupId>
<artifactId>bcpg-jdk14</artifactId> <artifactId>jsch.agentproxy</artifactId>
<version>1.45</version> <version>0.0.6</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>com.jcraft</groupId>
<artifactId>bcprov-jdk14</artifactId> <artifactId>jsch.agentproxy.connector-factory</artifactId>
<version>1.45</version> <version>0.0.6</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>com.jcraft</groupId>
<artifactId>junit</artifactId> <artifactId>jsch.agentproxy.jsch</artifactId>
<version>3.8.2</version> <version>0.0.6</version>
<scope>test</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>commons-lang</artifactId> <artifactId>bcpg-jdk14</artifactId>
<version>2.6</version> <version>1.45</version>
<scope>test</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>ant-testutil</artifactId> <artifactId>bcprov-jdk14</artifactId>
<version>1.7.0</version> <version>1.45</version>
<scope>test</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ant</groupId> <groupId>junit</groupId>
<artifactId>ant-launcher</artifactId> <artifactId>junit</artifactId>
<version>1.6.2</version> <version>3.8.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ant-contrib</groupId> <groupId>commons-lang</groupId>
<artifactId>ant-contrib</artifactId> <artifactId>commons-lang</artifactId>
<version>1.0b3</version> <version>2.6</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>org.apache.ant</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>ant-testutil</artifactId>
<version>2.6.2</version> <version>1.7.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> <exclusions>
<dependency> <exclusion>
<groupId>xerces</groupId> <groupId>*</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>*</artifactId>
<version>2.6.2</version> </exclusion>
<scope>test</scope> </exclusions>
</dependency> </dependency>
</dependencies> <dependency>
</project> <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>