import CS plexus-build-api-1.2.0-14.module_el9+1171+eb38a622

.gitignore

@@ -1 +1 @@
-SOURCES/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
+SOURCES/plexus-build-api-1.2.0.tar.gz

.plexus-build-api.metadata

@@ -1 +1 @@
-4469a1564e77a8bc22860a25930f60668d50553f SOURCES/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
+fb8ac0d9dc64ae05cba4c1b0a2923e57d76561d9 SOURCES/plexus-build-api-1.2.0.tar.gz

SOURCES/0000-Port-to-plexus-utils-3.3.0.patch

@@ -1,54 +0,0 @@
-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..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
- package org.sonatype.plexus.build.incremental;
- 
- import java.io.File;
-+import java.util.Comparator;
- 
- import org.codehaus.plexus.util.Scanner;
- 
-@@ -54,4 +55,6 @@ public class EmptyScanner implements Scanner {
-     return basedir;
-   }
- 
-+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..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;
- import java.io.IOException;
- import java.io.OutputStream;
- import java.util.ArrayList;
-+import java.util.Comparator;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.List;
-@@ -66,6 +67,9 @@ public class TestIncrementalBuildContext implements BuildContext {
-     public File getBasedir() {
-       return basedir;
-     }
-+
-+	public void setFilenameComparator(Comparator comparator) {
-+	}
-   }
- 
-   private final Set changedFiles;
--- 
-2.21.0
-

SOURCES/plexus-build-api-migration-to-component-metadata.patch

@@ -1,18 +0,0 @@
-diff -Naur plexus-build-api-0.0.7.orig/pom.xml plexus-build-api-0.0.7/pom.xml
---- plexus-build-api-0.0.7.orig/pom.xml	2011-02-11 17:37:00.000000000 +0100
-+++ plexus-build-api-0.0.7/pom.xml	2011-07-27 14:48:31.508448776 +0200
-@@ -46,12 +46,11 @@
-     <plugins>
-       <plugin>
-         <groupId>org.codehaus.plexus</groupId>
--        <artifactId>plexus-maven-plugin</artifactId>
--        <version>1.3.4</version>
-+        <artifactId>plexus-component-metadata</artifactId>
-         <executions>
-           <execution>
-             <goals>
--              <goal>descriptor</goal>
-+              <goal>generate-metadata</goal>
-             </goals>
-           </execution>
-         </executions>

SPECS/plexus-build-api.spec

@@ -1,45 +1,48 @@
-Name:           plexus-build-api
-Version:        0.0.7
-Release:        22%{?dist}
-Summary:        Plexus Build API
-License:        ASL 2.0
-URL:            https://github.com/sonatype/sisu-build-api
-BuildArch:      noarch
+%bcond_with bootstrap
 
-#Fetched from https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7
-Source0:        sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
+Name:           plexus-build-api
+Version:        1.2.0
+Release:        14%{?dist}
+Summary:        Plexus Build API
+License:        Apache-2.0
+URL:            https://github.com/codehaus-plexus/plexus-build-api
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
+
+Source0:        https://github.com/codehaus-plexus/plexus-build-api/archive/refs/tags/plexus-build-api-%{version}.tar.gz
 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
-Patch1:         0000-Port-to-plexus-utils-3.3.0.patch
-
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.sonatype.spice:spice-parent:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
+%endif
 
 %description
 Plexus Build API
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{name}
 
 %description javadoc
 API documentation for %{name}.
 
 %prep
-%setup -q -n sonatype-sisu-build-api-f1f8849
+%autosetup -p1 -n %{name}-%{name}-%{version}
 cp -p %{SOURCE1} .
 
-%patch0 -p1
-%patch1 -p1
-
-%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
-
 %mvn_file : plexus/%{name}
 
+# Install plexus-build-api-tests as well
+%mvn_package :
+
 %build
 %mvn_build
 
@@ -47,18 +50,105 @@ cp -p %{SOURCE1} .
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE-2.0.txt
+%license LICENSE-2.0.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%license LICENSE-2.0.txt
 
 %changelog
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-13
+- Update javapackages test plan to f42
+
+* Wed Jul 24 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-8
+- Install license files in licensedir instead of docdir
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.2.0-6
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.2.0-5
+- bump of release for for java-21-openjdk as system jdk
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-2
+- Convert License tag to SPDX format
+
+* Mon Aug 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-1
+- Update to upstream version 1.2.0
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.0.7-36
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-34
+- Set explicit Java compiler source/target levels to 1.8
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-33
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Mat Booth <mat.booth@redhat.com> - 0.0.7-29
+- Unecessary restriction on plexus-util, with the patch it's actually still
+  source compatible with older versions
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0.0.7-28
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Nov 25 2019 Fabio Valentini <decathorpe@gmail.com> - 0.0.7-26
+- Remove unnecessary dependency on parent POM.
+
+* 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
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.7-20
 - Escape macros in %%changelog