diff --git a/modello-1.11-source-release.zip b/modello-1.11-source-release.zip new file mode 100644 index 0000000..6f02d27 Binary files /dev/null and b/modello-1.11-source-release.zip differ diff --git a/modello-1.9.1.zip b/modello-1.9.1.zip deleted file mode 100644 index a644f69..0000000 Binary files a/modello-1.9.1.zip and /dev/null differ diff --git a/modello.spec b/modello.spec index 2ad6a32..a546a3a 100644 --- a/modello.spec +++ b/modello.spec @@ -1,11 +1,11 @@ Name: modello -Version: 1.9.1 -Release: 8 +Version: 1.11 +Release: 1 Epoch: 0 Summary: Modello Data Model toolkit License: ASL 2.0 and BSD and MIT URL: http://codehaus-plexus.github.io/modello -Source0: https://github.com/codehaus-plexus/modello/archive/modello-%{version}.zip +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 BuildArch: noarch @@ -20,12 +20,11 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) mvn(org.yaml:snakeyaml) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) +BuildRequires: xmlunit Requires: javapackages-tools + %description Modello is a framework for code generation from a simple model. Modello generates code from a simple model format: based on a plugin architecture, various types of code and @@ -41,11 +40,19 @@ Obsoletes: %{name}-javadoc < %{version}-%{release} API Help documentation for modello. %prep -%autosetup -n modello-modello-%{version} -p1 +%autosetup -n modello-%{version} -p1 install -p %{SOURCE1} LICENSE %pom_remove_plugin :maven-site-plugin sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml +%pom_disable_module modello-plugin-jackson modello-plugins +%pom_disable_module modello-plugin-jsonschema modello-plugins +%pom_remove_dep :modello-plugin-jackson modello-maven-plugin +%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin + +%pom_disable_module modello-plugin-snakeyaml modello-plugins +%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin + %build %mvn_build -f -- -Dmaven.version=3.1.1 @@ -60,5 +67,8 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files help -f .mfiles-javadoc %changelog +* Tue Feb 08 2022 Ge Wang - 0:1.11-1 +- Update to version 1.11 + * Tue Mar 03 2020 daiqianwen - 0:1.9.1-8 - Package init