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

@@ -0,0 +1,54 @@
+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
+

SPECS/plexus-build-api.spec

@@ -1,6 +1,6 @@
 Name:           plexus-build-api
 Version:        0.0.7
-Release:        20%{?dist}
+Release:        22%{?dist}
 Summary:        Plexus Build API
 License:        ASL 2.0
 URL:            https://github.com/sonatype/sisu-build-api
@@ -12,6 +12,7 @@ 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
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
@@ -33,6 +34,9 @@ API documentation for %{name}.
 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}
 
@@ -49,6 +53,12 @@ cp -p %{SOURCE1} .
 %doc LICENSE-2.0.txt
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-22
+- Mass rebuild for javapackages-tools 201902
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-21
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.0.7-20
 - Escape macros in %%changelog