SHA256
1
0
forked from pool/plexus-i18n

Accepting request 1174345 from Java:packages

build with sisu-plexus

OBS-URL: https://build.opensuse.org/request/show/1174345
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-i18n?expand=0&rev=5
This commit is contained in:
Ana Guerrero 2024-05-16 15:15:51 +00:00 committed by Git OBS Bridge
commit db92e47d0e
3 changed files with 12 additions and 19 deletions

View File

@ -1,15 +0,0 @@
diff -Naur plexus-i18n-1.0-beta-10.orig/pom.xml plexus-i18n-1.0-beta-10/pom.xml
--- plexus-i18n-1.0-beta-10.orig/pom.xml 2012-03-06 15:41:05.000000000 +0100
+++ plexus-i18n-1.0-beta-10/pom.xml 2012-03-06 15:54:20.383999743 +0100
@@ -50,6 +50,11 @@
<artifactId>plexus-utils</artifactId>
<version>1.4.5</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9-stable-1</version>
+ </dependency>
</dependencies>
<scm>

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 16 05:15:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use sisu-plexus instead of plexus-containers-container-default
- Removed patch:
* plexus-i18n-plexus-container-default-missing.patch
+ not needed any more
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 14:55:35 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Feb 20 14:55:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -34,13 +34,12 @@ URL: https://github.com/codehaus-plexus/plexus-i18n
Source0: %{name}-%{namedver}-src.tar.bz2 Source0: %{name}-%{namedver}-src.tar.bz2
Source1: %{name}-build.xml Source1: %{name}-build.xml
Patch0: %{name}-migration-to-component-metadata.patch Patch0: %{name}-migration-to-component-metadata.patch
Patch1: %{name}-plexus-container-default-missing.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local >= 6 BuildRequires: javapackages-local >= 6
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-metadata-generator BuildRequires: plexus-metadata-generator
BuildRequires: plexus-utils BuildRequires: plexus-utils
BuildRequires: sisu-plexus
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildRequires: ant-junit BuildRequires: ant-junit
@ -67,13 +66,14 @@ Javadoc for %{name}.
%setup -q -n %{name}-%{namedver} %setup -q -n %{name}-%{namedver}
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
%patch -P 0 -p1 %patch -P 0 -p1
%patch -P 1 -p1
%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
%build %build
mkdir -p lib mkdir -p lib
build-jar-repository -s lib \ build-jar-repository -s lib \
plexus/utils \ plexus/utils \
plexus-containers/plexus-container-default org.eclipse.sisu.plexus
%if %{with tests} %if %{with tests}
build-jar-repository -s lib \ build-jar-repository -s lib \
guava/guava \ guava/guava \