Hello community, here is the log from the commit of package tesla-polyglot for openSUSE:Factory checked in at 2019-11-19 13:44:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tesla-polyglot (Old) and /work/SRC/openSUSE:Factory/.tesla-polyglot.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tesla-polyglot" Tue Nov 19 13:44:19 2019 rev:2 rq:749214 version:0.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tesla-polyglot/tesla-polyglot.changes 2019-11-09 23:27:32.452140276 +0100 +++ /work/SRC/openSUSE:Factory/.tesla-polyglot.new.26869/tesla-polyglot.changes 2019-11-19 13:44:42.492404557 +0100 @@ -1,0 +2,13 @@ +Mon Nov 18 09:17:41 UTC 2019 - Fridrich Strba <[email protected]> + +- Enable the tesla-polyglot main flavour, since the dependencies + are now present + +------------------------------------------------------------------- +Sun Nov 10 19:27:07 UTC 2019 - Fridrich Strba <[email protected]> + +- Added patch: + * polyglot-snakeyaml-1.25.patch + + Fix build against snakeyaml-1.25 + +------------------------------------------------------------------- New: ---- polyglot-snakeyaml-1.25.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tesla-polyglot.spec ++++++ --- /var/tmp/diff_new_pack.YrGdNP/_old 2019-11-19 13:44:43.248404183 +0100 +++ /var/tmp/diff_new_pack.YrGdNP/_new 2019-11-19 13:44:43.248404183 +0100 @@ -1,7 +1,7 @@ # -# spec file for package tesla +# spec file for package tesla-polyglot # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,14 +22,12 @@ %else %bcond_with bootstrap %endif -%if %{without bootstrap} -ExclusiveArch: do_not_build -%endif %global base_name tesla-polyglot Version: 0.2.1 Release: 0 URL: https://github.com/takari/maven-polyglot Source0: https://github.com/takari/polyglot-maven/archive/polyglot-%{version}.tar.gz +Patch0: polyglot-snakeyaml-1.25.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(org.apache.maven:maven-core) @@ -120,6 +118,7 @@ %prep %setup -q -n polyglot-maven-polyglot-%{version} +%patch0 -p1 find -name "*.class" -delete find -name "*.jar" -delete ++++++ polyglot-snakeyaml-1.25.patch ++++++ diff -urEbwB polyglot-maven-polyglot-0.2.1/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java polyglot-maven-polyglot-0.2.1.new/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java --- polyglot-maven-polyglot-0.2.1/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java 2017-09-06 19:21:53.000000000 +0200 +++ polyglot-maven-polyglot-0.2.1.new/polyglot-yaml/src/main/java/org/sonatype/maven/polyglot/yaml/ModelRepresenter.java 2019-11-10 20:22:59.071312361 +0100 @@ -205,8 +205,7 @@ * Change the default order. Important data goes first. */ @Override - protected Set<Property> getProperties(Class<? extends Object> type) - throws IntrospectionException { + protected Set<Property> getProperties(Class<? extends Object> type) { if (type.isAssignableFrom(Model.class)) { return sortTypeWithOrder(type, ORDER_MODEL); } else if (type.isAssignableFrom(Developer.class)) { @@ -222,8 +221,7 @@ } } - private Set<Property> sortTypeWithOrder(Class<? extends Object> type, List<String> order) - throws IntrospectionException { + private Set<Property> sortTypeWithOrder(Class<? extends Object> type, List<String> order) { Set<Property> standard = super.getProperties(type); Set<Property> sorted = new TreeSet<Property>(new ModelPropertyComparator(order)); sorted.addAll(standard);
