Fridrich Strba 2019-11-21 15:34:12 +00:00 committed by Git OBS Bridge
parent fddbe6cd3c
commit 9b7f6e3ba3
3 changed files with 52 additions and 1 deletions

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,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 21 15:33:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* plexus-build-api-utils-3.3.0.patch
+ fix build against plexus-utils 3.3.0
-------------------------------------------------------------------
Fri Mar 8 10:35:19 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-build-api
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,6 +27,7 @@ URL: https://github.com/sonatype/sisu-build-api
Source0: sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: %{name}-build.xml
Patch0: plexus-build-api-utils-3.3.0.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
@ -49,6 +50,7 @@ API documentation for %{name}.
%prep
%setup -q -n sonatype-sisu-build-api-f1f8849
%patch0 -p1
cp -p %{SOURCE1} .
cp -p %{SOURCE2} build.xml