From 0b88e66f6537774d5518b63ce0ae79619634e8ea45a8b39fee8f5a1920eb37ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Feb 2025 09:55:05 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main modello revision 4d25778b9762087e56925d5db4ab632a --- modello-maven-plugin.changes | 11 +++++++++++ modello-maven-plugin.spec | 2 -- modello.changes | 6 ++++++ modello.spec | 11 ++++------- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes index db52ce1..3e04d81 100644 --- a/modello-maven-plugin.changes +++ b/modello-maven-plugin.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Oct 2 20:26:43 UTC 2024 - Fridrich Strba + +- 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 + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + ------------------------------------------------------------------- Wed Jun 5 11:27:39 UTC 2024 - Fridrich Strba diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec index 929f8a1..fb05d74 100644 --- a/modello-maven-plugin.spec +++ b/modello-maven-plugin.spec @@ -94,8 +94,6 @@ cp -p %{SOURCE1} . %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 %build diff --git a/modello.changes b/modello.changes index f3803de..e1a1e99 100644 --- a/modello.changes +++ b/modello.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 2 20:26:43 UTC 2024 - Fridrich Strba + +- 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 diff --git a/modello.spec b/modello.spec index f4404d6..e70fa79 100644 --- a/modello.spec +++ b/modello.spec @@ -48,7 +48,7 @@ BuildRequires: sisu-plexus BuildRequires: slf4j BuildRequires: snakeyaml BuildRequires: unzip -BuildRequires: velocity +BuildRequires: velocity-engine-core Requires: aopalliance Requires: atinject Requires: google-guice @@ -67,7 +67,7 @@ Requires: sisu-inject Requires: sisu-plexus Requires: slf4j Requires: snakeyaml -Requires: velocity +Requires: velocity-engine-core BuildArch: noarch %description @@ -109,9 +109,6 @@ cp -p %{SOURCE1} . %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 %build @@ -133,7 +130,7 @@ build-jar-repository -s lib \ plexus/xml \ slf4j/api \ snakeyaml \ - velocity + velocity-engine/velocity-engine-core %{ant} \ -Dtest.skip=true \ @@ -166,7 +163,7 @@ done %fdupes -s %{buildroot}%{_javadocdir} # 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 %license LICENSE.txt LICENSE-2.0.txt