openeuler-ci-bot
Gitee
commit
e13a8e0f19
401
0001-Port-maven-scm-to-latest-version-of-plexus-default.patch
Normal file
401
0001-Port-maven-scm-to-latest-version-of-plexus-default.patch
Normal file
@ -0,0 +1,401 @@
|
||||
From a1d0fbb59675906e2a3d84bc6207f536e54dc2c4 Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <mbooth@apache.org>
|
||||
Date: Sun, 25 Aug 2013 14:08:40 +0100
|
||||
Subject: [PATCH 1/3] Port maven-scm to latest version of plexus default
|
||||
|
||||
---
|
||||
.../org/apache/maven/scm/client/cli/MavenScmCli.java | 10 ++++------
|
||||
.../provider/accurev/cli/AccuRevCommandLineTest.java | 7 +++----
|
||||
.../scm/provider/accurev/cli/AccuRevJUnitUtil.java | 6 +++---
|
||||
.../provider/accurev/cli/WorkSpaceConsumerTest.java | 6 +++---
|
||||
.../accurev/command/AbstractAccuRevCommandTest.java | 8 ++++----
|
||||
.../command/blame/AccuRevBlameCommandTckTest.java | 8 +++-----
|
||||
.../changelog/AccuRevChangeLogCommandTckTest.java | 8 +++-----
|
||||
.../command/checkin/AccuRevCheckInCommandTckTest.java | 7 +++----
|
||||
.../checkout/AccuRevCheckoutCommandTckTest.java | 7 +++----
|
||||
.../command/status/AccuRevStatusCommandTckTest.java | 7 +++----
|
||||
.../accurev/command/tag/AccuRevTagCommandTckTest.java | 7 +++----
|
||||
.../command/update/AccuRevUpdateCommandTckTest.java | 7 +++----
|
||||
.../vss/commands/status/VssStatusConsumerTest.java | 3 ++-
|
||||
.../command/changelog/SvnChangeLogConsumerTest.java | 3 ++-
|
||||
14 files changed, 42 insertions(+), 52 deletions(-)
|
||||
|
||||
diff --git a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
|
||||
index 5bff170..c89127b 100644
|
||||
--- a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
|
||||
+++ b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
|
||||
@@ -37,7 +37,7 @@ import org.apache.maven.scm.manager.NoSuchScmProviderException;
|
||||
import org.apache.maven.scm.manager.ScmManager;
|
||||
import org.apache.maven.scm.repository.ScmRepository;
|
||||
import org.apache.maven.scm.repository.ScmRepositoryException;
|
||||
-import org.codehaus.plexus.embed.Embedder;
|
||||
+import org.codehaus.plexus.DefaultPlexusContainer;
|
||||
import org.codehaus.plexus.util.StringUtils;
|
||||
|
||||
/**
|
||||
@@ -47,7 +47,7 @@ import org.codehaus.plexus.util.StringUtils;
|
||||
*/
|
||||
public class MavenScmCli
|
||||
{
|
||||
- private Embedder plexus;
|
||||
+ private DefaultPlexusContainer plexus;
|
||||
|
||||
private ScmManager scmManager;
|
||||
|
||||
@@ -58,9 +58,7 @@ public class MavenScmCli
|
||||
public MavenScmCli()
|
||||
throws Exception
|
||||
{
|
||||
- plexus = new Embedder();
|
||||
-
|
||||
- plexus.start();
|
||||
+ plexus = new DefaultPlexusContainer();
|
||||
|
||||
scmManager = (ScmManager) plexus.lookup( ScmManager.ROLE );
|
||||
}
|
||||
@@ -69,7 +67,7 @@ public class MavenScmCli
|
||||
{
|
||||
try
|
||||
{
|
||||
- plexus.stop();
|
||||
+ plexus.dispose();
|
||||
}
|
||||
catch ( Exception ex )
|
||||
{
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
|
||||
index 0cd220f..c9d5987 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
|
||||
@@ -39,6 +39,7 @@ import org.apache.maven.scm.ScmTestCase;
|
||||
import org.apache.maven.scm.log.ScmLogger;
|
||||
import org.apache.maven.scm.provider.accurev.AccuRev;
|
||||
import org.apache.maven.scm.provider.accurev.AccuRevStat;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.codehaus.plexus.util.Os;
|
||||
import org.codehaus.plexus.util.cli.CommandLineException;
|
||||
import org.codehaus.plexus.util.cli.Commandline;
|
||||
@@ -152,11 +153,9 @@ public class AccuRevCommandLineTest
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
-
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Test
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
|
||||
index ff85158..7f5d6d5 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
|
||||
@@ -21,8 +21,8 @@ package org.apache.maven.scm.provider.accurev.cli;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
-import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
+import java.net.URL;
|
||||
|
||||
import org.apache.maven.scm.log.ScmLogger;
|
||||
import org.apache.maven.scm.manager.ScmManager;
|
||||
@@ -63,9 +63,9 @@ public class AccuRevJUnitUtil
|
||||
return new PlexusLogger( logger );
|
||||
}
|
||||
|
||||
- public static InputStream getPlexusConfiguration()
|
||||
+ public static URL getPlexusConfiguration()
|
||||
{
|
||||
- return AccuRevJUnitUtil.class.getResourceAsStream( "/PlexusTestContainerConfig.xml" );
|
||||
+ return AccuRevJUnitUtil.class.getResource( "/PlexusTestContainerConfig.xml" );
|
||||
}
|
||||
|
||||
}
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
|
||||
index dc950ba..49e060d 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
|
||||
@@ -31,6 +31,7 @@ import java.util.Map;
|
||||
import org.apache.maven.scm.ScmTestCase;
|
||||
import org.apache.maven.scm.log.ScmLogger;
|
||||
import org.apache.maven.scm.provider.accurev.WorkSpace;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -44,10 +45,9 @@ public class WorkSpaceConsumerTest
|
||||
private ScmLogger logger;
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Before
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
|
||||
index 9d7b707..d223928 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
|
||||
@@ -33,6 +33,7 @@ import org.apache.maven.scm.provider.accurev.AccuRevInfo;
|
||||
import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
|
||||
import org.apache.maven.scm.provider.accurev.Stream;
|
||||
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.Before;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InOrder;
|
||||
@@ -45,10 +46,9 @@ public abstract class AbstractAccuRevCommandTest
|
||||
{
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Mock
|
||||
@@ -98,4 +98,4 @@ public abstract class AbstractAccuRevCommandTest
|
||||
return logger;
|
||||
}
|
||||
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
|
||||
index b28d613..a05ca56 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
|
||||
@@ -31,6 +31,7 @@ import org.apache.maven.scm.command.blame.BlameScmResult;
|
||||
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.tck.command.blame.BlameCommandTckTest;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -45,12 +46,9 @@ public class AccuRevBlameCommandTckTest
|
||||
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
-
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
|
||||
index d87e277..82b6f2d 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
|
||||
@@ -42,6 +42,7 @@ import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.repository.ScmRepository;
|
||||
import org.apache.maven.scm.tck.command.changelog.ChangeLogCommandTckTest;
|
||||
import org.hamcrest.Matchers;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -223,11 +224,8 @@ public class AccuRevChangeLogCommandTckTest
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
-
|
||||
}
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java
|
||||
index 9432d35..188b84a 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java
|
||||
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
||||
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -39,11 +40,9 @@ public class AccuRevCheckInCommandTckTest
|
||||
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java
|
||||
index 06932e7..6fe9fd2 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java
|
||||
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
||||
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -44,11 +45,9 @@ public class AccuRevCheckoutCommandTckTest
|
||||
protected AccuRevTckUtil testUtil = new AccuRevTckUtil();
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java
|
||||
index 8655aa8..5cb4414 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java
|
||||
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
||||
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.tck.command.status.StatusCommandTckTest;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -87,11 +88,9 @@ public class AccuRevStatusCommandTckTest
|
||||
}
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
|
||||
index b4e14d6..8d5b691 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
|
||||
@@ -31,6 +31,7 @@ import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.repository.ScmRepository;
|
||||
import org.apache.maven.scm.tck.command.tag.TagCommandTckTest;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -45,11 +46,9 @@ public class AccuRevTagCommandTckTest
|
||||
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java
|
||||
index 1f8397f..2e7cc51 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java
|
||||
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
||||
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
||||
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
||||
import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest;
|
||||
+import org.codehaus.plexus.ContainerConfiguration;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -39,11 +40,9 @@ public class AccuRevUpdateCommandTckTest
|
||||
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
||||
|
||||
@Override
|
||||
- protected InputStream getCustomConfiguration()
|
||||
- throws Exception
|
||||
-
|
||||
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
||||
{
|
||||
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
||||
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
|
||||
index 70febdd..b22897f 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
|
||||
@@ -31,6 +31,7 @@ import org.apache.maven.scm.manager.plexus.PlexusLogger;
|
||||
import org.apache.maven.scm.provider.vss.repository.VssScmProviderRepository;
|
||||
import org.apache.maven.scm.repository.ScmRepository;
|
||||
import org.apache.maven.scm.repository.ScmRepositoryException;
|
||||
+import org.codehaus.plexus.DefaultPlexusContainer;
|
||||
import org.codehaus.plexus.util.IOUtil;
|
||||
|
||||
/**
|
||||
@@ -50,7 +51,7 @@ public class VssStatusConsumerTest
|
||||
{
|
||||
super.setUp();
|
||||
scmManager = getScmManager();
|
||||
- logger = getContainer().getLogger();
|
||||
+ logger = ( (DefaultPlexusContainer) getContainer() ).getLogger();
|
||||
}
|
||||
|
||||
public void testConsumeLine()
|
||||
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
|
||||
index 0c9c455..69b072e 100644
|
||||
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
|
||||
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
|
||||
@@ -24,6 +24,7 @@ import org.apache.maven.scm.ChangeSet;
|
||||
import org.apache.maven.scm.ScmFileStatus;
|
||||
import org.apache.maven.scm.log.DefaultLog;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
+import org.codehaus.plexus.DefaultPlexusContainer;
|
||||
import org.codehaus.plexus.logging.Logger;
|
||||
import org.junit.Assert;
|
||||
|
||||
@@ -57,7 +58,7 @@ public class SvnChangeLogConsumerTest
|
||||
{
|
||||
super.setUp();
|
||||
|
||||
- logger = getContainer().getLogger();
|
||||
+ logger = ( (DefaultPlexusContainer) getContainer() ).getLogger();
|
||||
consumer = new SvnChangeLogConsumer( new DefaultLog(), null );
|
||||
}
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
27
0002-Fix-vss-modello-config.patch
Normal file
27
0002-Fix-vss-modello-config.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From e7cf892e0e00370c9ecbe0125f199db899b62d10 Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <fedora@matbooth.co.uk>
|
||||
Date: Mon, 26 Aug 2013 15:10:29 +0100
|
||||
Subject: [PATCH 2/3] Fix vss modello config
|
||||
|
||||
---
|
||||
maven-scm-providers/maven-scm-provider-vss/pom.xml | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/maven-scm-providers/maven-scm-provider-vss/pom.xml b/maven-scm-providers/maven-scm-provider-vss/pom.xml
|
||||
index ce4a976..37767e1 100644
|
||||
--- a/maven-scm-providers/maven-scm-provider-vss/pom.xml
|
||||
+++ b/maven-scm-providers/maven-scm-provider-vss/pom.xml
|
||||
@@ -64,7 +64,9 @@
|
||||
</executions>
|
||||
<configuration>
|
||||
<version>1.0.0</version>
|
||||
- <model>src/main/mdo/vss-settings.mdo</model>
|
||||
+ <models>
|
||||
+ <model>src/main/mdo/vss-settings.mdo</model>
|
||||
+ </models>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
--
|
||||
2.17.1
|
||||
|
||||
74
0003-Port-to-current-plexus-utils.patch
Normal file
74
0003-Port-to-current-plexus-utils.patch
Normal file
@ -0,0 +1,74 @@
|
||||
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
|
||||
|
||||
BIN
maven-scm-1.10.0-source-release.zip
Normal file
BIN
maven-scm-1.10.0-source-release.zip
Normal file
Binary file not shown.
86
maven-scm.spec
Normal file
86
maven-scm.spec
Normal file
@ -0,0 +1,86 @@
|
||||
Name: maven-scm
|
||||
Version: 1.10.0
|
||||
Release: 4
|
||||
Summary: Provide a common API for doing SCM operations
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/scm
|
||||
BuildArch: noarch
|
||||
Source0: http://archive.apache.org/dist/maven/scm/%{name}-%{version}-source-release.zip
|
||||
Patch0001: 0001-Port-maven-scm-to-latest-version-of-plexus-default.patch
|
||||
Patch0002: 0002-Fix-vss-modello-config.patch
|
||||
Patch0003: 0003-Port-to-current-plexus-utils.patch
|
||||
BuildRequires: maven-local mvn(commons-io:commons-io) mvn(commons-lang:commons-lang) mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat) mvn(org.apache.maven:maven-parent:pom:)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api) mvn(org.apache.maven:maven-settings:2.2.1)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) mvn(org.apache.maven.plugins:maven-invoker-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.shared:file-management) mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.eclipse.jgit:org.eclipse.jgit)
|
||||
BuildRequires: mvn(org.sonatype.plexus:plexus-sec-dispatcher)
|
||||
|
||||
|
||||
%description
|
||||
Maven SCM provides a common API for doing SCM operations.
|
||||
This package Supports Maven plugins and other tools in providing them a common API for doing SCM operations.
|
||||
|
||||
%package test
|
||||
Summary: Test package for maven-scm
|
||||
Requires: maven-scm = %{version}-%{release}
|
||||
|
||||
%description test
|
||||
Test package for maven-scm.
|
||||
|
||||
%package help
|
||||
Summary: Help document for maven-scm
|
||||
Provides: %{name}-javadoc = %{version}-%{release}
|
||||
Obsoletes: %{name}-javadoc < %{version}-%{release}
|
||||
|
||||
%description help
|
||||
Help document formaven-scm.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_change_dep -r :maven-project :maven-compat
|
||||
%pom_remove_dep org.apache.maven.scm:maven-scm-provider-integrity \
|
||||
maven-scm-providers/maven-scm-providers-standard
|
||||
%pom_disable_module maven-scm-provider-integrity maven-scm-providers
|
||||
%pom_remove_dep org.apache.maven.scm:maven-scm-provider-cvsjava maven-scm-client
|
||||
%pom_remove_dep org.apache.maven.scm:maven-scm-provider-cvsjava \
|
||||
maven-scm-providers/maven-scm-providers-standard
|
||||
%pom_disable_module maven-scm-provider-cvsjava maven-scm-providers/maven-scm-providers-cvs
|
||||
sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META-INF/plexus/components.xml
|
||||
%pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-jazz
|
||||
%pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-accurev
|
||||
|
||||
%pom_xpath_replace "pom:plugin[pom:artifactId='maven-assembly-plugin']/pom:configuration/pom:descriptorId" "
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>" maven-scm-client
|
||||
|
||||
%mvn_package :%{name}-provider-cvstest test
|
||||
%mvn_package :%{name}-provider-gittest test
|
||||
%mvn_package :%{name}-provider-svntest test
|
||||
%mvn_package :%{name}-test test
|
||||
|
||||
%build
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%files test -f .mfiles-test
|
||||
|
||||
%files help -f .mfiles-javadoc
|
||||
|
||||
%changelog
|
||||
* Fri Dec 13 2019 shijian <shijian16@huawei.com> - 1.10.0-4
|
||||
- Package init
|
||||
Loading…
x
Reference in New Issue
Block a user