Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-velocity for openSUSE:Factory
checked in at 2024-05-16 17:15:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-velocity (Old)
and /work/SRC/openSUSE:Factory/.plexus-velocity.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-velocity"
Thu May 16 17:15:50 2024 rev:5 rq:1174344 version:1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-velocity/plexus-velocity.changes
2022-03-29 21:07:15.253129976 +0200
+++
/work/SRC/openSUSE:Factory/.plexus-velocity.new.1880/plexus-velocity.changes
2024-05-16 17:18:03.418188745 +0200
@@ -1,0 +2,6 @@
+Thu May 16 05:07:02 UTC 2024 - Fridrich Strba <[email protected]>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+- Clean up the spec file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-velocity.spec ++++++
--- /var/tmp/diff_new_pack.bZKCKc/_old 2024-05-16 17:18:04.782238183 +0200
+++ /var/tmp/diff_new_pack.bZKCKc/_new 2024-05-16 17:18:04.794238618 +0200
@@ -1,7 +1,7 @@
#
# spec file for package plexus-velocity
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,12 +30,9 @@
BuildRequires: apache-commons-collections
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-local
-BuildRequires: plexus-containers-container-default
+BuildRequires: javapackages-local >= 6
+BuildRequires: sisu-plexus
BuildRequires: velocity
-Requires: mvn(commons-collections:commons-collections)
-Requires: mvn(org.codehaus.plexus:plexus-container-default)
-Requires: mvn(velocity:velocity)
BuildArch: noarch
%description
@@ -58,11 +55,8 @@
cp -p %{SOURCE1} build.xml
cp -p %{SOURCE2} LICENSE
-%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>"
-%pom_remove_parent
-
mkdir -p lib
-build-jar-repository -s lib commons-collections
plexus-containers/plexus-container-default velocity
+build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus
velocity
%build
ant jar javadoc
@@ -73,7 +67,7 @@
install -pm 0644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/%{name}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
