Sync from SUSE:SLFO:Main apache-commons-collections4 revision 4e51b25dadbf2731a732c178eef40400

This commit is contained in:
Adrian Schröter 2024-05-03 10:58:39 +02:00
commit 7b1b54954a
5 changed files with 280 additions and 0 deletions

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

View File

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="commons-collections4" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="build.properties"/>
<property name="project.groupId" value="org.apache.commons"/>
<property name="project.artifactId" value="commons-collections4"/>
<property name="project.version" value="4.4"/>
<property name="bundle.version" value="${project.version}.0"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="."/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath"/>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
encoding="iso-8859-1"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<mkdir dir="${build.outputDir}/META-INF"/>
<copy todir="${build.outputDir}/META-INF">
<fileset dir="${build.resourceDir}">
<include name="NOTICE.txt"/>
<include name="LICENSE.txt"/>
<include name="NOTICE"/>
<include name="LICENSE"/>
</fileset>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
verbose="false"
encoding="iso-8859-1"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
source="${compiler.source}"
linksource="true"
breakiterator="false">
</javadoc>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Automatic-Module-Name" value="org.apache.commons.collections4"/>
<attribute name="Bundle-Description" value="The Apache Commons Collections package contains types that extend and augment the Java Collections Framework."/>
<attribute name="Bundle-DocURL" value="https://commons.apache.org/proper/commons-collections/"/>
<attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="Apache Commons Collections"/>
<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
<attribute name="Bundle-Version" value="${bundle.version}"/>
<attribute name="Export-Package" value="org.apache.commons.collections4.bag;version=&quot;${project.version}&quot;,org.apache.commons.collections4.bidimap;version=&quot;${project.version}&quot;,org.apache.commons.collections4.collection;version=&quot;${project.version}&quot;,org.apache.commons.collections4.comparators;version=&quot;${project.version}&quot;,org.apache.commons.collections4.functors;version=&quot;${project.version}&quot;,org.apache.commons.collections4.iterators;version=&quot;${project.version}&quot;,org.apache.commons.collections4.keyvalue;version=&quot;${project.version}&quot;,org.apache.commons.collections4.list;version=&quot;${project.version}&quot;,org.apache.commons.collections4.map;version=&quot;${project.version}&quot;,org.apache.commons.collections4.multimap;version=&quot;${project.version}&quot;,org.apache.commons.collections4.multiset;version=&quot;${project.version}&quot;,org.apache.commons.collections4.properties;version=&quot;${project.version}&quot;,org.apache.commons.collections4.queue;version=&quot;${project.version}&quot;,org.apache.commons.collections4.sequence;version=&quot;${project.version}&quot;,org.apache.commons.collections4.set;version=&quot;${project.version}&quot;,org.apache.commons.collections4.splitmap;version=&quot;${project.version}&quot;,org.apache.commons.collections4.trie.analyzer;version=&quot;${project.version}&quot;,org.apache.commons.collections4.trie;version=&quot;${project.version}&quot;,org.apache.commons.collections4;version=&quot;${project.version}&quot;"/>
<attribute name="Implementation-Title" value="Apache Commons Collections"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="Import-Package" value="org.w3c.dom"/>
<attribute name="Include-Resource" value="META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt=NOTICE.txt"/>
<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
<attribute name="Specification-Title" value="Apache Commons Collections"/>
<attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
<attribute name="Specification-Version" value="${project.version}"/>
</manifest>
</jar>
</target>
<!-- ====================================================================== -->
<!-- A dummy target for the package named after the type it creates -->
<!-- ====================================================================== -->
<target name="jar" depends="package" description="Builds the jar for the application"/>
</project>

View File

@ -0,0 +1,34 @@
-------------------------------------------------------------------
Wed Oct 25 14:24:18 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Update to upstream version 4.4
* Changes
+ Updates the platform requirement from Java 6 to 8
+ Add Automatic-Module-Name MANIFEST entry for Java 9
compatibility
+ Added a few new APIs.
* Builds with java 21 out of the box
* Generated ant build system with maven-ant-plugin in order to
build with ant like before.
- Removed patches:
* commons-collections4-4.1-bundle.patch
* commons-collections4-4.1-javadoc.patch
* commons-collections4-4.1-jdk11.patch
+ All changes factored into the generated build.xml
-------------------------------------------------------------------
Fri Mar 18 18:14:43 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source/target levels 8
-------------------------------------------------------------------
Mon Mar 4 10:41:43 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of apache-commons-collections4 4.1
- Added patches:
* commons-collections4-4.1-bundle.patch
+ Add to the manifest OSGi bundle information
* commons-collections4-4.1-javadoc.patch
+ Do not try to download web-based resources during the build.
* commons-collections4-4.1-jdk11.patch
+ Resolve type ambiguity in a toArray(null) call

View File

@ -0,0 +1,78 @@
#
# spec file
#
# 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/
#
%define base_name collections4
%define short_name commons-%{base_name}
%bcond_with tests
Name: apache-%{short_name}
Version: 4.4
Release: 0
Summary: Extension of the Java Collections Framework
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://commons.apache.org/proper/commons-collections/
Source0: http://archive.apache.org/dist/commons/collections/source/commons-collections4-%{version}-src.tar.gz
Source1: %{name}-build.xml
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildArch: noarch
%description
Commons-Collections seek to build upon the JDK classes by providing
new interfaces, implementations and utilities.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
This package provides %{summary}.
%prep
%setup -q -n commons-collections4-%{version}-src
cp %{SOURCE1} build.xml
%build
%{ant} jar javadoc
%install
# jar
install -dm 0755 %{buildroot}%{_javadir}
install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%doc RELEASE-NOTES.txt
%license LICENSE.txt NOTICE.txt
%{_javadir}/%{short_name}.jar
%files javadoc
%license LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog

BIN
commons-collections4-4.4-src.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.