Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plexus-ant-factory for openSUSE:Factory checked in at 2024-05-16 17:15:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plexus-ant-factory (Old) and /work/SRC/openSUSE:Factory/.plexus-ant-factory.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-ant-factory" Thu May 16 17:15:44 2024 rev:4 rq:1174339 version:1.0~a2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/plexus-ant-factory/plexus-ant-factory.changes 2024-02-22 20:58:58.852183351 +0100 +++ /work/SRC/openSUSE:Factory/.plexus-ant-factory.new.1880/plexus-ant-factory.changes 2024-05-16 17:17:56.173926187 +0200 @@ -1,0 +2,9 @@ +Thu May 16 04:54:53 UTC 2024 - Fridrich Strba <[email protected]> + +- Use sisu-plexus instead of plexus-containers-container-default +- Added patch: + * plexus-ant-factory-sisu-plexus.patch + + fix the code to build both with sisu-plexus and + plexus-containers-container-default. + +------------------------------------------------------------------- New: ---- plexus-ant-factory-sisu-plexus.patch BETA DEBUG BEGIN: New:- Added patch: * plexus-ant-factory-sisu-plexus.patch + fix the code to build both with sisu-plexus and BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plexus-ant-factory.spec ++++++ --- /var/tmp/diff_new_pack.749WQA/_old 2024-05-16 17:17:56.865951268 +0200 +++ /var/tmp/diff_new_pack.749WQA/_new 2024-05-16 17:17:56.869951413 +0200 @@ -38,12 +38,13 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: %{name}-build.xml Source100: plexus-ant-factory_license_and_copyright.txt +Patch0: plexus-ant-factory-sisu-plexus.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local >= 6 BuildRequires: plexus-classworlds -BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: sisu-plexus BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -61,13 +62,14 @@ %prep %setup -q -n %{name} +%patch -P 0 -p1 cp %{SOURCE1} LICENSE cp %{SOURCE2} build.xml %build mkdir -p lib -build-jar-repository -s lib plexus/classworlds plexus/utils plexus-containers/plexus-container-default +build-jar-repository -s lib plexus/classworlds plexus/utils org.eclipse.sisu.plexus %{ant} \ %if %{without tests} -Dtest.skip=true \ ++++++ plexus-ant-factory-sisu-plexus.patch ++++++ --- plexus-ant-factory/src/main/java/org/codehaus/plexus/component/factory/ant/AntComponentFactory.java 2024-05-15 19:54:52.747188171 +0200 +++ plexus-ant-factory/src/main/java/org/codehaus/plexus/component/factory/ant/AntComponentFactory.java 2024-05-15 19:55:53.817620623 +0200 @@ -21,7 +21,7 @@ } catch ( IOException e ) { - throw new ComponentInstantiationException( "Failed to extract Ant script for: " + componentDescriptor.getHumanReadableKey(), e ); + throw new ComponentInstantiationException( "Failed to extract Ant script for: " + componentDescriptor.toString(), e ); } } --- plexus-ant-factory/src/main/java/org/codehaus/plexus/component/factory/ant/AntScriptInvoker.java 2024-05-15 19:54:52.747188171 +0200 +++ plexus-ant-factory/src/main/java/org/codehaus/plexus/component/factory/ant/AntScriptInvoker.java 2024-05-15 19:55:26.287425676 +0200 @@ -118,7 +118,7 @@ { if ( !descriptor.getRequirements().contains( rd ) ) { - throw new ComponentConfigurationException( "Requirement: " + rd.getHumanReadableKey() + throw new ComponentConfigurationException( rd.toString() + " is not listed in this component's descriptor." ); }
