From 518901f37cbd0d17bce44a7499c99c7b5729ba14 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Aug 12 2016 11:06:01 +0000 Subject: Update to upstream version 1.9.5 --- diff --git a/.gitignore b/.gitignore index b475db7..737803f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /maven-scm-1.9.1-source-release.zip /maven-scm-1.9.2-source-release.zip /maven-scm-1.9.4-source-release.zip +/maven-scm-1.9.5-source-release.zip diff --git a/0001-Port-maven-scm-to-latest-version-of-plexus-default-c.patch b/0001-Port-maven-scm-to-latest-version-of-plexus-default-c.patch new file mode 100644 index 0000000..a54c0ed --- /dev/null +++ b/0001-Port-maven-scm-to-latest-version-of-plexus-default-c.patch @@ -0,0 +1,448 @@ +From e32b2eb53532528d9b0d3c1232d02a982a60cb20 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Sun, 25 Aug 2013 14:08:40 +0100 +Subject: [PATCH 1/3] Port maven-scm to latest version of plexus default + container + +--- + .../main/java/org/apache/maven/scm/client/cli/MavenScmCli.java | 10 ++++------ + maven-scm-plugin/pom.xml | 6 +++--- + .../maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java | 7 +++---- + .../maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java | 6 +++--- + .../maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java | 6 +++--- + .../provider/accurev/command/AbstractAccuRevCommandTest.java | 8 ++++---- + .../accurev/command/blame/AccuRevBlameCommandTckTest.java | 8 +++----- + .../command/changelog/AccuRevChangeLogCommandTckTest.java | 8 +++----- + .../accurev/command/checkin/AccuRevCheckInCommandTckTest.java | 7 +++---- + .../command/checkout/AccuRevCheckoutCommandTckTest.java | 7 +++---- + .../accurev/command/status/AccuRevStatusCommandTckTest.java | 7 +++---- + .../provider/accurev/command/tag/AccuRevTagCommandTckTest.java | 7 +++---- + .../accurev/command/update/AccuRevUpdateCommandTckTest.java | 7 +++---- + .../provider/vss/commands/status/VssStatusConsumerTest.java | 3 ++- + .../svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java | 3 ++- + pom.xml | 2 +- + 16 files changed, 46 insertions(+), 56 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 c1a08bf..b99d798 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-plugin/pom.xml b/maven-scm-plugin/pom.xml +index 2dee360..21c0f3e 100644 +--- a/maven-scm-plugin/pom.xml ++++ b/maven-scm-plugin/pom.xml +@@ -41,7 +41,7 @@ + Maven Plugin that allows accessing different SCMs. + + +- 2.2.1 ++ 3.0.5 + 3.2 + + +@@ -52,7 +52,7 @@ + + + org.apache.maven +- maven-project ++ maven-compat + ${mavenVersion} + + +@@ -121,7 +121,7 @@ + + org.apache.maven.plugin-testing + maven-plugin-testing-harness +- 1.2 ++ 2.0 + test + + +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 f36c862..d0785b5 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 bae8bd9..cfff689 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 e8222f2..4b169bf 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 718f7e8..148dad4 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 f8ea542..6f7ef3d 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 ae61f80..2caabf2 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 35861a6..2d63fd3 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 ad2a413..69f38cf 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 4691138..50c178d 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 64a47b5..bd870b5 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 ebd2f2f..ffca109 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 dbedbaf..c404445 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 7ed4403..6c22cde 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 ); + } + +diff --git a/pom.xml b/pom.xml +index 8c25c8f..c979c94 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -259,7 +259,7 @@ + + org.codehaus.plexus + plexus-container-default +- 1.0-alpha-9 ++ 1.5.5 + + + org.codehaus.plexus +-- +2.7.4 + diff --git a/0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch b/0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch deleted file mode 100644 index a4e296e..0000000 --- a/0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch +++ /dev/null @@ -1,447 +0,0 @@ -From 0db1ffa121389a9de38b350119aafe8a605752de Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Sun, 25 Aug 2013 14:08:40 +0100 -Subject: [PATCH] port maven-scm to latest version of plexus default container - ---- - .../main/java/org/apache/maven/scm/client/cli/MavenScmCli.java | 10 ++++------ - maven-scm-plugin/pom.xml | 6 +++--- - .../maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java | 7 +++---- - .../maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java | 6 +++--- - .../maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java | 6 +++--- - .../provider/accurev/command/AbstractAccuRevCommandTest.java | 8 ++++---- - .../accurev/command/blame/AccuRevBlameCommandTckTest.java | 8 +++----- - .../command/changelog/AccuRevChangeLogCommandTckTest.java | 8 +++----- - .../accurev/command/checkin/AccuRevCheckInCommandTckTest.java | 7 +++---- - .../command/checkout/AccuRevCheckoutCommandTckTest.java | 7 +++---- - .../accurev/command/status/AccuRevStatusCommandTckTest.java | 7 +++---- - .../provider/accurev/command/tag/AccuRevTagCommandTckTest.java | 7 +++---- - .../accurev/command/update/AccuRevUpdateCommandTckTest.java | 7 +++---- - .../provider/vss/commands/status/VssStatusConsumerTest.java | 3 ++- - .../svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java | 3 ++- - pom.xml | 2 +- - 16 files changed, 46 insertions(+), 56 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 c1a08bf..b99d798 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-plugin/pom.xml b/maven-scm-plugin/pom.xml -index f8c0e08..004ce33 100644 ---- a/maven-scm-plugin/pom.xml -+++ b/maven-scm-plugin/pom.xml -@@ -41,7 +41,7 @@ - Maven Plugin that allows accessing different SCMs. - - -- 2.2.1 -+ 3.0.5 - 3.2 - - -@@ -52,7 +52,7 @@ - - - org.apache.maven -- maven-project -+ maven-compat - ${mavenVersion} - - -@@ -121,7 +121,7 @@ - - org.apache.maven.plugin-testing - maven-plugin-testing-harness -- 1.2 -+ 2.0 - test - - -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 f36c862..d0785b5 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 bae8bd9..cfff689 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 e8222f2..4b169bf 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 718f7e8..148dad4 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 f8ea542..6f7ef3d 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 ae61f80..2caabf2 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 35861a6..2d63fd3 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 ad2a413..69f38cf 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 4691138..50c178d 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 64a47b5..bd870b5 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 ebd2f2f..ffca109 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 dbedbaf..c404445 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 7ed4403..6c22cde 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 ); - } - -diff --git a/pom.xml b/pom.xml -index 57fec4e..076b53f 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -253,7 +253,7 @@ - - org.codehaus.plexus - plexus-container-default -- 1.0-alpha-9 -+ 1.5.5 - - - org.codehaus.plexus --- -2.1.0 - diff --git a/0002-Fix-vss-modello-config.patch b/0002-Fix-vss-modello-config.patch new file mode 100644 index 0000000..90ec6fd --- /dev/null +++ b/0002-Fix-vss-modello-config.patch @@ -0,0 +1,27 @@ +From 1210b6eea5c3b7e119ba3bf65c0c457140fde1b5 Mon Sep 17 00:00:00 2001 +From: Mat Booth +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 7647c2a..03993ab 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 @@ + + + 1.0.0 +- src/main/mdo/vss-settings.mdo ++ ++ src/main/mdo/vss-settings.mdo ++ + + + +-- +2.7.4 + diff --git a/0003-Compatibility-with-JGit-4.0.0.patch b/0003-Compatibility-with-JGit-4.0.0.patch new file mode 100644 index 0000000..8c3de78 --- /dev/null +++ b/0003-Compatibility-with-JGit-4.0.0.patch @@ -0,0 +1,122 @@ +From 7d16addb8a6b17871f1ce9be90fda8f359ca45bb Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 13 Jul 2015 09:09:08 +0200 +Subject: [PATCH 3/3] Compatibility with JGit 4.0.0 + +--- + .../org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java | 2 +- + .../maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java | 4 ++-- + .../scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java | 4 ++-- + .../maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java | 2 +- + .../maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java | 4 ++-- + .../command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java +index d530d9c..b6900b4 100644 +--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java ++++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java +@@ -243,7 +243,7 @@ public class JGitUtils + { + list.add( new ScmFile( diff.getNewPath(), ScmFileStatus.CHECKED_IN ) ); + } +- rw.release(); ++ rw.close(); + } + return list; + } +diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java +index 4b0565e..7fd7c35 100644 +--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java ++++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java +@@ -99,7 +99,7 @@ public class JGitBranchCommand + // search for the tagged files + final RevWalk revWalk = new RevWalk( git.getRepository() ); + RevCommit commit = revWalk.parseCommit( branchResult.getObjectId() ); +- revWalk.release(); ++ revWalk.close(); + + final TreeWalk walk = new TreeWalk( git.getRepository() ); + walk.reset(); // drop the first empty tree, which we do not need here +@@ -111,7 +111,7 @@ public class JGitBranchCommand + { + files.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); + } +- walk.release(); ++ walk.close(); + + return new BranchScmResult( "JGit branch", files ); + +diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java +index 178230c..8421740 100644 +--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java ++++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java +@@ -167,7 +167,7 @@ public class JGitCheckOutCommand + + RevWalk revWalk = new RevWalk( git.getRepository() ); + RevCommit commit = revWalk.parseCommit( git.getRepository().resolve( Constants.HEAD ) ); +- revWalk.release(); ++ revWalk.close(); + + final TreeWalk walk = new TreeWalk( git.getRepository() ); + walk.reset(); // drop the first empty tree, which we do not need here +@@ -179,7 +179,7 @@ public class JGitCheckOutCommand + { + listedFiles.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); + } +- walk.release(); ++ walk.close(); + + getLogger().debug( "current branch: " + git.getRepository().getBranch() ); + +diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java +index f640b03..d699a44 100644 +--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java ++++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java +@@ -131,7 +131,7 @@ public class JGitDiffCommand + } + finally + { +- or.release(); ++ or.close(); + } + } + } +diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java +index 4957a29..2083a4b 100644 +--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java ++++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java +@@ -97,7 +97,7 @@ public class JGitTagCommand + // search for the tagged files + RevWalk revWalk = new RevWalk( git.getRepository() ); + RevCommit commit = revWalk.parseCommit( tagRef.getObjectId() ); +- revWalk.release(); ++ revWalk.close(); + + final TreeWalk walk = new TreeWalk( git.getRepository() ); + walk.reset(); // drop the first empty tree, which we do not need here +@@ -109,7 +109,7 @@ public class JGitTagCommand + { + taggedFiles.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); + } +- walk.release(); ++ walk.close(); + + return new TagScmResult( "JGit tag", taggedFiles ); + } +diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java +index 8aeccce..b391e91 100644 +--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java ++++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java +@@ -270,7 +270,7 @@ public class JGitCheckInCommandCommitterAuthorTckTest + RevWalk rw = new RevWalk( repository ); + AnyObjectId headId = repository.resolve( Constants.HEAD ); + RevCommit head = rw.parseCommit( headId ); +- rw.release(); ++ rw.close(); + return head; + } + +-- +2.7.4 + diff --git a/maven-scm-jgit-4-compat.patch b/maven-scm-jgit-4-compat.patch deleted file mode 100644 index e4ff7ea..0000000 --- a/maven-scm-jgit-4-compat.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java -index f22a139..ea40dcf 100644 ---- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java -+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java -@@ -218,7 +218,7 @@ public class JGitUtils - { - list.add( new ScmFile( diff.getNewPath(), ScmFileStatus.CHECKED_IN ) ); - } -- rw.release(); -+ rw.close(); - } - return list; - } -diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java -index b42afe6..087580a 100644 ---- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java -+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java -@@ -99,7 +99,7 @@ public class JGitBranchCommand - // search for the tagged files - final RevWalk revWalk = new RevWalk( git.getRepository() ); - RevCommit commit = revWalk.parseCommit( branchResult.getObjectId() ); -- revWalk.release(); -+ revWalk.close(); - - final TreeWalk walk = new TreeWalk( git.getRepository() ); - walk.reset(); // drop the first empty tree, which we do not need here -@@ -111,7 +111,7 @@ public class JGitBranchCommand - { - files.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); - } -- walk.release(); -+ walk.close(); - - return new BranchScmResult( "JGit branch", files ); - -diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java -index 8d4931b..3382825 100644 ---- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java -+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java -@@ -166,7 +166,7 @@ public class JGitCheckOutCommand - - RevWalk revWalk = new RevWalk( git.getRepository() ); - RevCommit commit = revWalk.parseCommit( git.getRepository().resolve( Constants.HEAD ) ); -- revWalk.release(); -+ revWalk.close(); - - final TreeWalk walk = new TreeWalk( git.getRepository() ); - walk.reset(); // drop the first empty tree, which we do not need here -@@ -178,7 +178,7 @@ public class JGitCheckOutCommand - { - listedFiles.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); - } -- walk.release(); -+ walk.close(); - - getLogger().debug( "current branch: " + git.getRepository().getBranch() ); - -diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java -index a543ef8..9e5a14f 100644 ---- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java -+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java -@@ -131,7 +131,7 @@ public class JGitDiffCommand - } - finally - { -- or.release(); -+ or.close(); - } - } - } -diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java -index a66992a..379db59 100644 ---- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java -+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java -@@ -97,7 +97,7 @@ public class JGitTagCommand - // search for the tagged files - RevWalk revWalk = new RevWalk( git.getRepository() ); - RevCommit commit = revWalk.parseCommit( tagRef.getObjectId() ); -- revWalk.release(); -+ revWalk.close(); - - final TreeWalk walk = new TreeWalk( git.getRepository() ); - walk.reset(); // drop the first empty tree, which we do not need here -@@ -109,7 +109,7 @@ public class JGitTagCommand - { - taggedFiles.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); - } -- walk.release(); -+ walk.close(); - - return new TagScmResult( "JGit tag", taggedFiles ); - } -diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java -index 10fdb85..0a5858d 100644 ---- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java -+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java -@@ -246,7 +246,7 @@ public class JGitCheckInCommandCommitterAuthorTckTest - RevWalk rw = new RevWalk( repository ); - AnyObjectId headId = repository.resolve( Constants.HEAD ); - RevCommit head = rw.parseCommit( headId ); -- rw.release(); -+ rw.close(); - return head; - } - diff --git a/maven-scm.spec b/maven-scm.spec index 2d2c374..2fa00aa 100644 --- a/maven-scm.spec +++ b/maven-scm.spec @@ -29,22 +29,22 @@ # Name: maven-scm -Version: 1.9.4 -Release: 5%{?dist} +Version: 1.9.5 +Release: 1%{?dist} Summary: Common API for doing SCM operations License: ASL 2.0 URL: http://maven.apache.org/scm BuildArch: noarch -Source0: http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: http://archive.apache.org/dist/maven/scm/%{name}-%{version}-source-release.zip # Patch to migrate to new plexus default container # This has been sent upstream: https://issues.apache.org/jira/browse/SCM-731 -Patch6: 0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch +Patch1: 0001-Port-maven-scm-to-latest-version-of-plexus-default-c.patch # Workaround upstream's workaround for a modello bug, see: https://issues.apache.org/jira/browse/SCM-518 -Patch7: vss-modello-config.patch +Patch2: 0002-Fix-vss-modello-config.patch # Compatibility with JGit 4.x, not yet forwarded -Patch8: %{name}-jgit-4-compat.patch +Patch3: 0003-Compatibility-with-JGit-4.0.0.patch BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) @@ -86,9 +86,10 @@ Javadoc for %{name}. %prep %setup -q -%patch6 -p1 -b.orig -%patch7 -p0 -b.orig -%patch8 -p1 + +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 # Remove unnecessary animal sniffer %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin @@ -108,9 +109,6 @@ sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META %pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-jazz %pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-accurev -# Accepted upstream: https://issues.apache.org/jira/browse/SCM-786 -%pom_add_dep junit:junit:4.11 maven-scm-test - # Put TCK tests into a separate sub-package %mvn_package :%{name}-provider-cvstest test %mvn_package :%{name}-provider-gittest test @@ -136,6 +134,9 @@ sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META %doc LICENSE NOTICE %changelog +* Fri Aug 12 2016 Michael Simacek - 1.9.5-1 +- Update to upstream version 1.9.5 + * Wed Jun 15 2016 Mikolaj Izdebski - 1.9.4-5 - Regenerate build-requires diff --git a/sources b/sources index 3945834..3034d5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd7c3aab47ede7cdd18b31af57945bfa maven-scm-1.9.4-source-release.zip +39772b149a348baace73c9e633ae927e maven-scm-1.9.5-source-release.zip diff --git a/vss-modello-config.patch b/vss-modello-config.patch deleted file mode 100644 index cc60c53..0000000 --- a/vss-modello-config.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- maven-scm-providers/maven-scm-provider-vss/pom.xml.orig 2013-08-25 15:14:45.038548606 +0100 -+++ maven-scm-providers/maven-scm-provider-vss/pom.xml 2013-08-25 15:15:15.624655116 +0100 -@@ -64,7 +64,9 @@ - - - 1.0.0 -- src/main/mdo/vss-settings.mdo -+ -+ src/main/mdo/vss-settings.mdo -+ - - -