From dc742424881f42c00efd9d1c24a7266aff55f0529cd03633a215bf3396fac522 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:18:51 +0000 Subject: [PATCH 1/2] Accepting request 1114359 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114359 OBS-URL: https://build.opensuse.org/package/show/Java:packages/cal10n?expand=0&rev=28 --- cal10n.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cal10n.spec b/cal10n.spec index 09d0785..1e5852b 100644 --- a/cal10n.spec +++ b/cal10n.spec @@ -29,7 +29,7 @@ Source1: %{name}-build.tar.xz BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: xz Requires: java BuildArch: noarch @@ -99,11 +99,11 @@ install -m 644 %{name}-ant-task/target/%{name}-ant-task-*.jar \ # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom -install -pm 644 %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom +%{mvn_install_pom} %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom %add_maven_depmap %{name}-api.pom %{name}/%{name}-api.jar -install -pm 644 %{name}-ant-task/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-ant-task.pom +%{mvn_install_pom} %{name}-ant-task/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-ant-task.pom %add_maven_depmap %{name}-ant-task.pom %{name}/%{name}-ant-task.jar # javadoc From ca58692a58a5c1c5b819bffd3e912424823becbd816931d5e05966995bc9c9a0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 2 May 2024 15:39:19 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/cal10n?expand=0&rev=29 --- Fix-SupportedSourceVersion-warning.patch | 47 +++++++++ _multibuild | 3 + _service | 5 +- cal10n-0.8.1.10.tar.xz | 3 - cal10n-0.8.1.12.tar.xz | 3 + cal10n-build.tar.xz | 4 +- cal10n.changes | 15 +++ cal10n.spec | 123 ++++++++++++++--------- 8 files changed, 151 insertions(+), 52 deletions(-) create mode 100644 Fix-SupportedSourceVersion-warning.patch create mode 100644 _multibuild delete mode 100644 cal10n-0.8.1.10.tar.xz create mode 100644 cal10n-0.8.1.12.tar.xz diff --git a/Fix-SupportedSourceVersion-warning.patch b/Fix-SupportedSourceVersion-warning.patch new file mode 100644 index 0000000..ec2bb35 --- /dev/null +++ b/Fix-SupportedSourceVersion-warning.patch @@ -0,0 +1,47 @@ +From a1c260aeeeeb6583deecf76ab9a7ef884c89b942 Mon Sep 17 00:00:00 2001 +From: Sylvain Bugat +Date: Thu, 27 Aug 2015 14:54:23 +0200 +Subject: [PATCH] Fix SupportedSourceVersion warning + +When using cal10n-api this compilation warning is displayed: [WARNING] Supported source version 'RELEASE_5' from annotation processor 'ch.qos.cal10n.verifier.processor.CAL10NAnnotationProcessor' less than -source '1.7' +--- + .../processor/CAL10NAnnotationProcessor.java | 21 ++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/processor/CAL10NAnnotationProcessor.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/processor/CAL10NAnnotationProcessor.java +index 136cfe1..023f450 100644 +--- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/processor/CAL10NAnnotationProcessor.java ++++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/processor/CAL10NAnnotationProcessor.java +@@ -13,12 +13,31 @@ + import java.util.Set; + + @SupportedAnnotationTypes("ch.qos.cal10n.BaseName") +-@SupportedSourceVersion(SourceVersion.RELEASE_5) + public class CAL10NAnnotationProcessor extends AbstractProcessor { + + TypeElement baseNameTypeElement; + Filer filer; + ++ @Override ++ public SourceVersion getSupportedSourceVersion() { ++ ++ //Replacement of @SupportedSourceVersion(SourceVersion.RELEASE_5) because it generate compilation warning like: ++ //[WARNING] Supported source version 'RELEASE_5' from annotation processor 'ch.qos.cal10n.verifier.processor.CAL10NAnnotationProcessor' less than -source '1.7' ++ try { ++ return SourceVersion.valueOf("RELEASE_8"); ++ } catch (IllegalArgumentException e) {} ++ ++ try { ++ return SourceVersion.valueOf("RELEASE_7"); ++ } catch (IllegalArgumentException e) {} ++ ++ try { ++ return SourceVersion.valueOf("RELEASE_6"); ++ } catch (IllegalArgumentException x) {} ++ ++ return SourceVersion.RELEASE_5; ++ } ++ + @Override + public void init(ProcessingEnvironment env) { + super.init(env); diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..71f282b --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + plugins + diff --git a/_service b/_service index 5e3d15d..f026bd7 100644 --- a/_service +++ b/_service @@ -2,10 +2,13 @@ git https://github.com/qos-ch/cal10n.git - 22c048801fb6d04c991a0c8c01bb6fb97ef50b37 + db338cf47ad069d22cc9a0331ae433dfe2024e2a v_* @PARENT_TAG@.@TAG_OFFSET@ v_(.*) + **/*.jar + docs + cal10n-site *.tar diff --git a/cal10n-0.8.1.10.tar.xz b/cal10n-0.8.1.10.tar.xz deleted file mode 100644 index 2afa421..0000000 --- a/cal10n-0.8.1.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f7f946e2934648e4d13e7ace5a40582b87aed9e7b2bda558a1560c059246deb -size 345060 diff --git a/cal10n-0.8.1.12.tar.xz b/cal10n-0.8.1.12.tar.xz new file mode 100644 index 0000000..b77c356 --- /dev/null +++ b/cal10n-0.8.1.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dacb3209d23b3aaf1bb8b820d0c22cfc2c49b0997c4c73aa428ef7bb4e0fe87 +size 26228 diff --git a/cal10n-build.tar.xz b/cal10n-build.tar.xz index f8a47a8..1669849 100644 --- a/cal10n-build.tar.xz +++ b/cal10n-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f28373731de625de39fdc9608f319a8e7e35dec8a2f92f1bb39a1b5ebcd3a77 -size 2360 +oid sha256:1cca5fbe29a48de3a9449a61a7322b8ca5e2baaae4eeace5da151fb8595cea22 +size 1832 diff --git a/cal10n.changes b/cal10n.changes index e9d545c..84f12b1 100644 --- a/cal10n.changes +++ b/cal10n.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu May 2 14:22:43 UTC 2024 - Fridrich Strba + +- Fetch the latest git revision: 12th commit after 0.8.1 calling + it 0.8.1.12 +- Add a multibuild flavour to build the maven plugins +- Added patch: + * Fix-SupportedSourceVersion-warning.patch + + fix the following: [WARNING] Supported source version + 'RELEASE_5' from annotation processor + 'ch.qos.cal10n.verifier.processor.CAL10NAnnotationProcessor' + less than -source '1.7' + + uncommitted change from the following pull request: + https://github.com/qos-ch/cal10n/pull/10 + ------------------------------------------------------------------- Wed May 11 13:18:07 UTC 2022 - Fridrich Strba diff --git a/cal10n.spec b/cal10n.spec index 1e5852b..767f21d 100644 --- a/cal10n.spec +++ b/cal10n.spec @@ -1,7 +1,7 @@ # # spec file for package cal10n # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,49 @@ # -%bcond_with tests -Name: cal10n -Version: 0.8.1.10 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "plugins" +%bcond_without plugins +%else +%bcond_with plugins +%endif +%global base_name cal10n +Version: 0.8.1.12 Release: 0 -Summary: Compiler assisted localization library (CAL10N) License: MIT Group: Development/Libraries/Java -URL: http://cal10n.qos.ch -Source0: %{name}-%{version}.tar.xz -Source1: %{name}-build.tar.xz -BuildRequires: ant +URL: https://cal10n.qos.ch +Source0: %{base_name}-%{version}.tar.xz +Source1: %{base_name}-build.tar.xz +# https://github.com/qos-ch/cal10n/pull/10 +Patch0: Fix-SupportedSourceVersion-warning.patch BuildRequires: fdupes +BuildRequires: xz +BuildArch: noarch +%if %{with plugins} +Name: %{base_name}-maven-plugins +Summary: Compiler assisted localization library (CAL10N) maven plugins +BuildRequires: maven-local +BuildRequires: mvn(ch.qos.cal10n:cal10n-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +%else +Name: %{base_name} +Summary: Compiler assisted localization library (CAL10N) +BuildRequires: ant BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 -BuildRequires: xz -Requires: java -BuildArch: noarch -%if %{with tests} -BuildRequires: ant-antunit -BuildRequires: ant-junit %endif %description +%if %{with plugins} +Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion") +is a java library for writing localized (internationalized) messages. + +This package contains maven plugins +%else Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion") is a java library for writing localized (internationalized) messages. Features: @@ -48,6 +68,7 @@ Features: in the most convenient charset, per locale. * good performance (300 nanoseconds per key look-up) * automatic reloading of resource bundles upon change +%endif %package javadoc Summary: Javadoc for %{name} @@ -57,15 +78,22 @@ Group: Development/Libraries/Java API documentation for %{name}. %prep -%setup -q -a1 -find . -name "*.jar" -exec rm -f {} \; +%setup -q -n %{base_name}-%{version} -a1 +%patch -P 0 -p1 # We don't want to depend on ant, since it will be # present when we try to use the task -%pom_change_dep :ant :::provided %{name}-ant-task +%pom_change_dep :ant :::provided %{base_name}-ant-task + +%pom_disable_module cal10n-site +%pom_disable_module cal10n-api +%pom_disable_module cal10n-ant-task + +%pom_change_dep -r :maven-artifact-manager :maven-core + +%pom_remove_plugin -r :maven-source-plugin # bnc#759912 -rm -rf docs cal10n-site cat > README.SUSE <