SLFO-pool/ant-contrib
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main ant-contrib revision 20175ad5ae470cc93609e15de3dce4ff

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-03 10:56:34 +02:00
commit b8ccb3f3c9
10 changed files with 603 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

202
LICENSE-2.0.txt Normal file
View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed 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.

11
ant-contrib-1.0b3-enable-for-task.patch Normal file
View File

@ -0,0 +1,11 @@
diff -ur ant-contrib-1.0b3.orig/src/java/net/sf/antcontrib/antcontrib.properties ant-contrib-1.0b3/src/java/net/sf/antcontrib/antcontrib.properties
--- ant-contrib-1.0b3.orig/src/java/net/sf/antcontrib/antcontrib.properties 2006-10-28 06:57:56.000000000 -0500
+++ ant-contrib-1.0b3/src/java/net/sf/antcontrib/antcontrib.properties 2015-03-12 17:33:48.000000000 -0500
@@ -14,6 +14,7 @@
# Logic tasks
if=net.sf.antcontrib.logic.IfTask
+for=net.sf.antcontrib.logic.ForTask
foreach=net.sf.antcontrib.logic.ForEach
throw=net.sf.antcontrib.logic.Throw
trycatch=net.sf.antcontrib.logic.TryCatchTask

BIN
ant-contrib-1.0b3-src.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

25
ant-contrib-1.0b3.pom Normal file
View File

@ -0,0 +1,25 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<packaging>jar</packaging>
<name>Ant-Contrib Tasks</name>
<version>1.0b3</version>
<url>http://ant-contrib.sourceforge.net</url>
<licenses>
<license>
<url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
</license>
</licenses>
<scm>
<url>https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib</url>
</scm>
<description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.5</version>
</dependency>
</dependencies>
</project>

27
ant-contrib-antservertest.patch Normal file
View File

@ -0,0 +1,27 @@
--- test/resources/antserver/antservertest.xml.orig 2005-02-03 19:04:11.000000000 -0500
+++ test/resources/antserver/antservertest.xml 2006-06-01 11:57:05.000000000 -0400
@@ -3,8 +3,8 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
- <property name="server.host" value="localhost" />
- <property name="server.port" value="17000" />
+ <property name="server.host" value="127.0.0.1" />
+ <property name="server.port" value="23456" />
<target name="default">
</target>
@@ -124,11 +124,11 @@
<try>
<antcall target="${test.target}" />
</try>
- <finally>
+ <catch>
<remoteant machine="${server.host}" port="${server.port}">
<shutdown />
</remoteant>
- </finally>
+ </catch>
</trycatch>
</sequential>
</parallel>

10
ant-contrib-sourcetarget.patch Normal file
View File

@ -0,0 +1,10 @@
--- ant-contrib/build.properties 2006-11-02 17:46:26.000000000 +0100
+++ ant-contrib/build.properties 2017-09-06 20:13:43.067914247 +0200
@@ -3,5 +3,5 @@
jar.name=${project.name}.jar
jar.name.versioned=${project.name}-${project.version}.jar
ivy.deliver.revision=${project.version}
-jdk.source=1.4
-jdk.target=1.4
+jdk.source=8
+jdk.target=8

132
ant-contrib.changes Normal file
View File

@ -0,0 +1,132 @@
-------------------------------------------------------------------
Tue Oct 17 11:05:25 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Clean the spec file a bit
- Removed patch:
* ant-contrib-pom.patch
+ not needed any more with the javapackages-tools >= 6
-------------------------------------------------------------------
Tue Nov 8 08:48:39 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* local-ivy.patch
+ fix build with apache-ivy 2.5.1
-------------------------------------------------------------------
Tue May 15 05:45:46 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
- Run fdupes on the documentation
-------------------------------------------------------------------
Wed Sep 6 18:17:00 UTC 2017 - fstrba@suse.com
- Added patch:
* ant-contrib-sourcetarget.patch
- build with java source and target 1.6
- fixes the build with java 9
-------------------------------------------------------------------
Fri May 19 09:08:21 UTC 2017 - tchvatal@suse.com
- Fix build with new javapackages-tools
-------------------------------------------------------------------
Wed Mar 18 09:42:22 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
-------------------------------------------------------------------
Thu Mar 12 22:39:50 UTC 2015 - archie@dellroad.org
- Add back patch enabling the <antcontrib:for> task (boo#922324)
* ant-contrib-1.0b3-enable-for-task.patch
-------------------------------------------------------------------
Mon Jul 7 09:25:13 UTC 2014 - tchvatal@suse.com
- Clean up a bit with spec-cleaner
-------------------------------------------------------------------
Fri Nov 15 08:25:16 UTC 2013 - mvyskocil@suse.com
- don't require ant-junit for build, junit is sufficient
* reducing of cycles
-------------------------------------------------------------------
Wed Nov 6 14:17:45 UTC 2013 - mvyskocil@suse.com
- upgrade to 1.0b3
* no upstream changelog available
- removed patches:
* ant-contrib-1.0b2-enable-for-task.patch
there is no for task in beta3
* ant-contrib-ant-1.7.0.patch
no longer needed
* ant-contrib-build_xml.patch
fixed upstream
* ant-contrib-BuildFileTest_java.patch
no longer needed
- added patches:
* ant-contrib-antservertest.patch
* ant-contrib-pom.patch
* local-ivy.patch
- add pom file
- add ant.d configuration
-------------------------------------------------------------------
Mon Sep 9 11:04:08 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Thu Aug 22 12:02:04 UTC 2013 - mvyskocil@suse.com
- disable javadoc build
-------------------------------------------------------------------
Sat Sep 17 11:08:43 UTC 2011 - jengelh@medozas.de
- Remove redundant tags/sections from specfile
-------------------------------------------------------------------
Fri Oct 8 09:40:42 UTC 2010 - mvyskocil@suse.cz
- fix bnc#644661 - ant-contrib does not export the antcontrib:for task
-------------------------------------------------------------------
Thu Apr 30 15:49:13 CEST 2009 - mrueckert@suse.de
- rename ant_version to ant_minimal_version
- use requires_eq for the ant package
-------------------------------------------------------------------
Thu Apr 30 14:25:51 CEST 2009 - ro@suse.de
- bump ant-version to 1.7.1
-------------------------------------------------------------------
Thu Sep 11 15:52:09 CEST 2008 - mvyskocil@suse.cz
- Use a gcc-java to build
-------------------------------------------------------------------
Fri Aug 8 13:18:59 CEST 2008 - mvyskocil@suse.cz
- Make junit testing optional and disable it by default to break a build cycle
ant-antlr - bsf - jython - mysql-connector-java - ant-contrib ant-contrib
-------------------------------------------------------------------
Thu Jul 10 08:50:56 CEST 2008 - mvyskocil@suse.cz
- Removed summary tags from description of subpackages.
- Remove the ant-1.7.0 archive to reduce a size of source package and
use only one necessary file BuildFileTest.java
-------------------------------------------------------------------
Wed Jul 2 17:03:45 CEST 2008 - mvyskocil@suse.cz
- First release based on jpackage.org 1.7 (1.0.b2)
- adjusted for ant 1.7.0

118
ant-contrib.spec Normal file
View File

@ -0,0 +1,118 @@
#
# spec file for package ant-contrib
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: ant-contrib
Version: 1.0b3
Release: 0
Summary: Collection of tasks for Ant
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://ant-contrib.sourceforge.net/
Source0: https://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
Source1: https://repo1.maven.org/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
# ASL 2.0 Licence text
# Upstream bug at https://sourceforge.net/tracker/?func=detail&aid=3590371&group_id=36177&atid=416920
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: local-ivy.patch
Patch1: ant-contrib-antservertest.patch
Patch2: ant-contrib-1.0b3-enable-for-task.patch
Patch3: ant-contrib-sourcetarget.patch
BuildRequires: ant
BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1
BuildRequires: commons-httpclient
BuildRequires: commons-logging
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildRequires: junit
BuildRequires: xerces-j2
Requires: junit >= 3.8.1
Requires: xerces-j2
%requires_eq ant
BuildArch: noarch
%description
The Ant-Contrib project is a collection of tasks (and at one point
maybe types and other tools) for Apache Ant.
%package manual
Summary: Manual for %{name}
Group: Documentation/Other
%description manual
Documentation for %{name} tasks.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
Requires: jpackage-utils
%description javadoc
Api documentation for %{name}.
%prep
%setup -q -n %{name}
cp %{SOURCE1} %{name}-%{version}.pom
cp %{SOURCE2} LICENSE-2.0.txt
%patch0
%patch1
%patch2 -p1
%patch3 -p1
%pom_change_dep ant: org.apache.ant %{name}-%{version}.pom
find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
sed -i "s|xercesImpl|xerces-j2|g" ivy.xml ||:
# needs porting to latest ivy
rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
%build
%{ant} dist
%install
# jars
install -Dpm 644 target/%{name}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
echo "ant/ant-contrib" > %{buildroot}%{_sysconfdir}/ant.d/ant-contrib
install -d -m 755 %{buildroot}%{_mavenpomdir}
%{mvn_install_pom} %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom
%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
%files -f .mfiles
%defattr(0644,root,root,0755)
%license target/docs/LICENSE.txt LICENSE-2.0.txt
%config %{_sysconfdir}/ant.d/%{name}
%files manual
%doc target/docs/manual/tasks/*
%files javadoc
%license target/docs/LICENSE.txt
%doc LICENSE-2.0.txt
%doc %{_javadocdir}/%{name}
%changelog

52
local-ivy.patch Normal file
View File

@ -0,0 +1,52 @@
--- build.xml.sav 2006-11-02 18:44:02.000000000 +0200
+++ build.xml 2011-12-15 13:36:38.630460824 +0200
@@ -2,7 +2,7 @@
name="ant-contrib"
default="dist"
basedir="."
- xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant">
<property file="build.properties" />
@@ -20,22 +20,7 @@
<property name="dist.dir" location="dist" />
<property name="target.stage.dir" location="${target.dir}/stage" />
- <target name="init">
- <path id="ivy.lib.path">
- <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
- </path>
-
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant"
- classpathref="ivy.lib.path"/>
- </target>
-
- <target name="configure" depends="init">
+ <target name="configure" >
<ivy:configure file="ivy-conf.xml" />
</target>
--- ivy-conf.xml.sav 2006-10-28 14:57:58.000000000 +0300
+++ ivy-conf.xml 2011-12-15 14:35:15.155840710 +0200
@@ -5,11 +5,11 @@
<resolvers>
<filesystem name="local">
- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
+ <ivy pattern="${ivy.conf.dir}/lib/[module]/apache-ivy-[revision].xml" />
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
</filesystem>
- <ivyrep name="ivyrep" />
+ <ivyrep name="ivyrep" ivyroot="."/>
<chain name="default-resolver">
<resolver ref="local" />