Fridrich Strba 2024-04-16 13:06:04 +00:00 committed by Git OBS Bridge
parent 35a5c1918b
commit 2869277080
5 changed files with 27 additions and 28 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8d4a4762a66a6f86ad5569afb60e38b0de736799f2f3a97d72f5eac207c50fb
size 4736
oid sha256:501f2c19edb24f6e21bc00e19d800f94fcc0e047d281b43da14d186c10c7584d
size 5000

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Build all modello plugins
-------------------------------------------------------------------
Sun Apr 14 06:13:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -46,7 +46,9 @@ 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}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-velocity) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-xdoc) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-xpp3) = %{version}
BuildRequires: mvn(org.codehaus.modello:modello-plugin-xsd) = %{version}
@ -90,23 +92,13 @@ cp -p %{SOURCE1} LICENSE
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :sisu-maven-plugin
%pom_remove_dep :plexus-xml modello-core
%pom_remove_dep :sisu-guice modello-core
%pom_add_dep com.google.inject:guice modello-core
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core
%pom_change_dep -r :velocity-engine-core :velocity
%pom_remove_dep :jackson-bom
%pom_disable_module modello-plugin-snakeyaml modello-plugins
%pom_disable_module modello-plugin-velocity modello-plugins
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
%pom_disable_module modello-test
%build
pushd %{name}
%{mvn_file} :{*} %{parent}/@1

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 16 13:04:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Build all modello plugins
-------------------------------------------------------------------
Sun Apr 14 06:13:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -42,13 +42,14 @@ BuildRequires: jsoup
BuildRequires: objectweb-asm
BuildRequires: plexus-build-api
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-component-annotations
BuildRequires: plexus-utils
BuildRequires: plexus-xml
BuildRequires: sisu-inject
BuildRequires: sisu-plexus
BuildRequires: slf4j
BuildRequires: snakeyaml
BuildRequires: unzip
BuildRequires: velocity
Requires: aopalliance
Requires: atinject
Requires: google-guice
@ -58,12 +59,13 @@ Requires: javadoc-parser
Requires: javapackages-tools
Requires: plexus-build-api
Requires: plexus-classworlds
Requires: plexus-containers-component-annotations
Requires: plexus-utils
Requires: plexus-xml
Requires: sisu-inject
Requires: sisu-plexus
Requires: slf4j
Requires: snakeyaml
Requires: velocity
BuildArch: noarch
%description
@ -95,17 +97,11 @@ cp -p %{SOURCE1} LICENSE
%pom_remove_dep :sisu-guice modello-core
%pom_add_dep com.google.inject:guice modello-core
# This builds correctly with the older velocity 1.x and avoids build cycles
%pom_change_dep -r :velocity-engine-core :velocity
%pom_remove_dep :jackson-bom
%pom_disable_module modello-plugin-snakeyaml modello-plugins
%pom_disable_module modello-plugin-velocity modello-plugins
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
%pom_disable_module modello-test
%build
mkdir -p lib
build-jar-repository -s lib \
@ -123,8 +119,9 @@ build-jar-repository -s lib \
plexus/plexus-build-api \
plexus/utils \
plexus/xml \
plexus-containers/plexus-component-annotations \
slf4j/api
slf4j/api \
snakeyaml \
velocity
%{ant} \
-Dtest.skip=true \
@ -146,7 +143,7 @@ for i in core; do
cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
done
for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd jackson jsonschema; do
for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd jackson jsonschema snakeyaml velocity; do
install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
%{mvn_install_pom} %{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
@ -157,7 +154,7 @@ done
%fdupes -s %{buildroot}%{_javadocdir}
# script
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple %{name} true
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true
%files -f .mfiles
%license LICENSE