rpms/plexus-build-api
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Bootstrap Maven as non-modular packages

Browse Source 
Resolves: rhbz#1951482
This commit is contained in:
Mikolaj Izdebski 2021-06-08 20:17:56 +02:00
parent 2547dac425
commit 8aa885a888
3 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plexus-build-api-utils-3.3.0.patch → 0000-Port-to-plexus-utils-3.3.0.patch
View File

@ -1,5 +1,15 @@
From b31cf07a664173c8fa11309859dcb9f6929da578 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 23 Oct 2019 15:18:54 +0200
Subject: [PATCH] Port to plexus-utils 3.3.0
---
.../org/sonatype/plexus/build/incremental/EmptyScanner.java | 3 +++
.../build/incremental/test/TestIncrementalBuildContext.java | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
index 7cce37d..68b5b41 100644
index 7cce37d..2cca716 100644
--- a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
+++ b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
@@ -14,6 +14,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
@ -10,16 +20,15 @@ index 7cce37d..68b5b41 100644
import org.codehaus.plexus.util.Scanner;
@@ -54,4 +55,7 @@ public class EmptyScanner implements Scanner {
@@ -54,4 +55,6 @@ public class EmptyScanner implements Scanner {
return basedir;
}
+ public void setFilenameComparator(Comparator<String> filenameComparator) {
+ }
+
+public void setFilenameComparator(Comparator comparator) {
+}
}
diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
index 14c1e26..c89fa52 100644
index 14c1e26..01a9fba 100644
--- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
+++ b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
@@ -18,6 +18,7 @@ import java.io.FileOutputStream;
@ -35,8 +44,11 @@ index 14c1e26..c89fa52 100644
return basedir;
}
+
+ public void setFilenameComparator(Comparator<String> filenameComparator) {
+ }
+ public void setFilenameComparator(Comparator comparator) {
+ }
}
private final Set changedFiles;
--
2.21.0

37
plexus-build-api.spec
View File

@ -1,6 +1,12 @@
# 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-build-api
Version: 0.0.7
Release: 32%{?dist}
Release: 33%{?dist}
Summary: Plexus Build API
License: ASL 2.0
URL: https://github.com/sonatype/sisu-build-api
@ -12,14 +18,16 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2
Patch0: %{name}-migration-to-component-metadata.patch
# Port to plexus-utils 3.3.0 (implement a dummy method)
Patch1: %{name}-utils-3.3.0.patch
Patch1: 0000-Port-to-plexus-utils-3.3.0.patch
BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
%endif
%description
Plexus Build API
@ -37,15 +45,16 @@ cp -p %{SOURCE1} .
%patch0 -p1
%patch1 -p1
# remove unnecessary dependency on parent POM
%pom_remove_parent
%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
%mvn_file : plexus/%{name}
%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration"
# Install plexus-build-api-tests as well
%mvn_package :
%build
%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
%mvn_build
%install
%mvn_install
@ -57,8 +66,12 @@ cp -p %{SOURCE1} .
%doc LICENSE-2.0.txt
%changelog
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.7-32
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-33
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-32
- Bootstrap build
- Non-bootstrap build
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -82,12 +95,18 @@ cp -p %{SOURCE1} .
* Wed Nov 13 2019 Fabio Valentini <decathorpe@gmail.com> - 0.0.7-25
- Explicitly specify maven compiler source and target versions.
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-22
- Mass rebuild for javapackages-tools 201902
* Thu Oct 17 2019 Fabio Valentini <decathorpe@gmail.com> - 0.0.7-24
- Port to plexus-utils 3.3.0.
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-21
- Mass rebuild for javapackages-tools 201901
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
3dc76e0f6936addf5e4fbeb9551ab107 sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
SHA512 (sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz) = 3c8d73b390937a33da496c1d43d38c6ee4ed50951859654449c84a38f30e6ed15b218680fd16e747e33928cfc944d13577044edb399110e65f199b7f54702549
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8