From 68a0f6ea14c997a0c7218bb2247f170dea6dfe8b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 23 2019 19:53:02 +0000 Subject: update to version 1.10.0 --- diff --git a/.gitignore b/.gitignore index 361710a..60bdda0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,12 @@ -modello-1.0-alpha-15-src.tar.gz -modello-1.0.1-src.tar.gz -modello-1.1-src.tar.gz -modello-1.4-src.tar.xz -modello-1.4.1-source-release.zip -modello-1.5-source-release.zip -/.project +/results_* +/*.src.rpm + +/modello-1.0-alpha-15-src.tar.gz +/modello-1.0.1-src.tar.gz +/modello-1.1-src.tar.gz +/modello-1.4-src.tar.xz +/modello-1.4.1-source-release.zip +/modello-1.5-source-release.zip /modello-1.6-source-release.zip /LICENSE-2.0.txt /modello-1.7-source-release.zip @@ -12,3 +14,4 @@ modello-1.5-source-release.zip /modello-1.8.2-source-release.zip /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip +/modello-1.10.0-source-release.zip diff --git a/modello.spec b/modello.spec index b3d1a6c..cc6ffbe 100644 --- a/modello.spec +++ b/modello.spec @@ -2,13 +2,13 @@ %bcond_without snakeyaml Name: modello -Version: 1.9.1 -Release: 9%{?dist} -Epoch: 0 Summary: Modello Data Model toolkit -# The majority of files are under MIT license, but some of them are -# ASL 2.0 or BSD-licensed. -License: ASL 2.0 and BSD and MIT +Epoch: 0 +Version: 1.10.0 +Release: 1%{?dist} +# The majority of files are under MIT license, but some of them are ASL 2.0. +License: MIT and ASL 2.0 + URL: http://codehaus-plexus.github.io/modello Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -29,14 +29,17 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) + %if %{with jackson} BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) %endif + %if %{with snakeyaml} BuildRequires: mvn(org.yaml:snakeyaml) %endif + # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -51,17 +54,20 @@ from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. -%package javadoc +%package javadoc Summary: Javadoc for %{name} -%description javadoc +%description javadoc API documentation for %{name}. + %prep %setup -q cp -p %{SOURCE1} LICENSE + # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin + # Avoid using Maven 2.x APIs sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml @@ -77,15 +83,18 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin %endif + %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) %mvn_build -f -- -Dmaven.version=3.1.1 + %install %mvn_install %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 %doc LICENSE %{_bindir}/* @@ -93,7 +102,11 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files javadoc -f .mfiles-javadoc %doc LICENSE + %changelog +* Tue Aug 20 2019 Fabio Valentini - 0:1.10.0-1 +- Update to version 1.10.0. + * Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -273,3 +286,4 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml * Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp - First JPackage build + diff --git a/sources b/sources index 20b5bb2..56fe3b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.9.1-source-release.zip) = 4b4f31c1e86280d72d503b8c1bcaf780bdb4d8e95545c9bce0a9a77b17d58febed27c72b545ebb57adfde78ee538eaf7055eca19ac45c94cdcdccb853236ea7f +SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8