75 lines
3.1 KiB
Diff
75 lines
3.1 KiB
Diff
From 5fd9728cd9acdc5b78c57f49900550cccae5f189 Mon Sep 17 00:00:00 2001
|
|
From: Michael Simacek <msimacek@redhat.com>
|
|
Date: Mon, 2 Jul 2018 11:53:07 +0200
|
|
Subject: [PATCH 3/3] Port to current plexus-utils
|
|
|
|
---
|
|
.../scm/provider/accurev/cli/CommandOutputConsumer.java | 3 ++-
|
|
.../maven/scm/provider/accurev/cli/FileConsumerTest.java | 8 ++++----
|
|
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
|
|
index 80abd4e..9cc5f86 100644
|
|
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
|
|
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
|
|
@@ -19,6 +19,7 @@ package org.apache.maven.scm.provider.accurev.cli;
|
|
* under the License.
|
|
*/
|
|
|
|
+import java.io.IOException;
|
|
import org.apache.maven.scm.log.ScmLogger;
|
|
import org.codehaus.plexus.util.cli.StreamConsumer;
|
|
|
|
@@ -39,7 +40,7 @@ public class CommandOutputConsumer
|
|
this.logger = logger;
|
|
}
|
|
|
|
- public void consumeLine( String line )
|
|
+ public void consumeLine( String line ) throws IOException
|
|
{
|
|
if ( logger.isDebugEnabled() )
|
|
{
|
|
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java
|
|
index ef3bb3f..626f12b 100644
|
|
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java
|
|
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/FileConsumerTest.java
|
|
@@ -28,7 +28,7 @@ public class FileConsumerTest
|
|
{
|
|
|
|
@Test
|
|
- public void testConsumeAdd()
|
|
+ public void testConsumeAdd() throws Exception
|
|
{
|
|
List<File> extractedFiles = new ArrayList<File>();
|
|
|
|
@@ -43,7 +43,7 @@ public class FileConsumerTest
|
|
}
|
|
|
|
@Test
|
|
- public void testConsumeUpdate()
|
|
+ public void testConsumeUpdate() throws Exception
|
|
{
|
|
List<File> extractedFiles = new ArrayList<File>();
|
|
StreamConsumer consumer = new FileConsumer( extractedFiles, FileConsumer.UPDATE_PATTERN );
|
|
@@ -59,7 +59,7 @@ public class FileConsumerTest
|
|
}
|
|
|
|
@Test
|
|
- public void testConsumePromoted()
|
|
+ public void testConsumePromoted() throws Exception
|
|
{
|
|
List<File> extractedFiles = new ArrayList<File>();
|
|
|
|
@@ -74,7 +74,7 @@ public class FileConsumerTest
|
|
}
|
|
|
|
@Test
|
|
- public void testConsumeRemoved()
|
|
+ public void testConsumeRemoved() throws Exception
|
|
{
|
|
List<File> extractedFiles = new ArrayList<File>();
|
|
StreamConsumer consumer = new FileConsumer( extractedFiles, FileConsumer.DEFUNCT_PATTERN );
|
|
--
|
|
2.17.1
|
|
|