Accepting request 750516 from Java:packages

1.10.0

OBS-URL: https://build.opensuse.org/request/show/750516
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/modello?expand=0&rev=3

modello-1.10.0-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3769f822276ca84be0caa6c938532670cdc24e44d4b132d878aa5bba9d6b0949
+size 925965

modello-1.9.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1eb71c40cf5c2bf7470e13f0a8c6d0dca45d5b0b6af2878350e5fb33c9c37e84
-size 923180

modello-build.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:623b7e201bac09509a2b55cb3173612976444a29df9c7fe9324f562c50892a21
+oid sha256:b7e8c9d9eb3cdb34ad378ee4c224030c75155b8b15aa8feac2127d144c120663
-size 4288
+size 4296

modello-cli-domasxpp3.patch

@@ -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] );
+             parameters.setProperty( ModelloParameterConstants.ENCODING, args[6] );
-         }
+         }
-+
++
-+        if ( args.length > 7 )
++        if ( args.length > 7 )
-+        {
++        {
-+            parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] );
++            parameters.setProperty( ModelloParameterConstants.DOM_AS_XPP3, args[7] );
-+        }
++        }
-     }
+     }
- 
+ 
-     // ----------------------------------------------------------------------
+     // ----------------------------------------------------------------------
 @@ -130,6 +135,6 @@
-     private static void usage()
+     private static void usage()
-     {
+     {
-         System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
+         System.err.println( "Usage: modello <model> <outputType> <output directory> <modelVersion> <packageWithVersion>"
--                            + "<useJava5> [<encoding>]" );
+-                            + "<useJava5> [<encoding>]" );
-+                            + " <useJava5> [<encoding> [<domAsXpp3>]]" );
++                            + " <useJava5> [<encoding> [<domAsXpp3>]]" );
-     }
+     }
- }
+ }

modello-maven-plugin.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 21 14:59:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.10.0
+
 -------------------------------------------------------------------
 Tue Mar 12 08:34:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

modello-maven-plugin.spec

@@ -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 @@ Source0:        http://repo2.maven.org/maven2/org/codehaus/%{parent}/%{parent}/%
 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.modello:modello-plugin-xsd) = %{version}
 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.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 21 14:58:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.10.0
+- Modified patch:
+  * modello-cli-domasxpp3.patch
+    + rediff to changed line endings
+
 -------------------------------------------------------------------
 Fri Mar 15 14:15:55 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

modello.spec

@@ -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 @@ Source100:      %{name}-build.tar.xz
 Patch0:         modello-cli-domasxpp3.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
+BuildRequires:  guava
 BuildRequires:  javapackages-local
 BuildRequires:  jsoup
 BuildRequires:  junit
@@ -39,10 +40,12 @@ BuildRequires:  plexus-containers-container-default
 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.codehaus.plexus:plexus-utils)
 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 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
 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 @@ done
 %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