rpm/plexus-ant-factory
SHA256
1
0
Fork 0
forked from pool/plexus-ant-factory
Code Pull Requests Activity

Accepting request 1174339 from Java:packages

Browse Source 
build with sisu-plexus

OBS-URL: https://build.opensuse.org/request/show/1174339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-ant-factory?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2024-05-16 15:15:44 +00:00 committed by Git OBS Bridge
commit bdc6993f0a
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plexus-ant-factory-sisu-plexus.patch Normal file
View File

@ -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." );
}

9
plexus-ant-factory.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu May 16 04:54:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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.
-------------------------------------------------------------------
Wed Feb 21 22:17:52 UTC 2024 - Fridrich Strba <fstrba@suse.com>

6
plexus-ant-factory.spec
View File

@ -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 \