Bootstrap Maven as non-modular packages
Resolves: rhbz#1951482
This commit is contained in:
Mikolaj Izdebski
parent
7d6279f0a4
commit
1dc0540bd2
@ -1,15 +1,15 @@
|
||||
From bd1055a190a1a64374f4aeb3bfde138d9c3d965f Mon Sep 17 00:00:00 2001
|
||||
From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Sat, 23 Sep 2017 11:43:45 +0200
|
||||
Subject: [PATCH] Remove support for snappy
|
||||
|
||||
---
|
||||
src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +--
|
||||
src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
|
||||
.../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +--
|
||||
.../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
||||
index 398ecf1..0d46cfc 100644
|
||||
index 8eec881..be8e7a3 100644
|
||||
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
||||
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
|
||||
@@ -38,7 +38,6 @@
|
||||
@ -30,7 +30,7 @@ index 398ecf1..0d46cfc 100644
|
||||
else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) )
|
||||
{
|
||||
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
||||
index 4bc94a4..15f0494 100644
|
||||
index 2316d4e..c2e2b83 100644
|
||||
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
||||
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
|
||||
@@ -31,7 +31,6 @@
|
||||
@ -51,5 +51,5 @@ index 4bc94a4..15f0494 100644
|
||||
else if ( compression == UntarCompressionMethod.XZ )
|
||||
{
|
||||
--
|
||||
2.13.5
|
||||
2.21.0
|
||||
|
||||
|
||||
@ -1,32 +1,36 @@
|
||||
%bcond_without snappy
|
||||
# Workaround for rhbz#1969370: __bootstrap macro is not defined in
|
||||
# CentOS Stream, See https://bugzilla.redhat.com/1969370
|
||||
%global __bootstrap ~bootstrap
|
||||
|
||||
%bcond_without bootstrap
|
||||
|
||||
Name: plexus-archiver
|
||||
Version: 4.2.4
|
||||
Release: 2%{?dist}
|
||||
Epoch: 0
|
||||
Release: 3%{?dist}
|
||||
Summary: Plexus Archiver Component
|
||||
License: ASL 2.0
|
||||
URL: https://codehaus-plexus.github.io/plexus-archiver
|
||||
BuildArch: noarch
|
||||
|
||||
URL: https://github.com/codehaus-plexus/plexus-archiver
|
||||
Source0: %{url}/archive/plexus-archiver-%{version}.tar.gz
|
||||
Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
|
||||
|
||||
Patch0: 0001-Remove-support-for-snappy.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.commons:commons-compress)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) >= 2.1.0
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-io) >= 3.2.0
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-io)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
|
||||
%if %{with snappy}
|
||||
BuildRequires: mvn(org.iq80.snappy:snappy)
|
||||
%endif
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
BuildRequires: mvn(org.tukaani:xz)
|
||||
%endif
|
||||
|
||||
%description
|
||||
The Plexus project seeks to create end-to-end developer tools for
|
||||
@ -36,28 +40,26 @@ reusable components for hibernate, form processing, jndi, i18n,
|
||||
velocity, etc. Plexus also includes an application server which
|
||||
is like a J2EE application server, without all the baggage.
|
||||
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{name}-%{version}
|
||||
%mvn_file :%{name} plexus/archiver
|
||||
|
||||
%if %{without snappy}
|
||||
%patch0 -p1
|
||||
%pom_remove_dep org.iq80.snappy:snappy
|
||||
rm -rf src/main/java/org/codehaus/plexus/archiver/snappy
|
||||
rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
|
||||
rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java
|
||||
%endif
|
||||
rm src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java
|
||||
rm src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
|
||||
|
||||
# looks like this test hasn't been ported to plexus-containers 2+ yet:
|
||||
rm src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
|
||||
# Tests use old plexus-containers-default
|
||||
sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
@ -72,8 +74,15 @@ rm src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0:4.2.4-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-3
|
||||
- Bootstrap Maven for CentOS Stream 9
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-2
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Fri Feb 12 2021 Marian Koncek <mkoncek@redhat.com> - 4.2.4-1
|
||||
- Update to upstream version 4.2.4
|
||||
|
||||
* Sat Jan 30 2021 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.4-1
|
||||
- Update to version 4.2.4.
|
||||
@ -81,9 +90,15 @@ rm src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Dec 4 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.3-1
|
||||
- Update to upstream version 4.2.3
|
||||
|
||||
* Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.3-1
|
||||
- Update to version 4.2.3.
|
||||
|
||||
* Mon Aug 03 2020 Marian Koncek <mkoncek@redhat.com> - 4.2.2-1
|
||||
- Update to upstream version 4.2.2
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.2.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
@ -96,18 +111,33 @@ rm src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.1-1
|
||||
- Update to upstream version 4.2.1
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Mon Oct 28 2019 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.1-1
|
||||
- Update to version 4.2.1.
|
||||
|
||||
* Thu Oct 24 2019 Fabio Valentini <decathorpe@gmail.com> - 0:4.2.0-1
|
||||
- Update to version 4.2.0.
|
||||
|
||||
* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
|
||||
- Update to upstream version 4.2.0
|
||||
|
||||
* Wed Aug 07 2019 Marian Koncek <mkoncek@redhat.com> - 0:4.1.0-1
|
||||
- Update to upstream version 4.1.0
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1.0-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Wed Feb 27 2019 Marian Koncek <mkoncek@redhat.com> - 0:4.1.0-1
|
||||
- Update to upstream version 4.1.0
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.6.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user