port to plexus-utils 3.3.0

This commit is contained in:
Fabio Valentini 2019-10-17 11:23:38 +02:00
parent 58da773cd6
commit 45d5bf6793
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
3 changed files with 56 additions and 4 deletions

7
.gitignore vendored
View File

@ -1,3 +1,6 @@
plexus-build-api-0.0.6.tar.gz
sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
/results_*
/*.src.rpm
/plexus-build-api-0.0.6.tar.gz
/sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
/LICENSE-2.0.txt

View File

@ -0,0 +1,42 @@
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
--- 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,7 @@ public class EmptyScanner implements Scanner {
return basedir;
}
+ public void setFilenameComparator(Comparator<String> filenameComparator) {
+ }
+
}
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
--- 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<String> filenameComparator) {
+ }
}
private final Set changedFiles;

View File

@ -1,6 +1,6 @@
Name: plexus-build-api
Version: 0.0.7
Release: 23%{?dist}
Release: 24%{?dist}
Summary: Plexus Build API
License: ASL 2.0
URL: https://github.com/sonatype/sisu-build-api
@ -13,10 +13,13 @@ 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
BuildRequires: maven-local
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0
BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:)
%description
@ -33,6 +36,7 @@ API documentation for %{name}.
cp -p %{SOURCE1} .
%patch0 -p1
%patch1 -p1
%mvn_file : plexus/%{name}
@ -49,6 +53,9 @@ cp -p %{SOURCE1} .
%doc LICENSE-2.0.txt
%changelog
* 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