Dominique Leuenberger 2021-04-28 23:36:34 +00:00 committed by Git OBS Bridge
commit 609796bb8a
6 changed files with 56 additions and 20 deletions

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Fri Apr 23 20:23:47 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Fixed SPEC file: Replaced broken URL
- Update to 3.9
* Requires jdk >= 1.8
* Fixed issues with java 12
* Add more SystemUtils.IS_JAVA_XX variants
* Adding the Functions class
* Add @FunctionalInterface to ThreadPredicate and ThreadGroupPredicate
* Add isEmpty method to ObjectUtils
* null-safe StringUtils.valueOf(char[]) to delegate to
String.valueOf(char[]).
* Add API org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost(JavaVersion)
* Consolidate the StringUtils equals and equalsIgnoreCase
-------------------------------------------------------------------
Tue Feb 16 19:47:33 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Add OSGi manifest
-------------------------------------------------------------------
Mon Mar 25 17:41:59 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package apache-commons-lang3
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,21 +19,19 @@
%define base_name lang3
%define short_name commons-%{base_name}
Name: apache-%{short_name}
Version: 3.8.1
Version: 3.9
Release: 0
Summary: Apache Commons Lang Package
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/lang/source/%{short_name}-%{version}-src.tar.gz
URL: https://commons.apache.org/proper/commons-lang/
Source0: https://archive.apache.org/dist/commons/lang/source/%{short_name}-%{version}-src.tar.gz
Source1: build.xml
Source2: default.properties
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: fdupes
BuildRequires: java-devel >= 1.7
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: junit
Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch
@ -63,14 +61,19 @@ cp %{SOURCE1} .
cp %{SOURCE2} .
sed -i 's/\r//' *.txt
%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>" .
# Not needed since we don't build with maven
%pom_remove_parent
%pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>"
%pom_xpath_remove pom:project/pom:reporting
%pom_xpath_remove pom:project/pom:build
%pom_xpath_remove pom:project/pom:profiles
%pom_remove_dep :::test
%build
export OPT_JAR_LIST=`cat %{_sysconfdir}/ant.d/junit`
export CLASSPATH=
ant \
-Dcompile.source=1.7 -Dcompile.target=1.7 \
-Dcompile.source=1.8 -Dcompile.target=1.8 \
-Dfinal.name=%{short_name} \
jar javadoc

View File

@ -133,13 +133,25 @@
<copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
<jar jarfile="${build.home}/${final.name}.jar">
<manifest>
<attribute name="Specification-Title" value="Commons Lang"/>
<attribute name="Specification-Version" value="${component.version}"/>
<attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
<attribute name="Automatic-Module-Name" value="org.apache.commons.lang3"/>
<attribute name="Bundle-Description" value="Apache Commons Lang, a package of Java utility classes for the classes that are in java.lang's hierarchy, or are considered to be so standard as to justify existence in java.lang."/>
<attribute name="Bundle-DocURL" value="http://commons.apache.org/proper/commons-lang/"/>
<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 Lang"/>
<attribute name="Bundle-SymbolicName" value="org.apache.commons.lang3"/>
<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
<attribute name="Bundle-Version" value="${component.version}"/>
<attribute name="Export-Package" value="org.apache.commons.lang3;version=&quot;${component.version}&quot;,org.apache.commons.lang3.arch;version=&quot;${component.version}&quot;,org.apache.commons.lang3.builder;version=&quot;${component.version}&quot;,org.apache.commons.lang3.concurrent;version=&quot;${component.version}&quot;,org.apache.commons.lang3.event;version=&quot;${component.version}&quot;,org.apache.commons.lang3.exception;version=&quot;${component.version}&quot;,org.apache.commons.lang3.math;version=&quot;${component.version}&quot;,org.apache.commons.lang3.mutable;version=&quot;${component.version}&quot;,org.apache.commons.lang3.reflect;version=&quot;${component.version}&quot;,org.apache.commons.lang3.text;version=&quot;${component.version}&quot;,org.apache.commons.lang3.text.translate;version=&quot;${component.version}&quot;,org.apache.commons.lang3.time;version=&quot;${component.version}&quot;,org.apache.commons.lang3.tuple;version=&quot;${component.version}&quot;"/>
<attribute name="Implementation-Title" value="Commons Lang"/>
<attribute name="Implementation-Version" value="${component.version}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
<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=${compile.target}))&quot;"/>
<attribute name="Specification-Title" value="Commons Lang"/>
<attribute name="Specification-Version" value="${component.version}"/>
<attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
<attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
<attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
</manifest>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9682e67375b6f03700e5bbaa2acceac60bc2f9049e11cafae3ce411ccaf633fb
size 965924

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66415e0d1c843b04c61dea6b7e7e85a8f1469eaeb1174241622650aff7728e68
size 987753

View File

@ -18,7 +18,7 @@
# $Id: default.properties 1671054 2015-04-03 12:28:16Z britter $
# The location of the "junit.jar" JAR file
junit.jar = ${junit.home}/junit-4.12.jar
junit.jar = ${junit.home}/junit-5.5.2.jar
# The location of the Easymock jar
easymock.jar = ${easymock.home}/easymock-3.3.1.jar
@ -42,7 +42,7 @@ component.package = org.apache.commons.lang3
component.title = Core Language Utilities
# The current version number of this component
component.version = 3.8.1
component.version = 3.9
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
@ -73,12 +73,12 @@ compile.optimize = true
# In particular, if you use JDK 1.4+ the generated classes will not be usable
# for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1
# (which is the default value for JDK 1.1 to 1.3).
compile.target = 1.7
compile.target = 1.8
# Specifies the source version for the Java compiler.
# Corresponds to the source attribute for the ant javac task.
# Valid values are 1.3, 1.4, 1.5.
compile.source = 1.7
compile.source = 1.8
# Specifies the source encoding.
compile.encoding = ISO-8859-1