SLFO-pool/plexus-ant-factory
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main plexus-ant-factory revision 9a8588e22d1f23d7809c54f0d3530e77

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:55:06 +02:00
parent 730345de7f
commit 9f499f44de
3 changed files with 51 additions and 13 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." );
}

20
plexus-ant-factory.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sun May 26 19:33:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use the org.eclipse.sisu:org.eclipse.sisu.plexus to avoid
conflict/choise of providers
-------------------------------------------------------------------
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>
- Clean the spec file and simplify it a bit
-------------------------------------------------------------------
Sun Mar 20 17:54:30 UTC 2022 - Fridrich Strba <fstrba@suse.com>

22
plexus-ant-factory.spec
View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package plexus-ant-factory
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2000-2005, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -38,16 +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
BuildRequires: javapackages-local >= 6
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
Requires: mvn(org.apache.ant:ant)
Requires: mvn(org.apache.ant:ant-launcher)
Requires: mvn(org.codehaus.plexus:plexus-container-default)
Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: sisu-plexus
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
@ -65,16 +62,15 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
%patch -P 0 -p1
cp %{SOURCE1} LICENSE
cp %{SOURCE2} build.xml
%pom_remove_parent .
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" .
%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
%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 \
@ -90,7 +86,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{parent}
install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{parent}/%{subname}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{parent}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{subname}.pom
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{subname}.pom
%add_maven_depmap %{parent}/%{subname}.pom %{parent}/%{subname}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}