pool/modello
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=13

Browse Source
This commit is contained in:
Fridrich Strba 2021-04-26 10:55:05 +00:00 committed by Git OBS Bridge
parent bc11e8576c
commit a127322919
5 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modello-build.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b144216e3f5c03bf929826877865a9ff4935ff3de14141a997161da47953a6be
size 4376
oid sha256:ee176329926f1df29eab07cc40217493b554e9e42237ab15ade217b05f99a92d
size 4724

6
modello-maven-plugin.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.11
- Depend on the jackson and jsonschema plugins too
-------------------------------------------------------------------
Thu Nov 21 14:59:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>

2
modello-maven-plugin.spec
View File

@ -38,8 +38,10 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.codehaus.modello:modello-core) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-converters) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-dom4j) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-jackson) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-java) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-jdom) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-jsonschema) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-sax) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-snakeyaml) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-stax) = %{version}

6
modello.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 26 10:52:49 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Upgrade to upstream version 1.11
- Build the jackson and jsonschema plugins too
-------------------------------------------------------------------
Thu Nov 21 14:58:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>

21
modello.spec
View File

@ -30,6 +30,9 @@ Patch0: modello-cli-domasxpp3.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: guava
BuildRequires: jackson-annotations
BuildRequires: jackson-core
BuildRequires: jackson-databind
BuildRequires: javapackages-local
BuildRequires: jsoup
BuildRequires: junit
@ -43,9 +46,11 @@ BuildRequires: unzip
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(com.fasterxml.jackson.core:jackson-annotations)
Requires: mvn(com.fasterxml.jackson.core:jackson-core)
Requires: mvn(com.fasterxml.jackson.core:jackson-databind)
Requires: mvn(junit:junit)
Requires: mvn(org.codehaus.plexus:plexus-compiler-api)
Requires: mvn(org.codehaus.plexus:plexus-compiler-javac)
@ -81,16 +86,12 @@ cp -p %{SOURCE1} LICENSE
# Avoid using Maven 2.x APIs
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
%build
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 guava/guava xbean/xbean-reflect
plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava/guava xbean/xbean-reflect \
jackson-core jackson-annotations jackson-databind
# skip tests because we have too old xmlunit in openSUSE now (1.5)
%{ant} \
-Dtest.skip=true \
@ -104,7 +105,7 @@ for i in core test; do
install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
done
for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd; do
for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do
install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
done
@ -122,7 +123,7 @@ for i in core test; do
%add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar
done
for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd; do
for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do
install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom
%add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar
done
@ -135,7 +136,7 @@ for i in core test; do
cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd; do
for i in converters dom4j java jdom sax snakeyaml stax xdoc xml xpp3 xsd jackson jsonschema; do
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}
cp -pr %{name}-plugins/%{name}-plugin-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}/
done