Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cal10n for openSUSE:Factory checked in at 2024-05-05 12:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cal10n (Old) and /work/SRC/openSUSE:Factory/.cal10n.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cal10n" Sun May 5 12:10:14 2024 rev:14 rq:1171385 version:0.8.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/cal10n/cal10n.changes 2022-05-14 22:51:53.550970677 +0200 +++ /work/SRC/openSUSE:Factory/.cal10n.new.1880/cal10n.changes 2024-05-05 12:10:14.598699112 +0200 @@ -1,0 +2,15 @@ +Thu May 2 14:22:43 UTC 2024 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- cal10n-0.8.1.10.tar.xz New: ---- Fix-SupportedSourceVersion-warning.patch _multibuild cal10n-0.8.1.12.tar.xz BETA DEBUG BEGIN: New:- Added patch: * Fix-SupportedSourceVersion-warning.patch + fix the following: [WARNING] Supported source version BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cal10n.spec ++++++ --- /var/tmp/diff_new_pack.HOJ0zC/_old 2024-05-05 12:10:16.446765994 +0200 +++ /var/tmp/diff_new_pack.HOJ0zC/_new 2024-05-05 12:10:16.462766574 +0200 @@ -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: java-devel >= 1.8 -BuildRequires: javapackages-local BuildRequires: xz -Requires: java BuildArch: noarch -%if %{with tests} -BuildRequires: ant-antunit -BuildRequires: ant-junit +%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 %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 @@ 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 @@ 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 <<EOF The documentation under Creative Commons Attribution-NonCommercial-ShareAlike @@ -77,46 +105,49 @@ EOF %build +%if %{with plugins} +%{mvn_file} :{*} %{name}/@1 + +%{mvn_package} :%{base_name}-parent __noinstall + +%{mvn_build} -f -- \ + -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ + -Dsource=8 -Dproject.build.sourceEncoding=ISO-8859-1 +%else mkdir -p lib -build-jar-repository -s lib \ -%if %{with tests} - ant-antunit \ -%endif - ant/ant -%{ant} \ -%if %{without tests} - -Dtest.skip=true \ +build-jar-repository -s lib ant/ant +%{ant} package javadoc %endif - package javadoc %install -# jars -install -d -m 0755 %{buildroot}%{_javadir}/%{name} -install -m 644 %{name}-api/target/%{name}-api-*.jar \ - %{buildroot}%{_javadir}/%{name}/%{name}-api.jar -install -m 644 %{name}-ant-task/target/%{name}-ant-task-*.jar \ - %{buildroot}%{_javadir}/%{name}/%{name}-ant-task.jar - -# pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom -install -pm 644 %{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 -%add_maven_depmap %{name}-ant-task.pom %{name}/%{name}-ant-task.jar - -# javadoc -install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +%if %{with plugins} +%mvn_install +%else +install -d -m 0755 %{buildroot}%{_javadir}/%{base_name} +install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{base_name} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} for i in api ant-task; do + # jar + install -m 644 %{base_name}-${i}/target/%{base_name}-${i}-*.jar \ + %{buildroot}%{_javadir}/%{base_name}/%{base_name}-${i}.jar + # pom + %{mvn_install_pom} %{base_name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/%{base_name}-${i}.pom + %add_maven_depmap %{base_name}/%{base_name}-${i}.pom %{base_name}/%{base_name}-${i}.jar + # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i} cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/ done + +%endif %fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles +%if %{with plugins} +%files javadoc -f .mfiles-javadoc +%else %doc README.SUSE %files javadoc %{_javadocdir}/%{name} +%endif ++++++ Fix-SupportedSourceVersion-warning.patch ++++++ >From a1c260aeeeeb6583deecf76ab9a7ef884c89b942 Mon Sep 17 00:00:00 2001 From: Sylvain Bugat <[email protected]> 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); ++++++ _multibuild ++++++ <multibuild> <package>plugins</package> </multibuild> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HOJ0zC/_old 2024-05-05 12:10:16.906782642 +0200 +++ /var/tmp/diff_new_pack.HOJ0zC/_new 2024-05-05 12:10:16.970784959 +0200 @@ -2,10 +2,13 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/qos-ch/cal10n.git</param> - <param name="revision">22c048801fb6d04c991a0c8c01bb6fb97ef50b37</param> + <param name="revision">db338cf47ad069d22cc9a0331ae433dfe2024e2a</param> <param name="match-tag">v_*</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> <param name="versionrewrite-pattern">v_(.*)</param> + <param name="exclude">**/*.jar</param> + <param name="exclude">docs</param> + <param name="exclude">cal10n-site</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ cal10n-0.8.1.10.tar.xz -> cal10n-0.8.1.12.tar.xz ++++++ ++++ 3916 lines of diff (skipped) ++++++ cal10n-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cal10n-ant-task/build.xml new/cal10n-ant-task/build.xml --- old/cal10n-ant-task/build.xml 2022-05-10 18:21:04.366395788 +0200 +++ new/cal10n-ant-task/build.xml 2024-05-02 16:28:56.611621835 +0200 @@ -16,10 +16,7 @@ <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> @@ -32,12 +29,6 @@ <include name="**/*.jar"/> </fileset> </path> - <path id="build.test.classpath"> - <pathelement location="../cal10n-api/target/classes"/> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> <!-- ====================================================================== --> <!-- Cleaning up target --> @@ -58,6 +49,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -74,103 +66,6 @@ </target> <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <compilerarg value="-proc:none"/> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> @@ -203,7 +98,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cal10n-api/build.xml new/cal10n-api/build.xml --- old/cal10n-api/build.xml 2022-05-10 18:14:50.155968240 +0200 +++ new/cal10n-api/build.xml 2024-05-02 16:28:20.491373671 +0200 @@ -16,10 +16,7 @@ <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> @@ -31,11 +28,6 @@ <include name="**/*.jar"/> </fileset> </path> - <path id="build.test.classpath"> - <fileset dir="../lib"> - <include name="**/*.jar"/> - </fileset> - </path> <!-- ====================================================================== --> <!-- Cleaning up target --> @@ -56,7 +48,8 @@ debug="true" optimize="false" deprecation="true" - target="1.8" + release="${compiler.release}" + target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> @@ -72,103 +65,6 @@ </target> <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="1.8" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - <compilerarg value="-proc:none"/> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/AllTest.java"/> - <exclude name="**/PackageTest.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> @@ -199,7 +95,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2022-05-10 18:00:52.262557495 +0200 +++ new/common.xml 2024-05-01 16:02:15.970879896 +0200 @@ -6,7 +6,8 @@ <property name="project.version" value="0.8.1"/> <property name="project.groupId" value="ch.qos.cal10n"/> - <property name="compiler.source" value="1.8"/> + <property name="compiler.release" value="8"/> + <property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> </project>
