Hello community, here is the log from the commit of package modello for openSUSE:Factory checked in at 2019-11-26 16:54:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/modello (Old) and /work/SRC/openSUSE:Factory/.modello.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "modello" Tue Nov 26 16:54:51 2019 rev:3 rq:750516 version:1.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/modello/modello-maven-plugin.changes 2019-04-05 12:05:16.694590773 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.26869/modello-maven-plugin.changes 2019-11-26 16:55:29.604184466 +0100 @@ -1,0 +2,5 @@ +Thu Nov 21 14:59:57 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.10.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/modello/modello.changes 2019-04-03 10:50:03.501909004 +0200 +++ /work/SRC/openSUSE:Factory/.modello.new.26869/modello.changes 2019-11-26 16:55:29.680184441 +0100 @@ -1,0 +2,8 @@ +Thu Nov 21 14:58:23 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.10.0 +- Modified patch: + * modello-cli-domasxpp3.patch + + rediff to changed line endings + +------------------------------------------------------------------- Old: ---- modello-1.9.1-source-release.zip New: ---- modello-1.10.0-source-release.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ modello-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.vhN60z/_old 2019-11-26 16:55:30.432184192 +0100 +++ /var/tmp/diff_new_pack.vhN60z/_new 2019-11-26 16:55:30.432184192 +0100 @@ -1,7 +1,7 @@ # # spec file for package modello-maven-plugin # -# 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 @@ -19,7 +19,7 @@ %global parent modello %global subname maven-plugin Name: %{parent}-%{subname} -Version: 1.9.1 +Version: 1.10.0 Release: 0 Summary: Modello Maven Plugin License: MIT AND Apache-2.0 @@ -29,6 +29,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: unzip BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-core) @@ -48,7 +49,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -BuildRequires: unzip #!BuildRequires: maven-compiler-plugin-bootstrap #!BuildRequires: maven-jar-plugin-bootstrap #!BuildRequires: maven-javadoc-plugin-bootstrap ++++++ modello.spec ++++++ --- /var/tmp/diff_new_pack.vhN60z/_old 2019-11-26 16:55:30.452184186 +0100 +++ /var/tmp/diff_new_pack.vhN60z/_new 2019-11-26 16:55:30.456184185 +0100 @@ -1,7 +1,7 @@ # # spec file for package modello # -# 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 @@ -17,7 +17,7 @@ Name: modello -Version: 1.9.1 +Version: 1.10.0 Release: 0 Summary: Modello Data Model toolkit License: MIT AND Apache-2.0 @@ -29,6 +29,7 @@ Patch0: modello-cli-domasxpp3.patch BuildRequires: ant BuildRequires: fdupes +BuildRequires: guava BuildRequires: javapackages-local BuildRequires: jsoup BuildRequires: junit @@ -39,10 +40,12 @@ BuildRequires: plexus-utils BuildRequires: snakeyaml BuildRequires: unzip -Requires: guava20 +Requires: guava # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions +Requires: guava Requires: javapackages-tools +Requires: xbean Requires: mvn(junit:junit) Requires: mvn(org.codehaus.plexus:plexus-compiler-api) Requires: mvn(org.codehaus.plexus:plexus-compiler-javac) @@ -51,7 +54,6 @@ Requires: mvn(org.jsoup:jsoup) Requires: mvn(org.sonatype.plexus:plexus-build-api) Requires: mvn(org.yaml:snakeyaml) -Requires: xbean BuildArch: noarch %description @@ -88,7 +90,7 @@ mkdir -p lib build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-api \ plexus-containers/plexus-container-default plexus-compiler/plexus-compiler-api junit \ - plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava20/guava-20.0 xbean/xbean-reflect + plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava/guava xbean/xbean-reflect # skip tests because we have too old xmlunit in openSUSE now (1.5) %{ant} \ -Dtest.skip=true \ @@ -141,7 +143,7 @@ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava20 %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true %files -f .mfiles %license LICENSE ++++++ modello-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2019-03-12 08:18:56.372005191 +0100 +++ new/common.xml 2019-11-21 15:55:04.632110872 +0100 @@ -3,15 +3,15 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="1.9.1"/> + <property name="project.version" value="1.10.0"/> <property name="project.groupId" value="org.codehaus.modello"/> <property name="project.organization.name" value="Codehaus Plexus"/> <property name="project.organization.url" value="http://codehaus-plexus.github.io/"/> <property name="project.url" value="${project.organization.url}modello/"/> - <property name="spec.version" value="1.9"/> + <property name="spec.version" value="1.10"/> - <property name="compiler.source" value="1.6"/> + <property name="compiler.source" value="1.7"/> <property name="compiler.target" value="${compiler.source}"/> </project> ++++++ modello-cli-domasxpp3.patch ++++++ --- /var/tmp/diff_new_pack.vhN60z/_old 2019-11-26 16:55:30.548184154 +0100 +++ /var/tmp/diff_new_pack.vhN60z/_new 2019-11-26 16:55:30.552184153 +0100 @@ -1,22 +1,22 @@ --- modello-1.9.1/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2019-03-15 15:06:08.911975772 +0100 +++ modello-1.9.1/modello-core/src/main/java/org/codehaus/modello/ModelloCli.java 2019-03-15 15:07:02.920265437 +0100 @@ -121,6 +121,11 @@ - { - parameters.setProperty( ModelloParameterConstants.ENCODING, args[6] ); - } -+ -+ if ( args.length > 7 ) -+ { -+ parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] ); -+ } - } - - // ---------------------------------------------------------------------- + { + parameters.setProperty( ModelloParameterConstants.ENCODING, args[6] ); + } ++ ++ if ( args.length > 7 ) ++ { ++ parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] ); ++ } + } + + // ---------------------------------------------------------------------- @@ -130,6 +135,6 @@ - private static void usage() - { - System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>" -- + "<useJava5> [<encoding>]" ); -+ + " <useJava5> [<encoding> [<domAsXpp3>]]" ); - } - } + private static void usage() + { + System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>" +- + "<useJava5> [<encoding>]" ); ++ + " <useJava5> [<encoding> [<domAsXpp3>]]" ); + } + }
