From 422687a1093836e507e4ad8f8ed86b7404958c10578fca2d6f26955f345dd8ce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 12 Mar 2022 14:38:13 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aho-corasick-double-array-trie?expand=0&rev=3 --- aho-corasick-double-array-trie.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aho-corasick-double-array-trie.spec b/aho-corasick-double-array-trie.spec index 0a5c7a6..a6e1f76 100644 --- a/aho-corasick-double-array-trie.spec +++ b/aho-corasick-double-array-trie.spec @@ -1,7 +1,7 @@ # # spec file for package aho-corasick-double-array-trie # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,7 +44,7 @@ cp %{SOURCE1} . %pom_remove_plugin :maven-source-plugin %build -%{mvn_build} -f -- -Dsource=6 +%{mvn_build} -f -- -Dsource=6 -Dencoding=utf-8 %install %mvn_install From 57c803963c5c7cdc8d967b7c9d1bccdb9ceb76c2714ad1a307f8712cb7ab35a7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 12 Mar 2022 15:20:09 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aho-corasick-double-array-trie?expand=0&rev=4 --- aho-corasick-double-array-trie.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aho-corasick-double-array-trie.spec b/aho-corasick-double-array-trie.spec index a6e1f76..1570cf4 100644 --- a/aho-corasick-double-array-trie.spec +++ b/aho-corasick-double-array-trie.spec @@ -42,9 +42,12 @@ This package contains javadoc for %{name}. cp %{SOURCE1} . %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-javadoc-plugin %build -%{mvn_build} -f -- -Dsource=6 -Dencoding=utf-8 +# Somehow, this needs to be in an UTF-8 environment +export LANG=en_US.utf8 +%{mvn_build} -f -- -Dsource=6 %install %mvn_install From e71de2efac3f7eb2c96cc739cf0b21020bc18e377098f6aa722a5176f6fc3c97 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Mar 2022 06:25:57 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aho-corasick-double-array-trie?expand=0&rev=5 --- aho-corasick-double-array-trie.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/aho-corasick-double-array-trie.spec b/aho-corasick-double-array-trie.spec index 1570cf4..4a62bc3 100644 --- a/aho-corasick-double-array-trie.spec +++ b/aho-corasick-double-array-trie.spec @@ -42,11 +42,8 @@ This package contains javadoc for %{name}. cp %{SOURCE1} . %pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :maven-javadoc-plugin %build -# Somehow, this needs to be in an UTF-8 environment -export LANG=en_US.utf8 %{mvn_build} -f -- -Dsource=6 %install From 65c2faff9bb5a5b91ad1ff5788850cc9266dc3878a662b54fac0cd3910442a22 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Mar 2022 06:26:22 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aho-corasick-double-array-trie?expand=0&rev=6 --- aho-corasick-double-array-trie.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aho-corasick-double-array-trie.spec b/aho-corasick-double-array-trie.spec index 4a62bc3..0a5c7a6 100644 --- a/aho-corasick-double-array-trie.spec +++ b/aho-corasick-double-array-trie.spec @@ -1,7 +1,7 @@ # # spec file for package aho-corasick-double-array-trie # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 6bd5728206fbb6c8d6c6197decbf8ef4290c19990729a799a2fa05a1348ae788 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 21 Mar 2022 14:35:10 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/aho-corasick-double-array-trie?expand=0&rev=7 --- aho-corasick-double-array-trie.changes | 5 +++++ aho-corasick-double-array-trie.spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/aho-corasick-double-array-trie.changes b/aho-corasick-double-array-trie.changes index 07418dc..ad90bca 100644 --- a/aho-corasick-double-array-trie.changes +++ b/aho-corasick-double-array-trie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 21 14:34:17 UTC 2022 - Fridrich Strba + +- Build with maven.compiler.release=8 on any JDK >= 9 + ------------------------------------------------------------------- Thu Feb 27 08:46:00 UTC 2020 - Fridrich Strba diff --git a/aho-corasick-double-array-trie.spec b/aho-corasick-double-array-trie.spec index 0a5c7a6..14b9e8c 100644 --- a/aho-corasick-double-array-trie.spec +++ b/aho-corasick-double-array-trie.spec @@ -1,7 +1,7 @@ # # spec file for package aho-corasick-double-array-trie # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ URL: https://github.com/hankcs/AhoCorasickDoubleArrayTrie Source0: https://github.com/hankcs/AhoCorasickDoubleArrayTrie/archive/v%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: maven-local BuildArch: noarch @@ -44,7 +45,11 @@ cp %{SOURCE1} . %pom_remove_plugin :maven-source-plugin %build -%{mvn_build} -f -- -Dsource=6 +%{mvn_build} -f -- \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=8 \ +%endif + -Dsource=8 %install %mvn_install