Update to upstream version 2.0.0
This commit is contained in:
Mikolaj Izdebski
parent
19efb81bb3
commit
914fee37b7
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@
|
||||
/modello-1.9.1-source-release.zip
|
||||
/modello-1.10.0-source-release.zip
|
||||
/modello-1.11-source-release.zip
|
||||
/modello-2.0.0-source-release.zip
|
||||
|
||||
29
modello.spec
29
modello.spec
@ -1,17 +1,17 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: modello
|
||||
Version: 1.11
|
||||
Release: 8%{?dist}
|
||||
Version: 2.0.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Modello Data Model toolkit
|
||||
# The majority of files are under MIT license, but some of them are ASL 2.0.
|
||||
# Some parts of the project are derived from the Exolab project,
|
||||
# and are licensed under a 5-clause BSD license.
|
||||
License: MIT and ASL 2.0 and BSD
|
||||
|
||||
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
|
||||
URL: https://codehaus-plexus.github.io/modello
|
||||
Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source1: https://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -20,18 +20,19 @@ BuildRequires: maven-local
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-model)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
|
||||
BuildRequires: mvn(org.jsoup:jsoup)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
|
||||
BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:)
|
||||
%endif
|
||||
|
||||
# Explicit javapackages-tools requires since modello script uses
|
||||
@ -58,9 +59,8 @@ API documentation for %{name}.
|
||||
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
|
||||
|
||||
%pom_remove_dep :jackson-bom
|
||||
%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
|
||||
@ -71,12 +71,12 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
|
||||
|
||||
%build
|
||||
# skip tests because we have too old xmlunit in Fedora now (1.0.8)
|
||||
%mvn_build -f -- -Dmaven.version=3.1.1
|
||||
%mvn_build -f
|
||||
|
||||
%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
|
||||
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice-no_aop:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE
|
||||
@ -86,6 +86,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
|
||||
%doc LICENSE
|
||||
|
||||
%changelog
|
||||
* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-1
|
||||
- Update to upstream version 2.0.0
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.11-8
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
|
||||
@ -5,9 +5,9 @@ prepare:
|
||||
execute:
|
||||
script: |
|
||||
set -x
|
||||
modello plans/smoke.mdo java test-src 1.0.0 foo true
|
||||
modello plans/smoke.mdo java test-src 1.0.0 foo 8
|
||||
javac -d test-bin test-src/smoke/*
|
||||
modello plans/smoke.mdo stax-reader test-src 1.0.0 foo true
|
||||
modello plans/smoke.mdo stax-reader test-src 1.0.0 foo 8
|
||||
javac -d test-bin -cp test-bin test-src/smoke/io/stax/*
|
||||
find test-src test-bin
|
||||
test -f test-bin/smoke/SomeBean.class
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f
|
||||
SHA512 (modello-2.0.0-source-release.zip) = 69934156fe0e1eab6ef26f02e87b0aab0de2c74642f2cd93ca8556004f918643f578449c9d322b0388d9ff6730f83265a72592cab7544095d11042aacab285a3
|
||||
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user