From 32adbbef8f3fd5de01f93bda9277641420b07ffa3d6c0d1997db2a8bec75c0fe Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 16 Feb 2021 19:48:03 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=21 --- apache-commons-lang3.changes | 5 +++++ apache-commons-lang3.spec | 2 +- build.xml | 18 +++++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes index da4dbc5..2b5904d 100644 --- a/apache-commons-lang3.changes +++ b/apache-commons-lang3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 16 19:47:33 UTC 2021 - Fridrich Strba + +- Add OSGi manifest + ------------------------------------------------------------------- Mon Mar 25 17:41:59 UTC 2019 - Fridrich Strba diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 96b1c00..4b08d0f 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -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 diff --git a/build.xml b/build.xml index 236d1d5..8254c0e 100644 --- a/build.xml +++ b/build.xml @@ -133,13 +133,25 @@ - - - + + + + + + + + + + + + + + + From 9fc2be69d89d22fb375871c9ed7abf13af7d43dc0af9edc70f7d4ec376e2c9bb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 24 Apr 2021 11:29:56 +0000 Subject: [PATCH 2/5] Accepting request 888105 from home:susnux:branches:Java:packages Replaced broken URL Update to 3.9 OBS-URL: https://build.opensuse.org/request/show/888105 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=22 --- apache-commons-lang3.changes | 16 ++++++++++++++++ apache-commons-lang3.spec | 14 +++++++------- commons-lang3-3.8.1-src.tar.gz | 3 --- commons-lang3-3.9-src.tar.gz | 3 +++ default.properties | 8 ++++---- 5 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 commons-lang3-3.8.1-src.tar.gz create mode 100644 commons-lang3-3.9-src.tar.gz diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes index 2b5904d..5a6d837 100644 --- a/apache-commons-lang3.changes +++ b/apache-commons-lang3.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 23 20:23:47 UTC 2021 - Ferdinand Thiessen + +- 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 diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 4b08d0f..ea58419 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -19,21 +19,21 @@ %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: ant-junit5 BuildRequires: fdupes -BuildRequires: java-devel >= 1.7 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: junit +BuildRequires: junit5 Provides: %{short_name} = %{version}-%{release} BuildArch: noarch @@ -70,7 +70,7 @@ sed -i 's/\r//' *.txt 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 diff --git a/commons-lang3-3.8.1-src.tar.gz b/commons-lang3-3.8.1-src.tar.gz deleted file mode 100644 index f7c3a83..0000000 --- a/commons-lang3-3.8.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9682e67375b6f03700e5bbaa2acceac60bc2f9049e11cafae3ce411ccaf633fb -size 965924 diff --git a/commons-lang3-3.9-src.tar.gz b/commons-lang3-3.9-src.tar.gz new file mode 100644 index 0000000..c747648 --- /dev/null +++ b/commons-lang3-3.9-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66415e0d1c843b04c61dea6b7e7e85a8f1469eaeb1174241622650aff7728e68 +size 987753 diff --git a/default.properties b/default.properties index 1814af2..3bca4ad 100644 --- a/default.properties +++ b/default.properties @@ -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 From 35ffb31764e8f0196b0a20cc952d24917610b682574418423c0f67e502777b5c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 24 Apr 2021 11:32:50 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=23 --- apache-commons-lang3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index ea58419..283332f 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -29,11 +29,9 @@ Source0: https://archive.apache.org/dist/commons/lang/source/%{short_name Source1: build.xml Source2: default.properties BuildRequires: ant -BuildRequires: ant-junit5 BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: junit5 Provides: %{short_name} = %{version}-%{release} BuildArch: noarch From 063b722392078dbf61f56b35dd0b9a5634c8ca36e215163d0754fb757ecfbbfc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 25 Apr 2021 07:12:42 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=24 --- apache-commons-lang3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 283332f..76d9c85 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -62,6 +62,7 @@ cp %{SOURCE2} . sed -i 's/\r//' *.txt %pom_remove_parent . +%pom_remove_plugin :maven-checkstyle-plugin . %pom_xpath_inject "pom:project" "org.apache.commons" . %build From 66ce15e688cbdc290b218f1364a35af5d06926ecd898e8911c23413598d205ba Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 25 Apr 2021 07:30:10 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=25 --- apache-commons-lang3.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec index 76d9c85..6127886 100644 --- a/apache-commons-lang3.spec +++ b/apache-commons-lang3.spec @@ -61,9 +61,13 @@ cp %{SOURCE1} . cp %{SOURCE2} . sed -i 's/\r//' *.txt -%pom_remove_parent . -%pom_remove_plugin :maven-checkstyle-plugin . -%pom_xpath_inject "pom:project" "org.apache.commons" . +# Not needed since we don't build with maven +%pom_remove_parent +%pom_xpath_inject "pom:project" "org.apache.commons" +%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`