rpm/modello
SHA256
1
0
Fork 0
forked from pool/modello
Code Pull Requests Activity

Accepting request 1205319 from Java:packages

Browse Source 
Build against velocity-engine-core

OBS-URL: https://build.opensuse.org/request/show/1205319
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/modello?expand=0&rev=20
This commit is contained in:
Ana Guerrero 2024-10-03 15:40:07 +00:00 committed by Git OBS Bridge
commit 6609606482
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modello-maven-plugin.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Oct 2 20:26:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Build against velocity-engine-core, since we can do it now without
introducing build cycles
-------------------------------------------------------------------
Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Add dependency on jakarta-inject, needed by google-guice 6.0.0
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 5 11:27:39 UTC 2024 - Fridrich Strba <fstrba@suse.com> Wed Jun 5 11:27:39 UTC 2024 - Fridrich Strba <fstrba@suse.com>

2
modello-maven-plugin.spec
View File

@ -94,8 +94,6 @@ cp -p %{SOURCE1} .
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 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_remove_dep :jackson-bom
%build %build

6
modello.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 2 20:26:43 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Build against velocity-engine-core, since we can do it now without
introducing build cycles
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba@suse.com> Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>

11
modello.spec
View File

@ -48,7 +48,7 @@ BuildRequires: sisu-plexus
BuildRequires: slf4j BuildRequires: slf4j
BuildRequires: snakeyaml BuildRequires: snakeyaml
BuildRequires: unzip BuildRequires: unzip
BuildRequires: velocity BuildRequires: velocity-engine-core
Requires: aopalliance Requires: aopalliance
Requires: atinject Requires: atinject
Requires: google-guice Requires: google-guice
@ -67,7 +67,7 @@ Requires: sisu-inject
Requires: sisu-plexus Requires: sisu-plexus
Requires: slf4j Requires: slf4j
Requires: snakeyaml Requires: snakeyaml
Requires: velocity Requires: velocity-engine-core
BuildArch: noarch BuildArch: noarch
%description %description
@ -109,9 +109,6 @@ cp -p %{SOURCE1} .
%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 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_remove_dep :jackson-bom
%build %build
@ -133,7 +130,7 @@ build-jar-repository -s lib \
plexus/xml \ plexus/xml \
slf4j/api \ slf4j/api \
snakeyaml \ snakeyaml \
velocity velocity-engine/velocity-engine-core
%{ant} \ %{ant} \
-Dtest.skip=true \ -Dtest.skip=true \
@ -166,7 +163,7 @@ done
%fdupes -s %{buildroot}%{_javadocdir} %fdupes -s %{buildroot}%{_javadocdir}
# script # script
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true %jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity-engine/velocity-engine-core %{name} true
%files -f .mfiles -f .mfiles-core %files -f .mfiles -f .mfiles-core
%license LICENSE.txt LICENSE-2.0.txt %license LICENSE.txt LICENSE-2.0.txt