diff --git a/plexus-ant-factory-sisu-plexus.patch b/plexus-ant-factory-sisu-plexus.patch new file mode 100644 index 0000000..d7c76e1 --- /dev/null +++ b/plexus-ant-factory-sisu-plexus.patch @@ -0,0 +1,22 @@ +--- 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." ); + } + diff --git a/plexus-ant-factory.spec b/plexus-ant-factory.spec index 2d291d4..cb220ce 100644 --- a/plexus-ant-factory.spec +++ b/plexus-ant-factory.spec @@ -38,12 +38,13 @@ Source0: %{name}-src.tar.bz2 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 @@ Javadoc for %{name}. %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 \