diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cddca47 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-scm-1.8.1-source-release.zip diff --git a/.rh-maven33-maven-scm.metadata b/.rh-maven33-maven-scm.metadata new file mode 100644 index 0000000..5a43feb --- /dev/null +++ b/.rh-maven33-maven-scm.metadata @@ -0,0 +1 @@ +980186753c84d6b878c017836e9535c819b17b97 SOURCES/maven-scm-1.8.1-source-release.zip diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch b/SOURCES/0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch new file mode 100644 index 0000000..168c57d --- /dev/null +++ b/SOURCES/0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch @@ -0,0 +1,447 @@ +From 218c099d3ec2ca985df23c6ab5eba8cb04097e88 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 | 8 ++++---- + .../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, 47 insertions(+), 57 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 2e337f8..79b22ea 100644 +--- a/maven-scm-plugin/pom.xml ++++ b/maven-scm-plugin/pom.xml +@@ -41,14 +41,14 @@ + Maven Plugin that allows accessing different SCMs. + + +- 2.0.6 +- 2.9 ++ 3.0.5 ++ 3.2 + + + + + org.apache.maven +- maven-project ++ maven-compat + ${mavenVersion} + + +@@ -110,7 +110,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 24aa50c..805010b 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.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.changelog.ChangeLogCommandTckTest; ++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 4edd46e..958faea 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -257,7 +257,7 @@ + + org.codehaus.plexus + plexus-container-default +- 1.0-alpha-9 ++ 1.5.5 + + + org.codehaus.plexus +-- +1.8.3.1 + diff --git a/SOURCES/vss-modello-config.patch b/SOURCES/vss-modello-config.patch new file mode 100644 index 0000000..597dcd2 --- /dev/null +++ b/SOURCES/vss-modello-config.patch @@ -0,0 +1,13 @@ +--- 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 ++ + + + diff --git a/SPECS/maven-scm.spec b/SPECS/maven-scm.spec new file mode 100644 index 0000000..49504d9 --- /dev/null +++ b/SPECS/maven-scm.spec @@ -0,0 +1,360 @@ +%global pkg_name maven-scm +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +Name: %{?scl_prefix}%{pkg_name} +Version: 1.8.1 +Release: 2.13%{?dist} +Summary: Common API for doing SCM operations +License: ASL 2.0 +URL: http://maven.apache.org/scm + +Source0: http://repo1.maven.org/maven2/org/apache/maven/scm/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip + +# Patch to migrate to new plexus default container +# This has been sent upstream: http://jira.codehaus.org/browse/SCM-731 +Patch6: 0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch +# Workaround upstream's workaround for a modello bug, see: http://jira.codehaus.org/browse/SCM-518 +Patch7: vss-modello-config.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix_java_common}javapackages-tools +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}modello +BuildRequires: %{?scl_prefix}plexus-utils >= 1.5.6 +BuildRequires: %{?scl_prefix}maven-plugin-plugin +BuildRequires: %{?scl_prefix}maven-plugin-testing-harness +BuildRequires: bzr +BuildRequires: subversion +BuildRequires: %{?scl_prefix}plexus-containers-component-metadata +BuildRequires: %{?scl_prefix}plexus-containers-container-default +BuildRequires: %{?scl_prefix}plexus-classworlds + +Requires: %{?scl_prefix}modello +Requires: %{?scl_prefix}velocity >= 1.4 + +%description +Maven SCM supports Maven plugins (e.g. maven-release-plugin) and other +tools (e.g. Continuum) in providing them a common API for doing SCM operations. + +%package test +Summary: Tests for %{pkg_name} +Requires: %{name} = %{version}-%{release} + +%description test +Tests for %{pkg_name}. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +Javadoc for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%patch6 -p1 -b.orig +%patch7 -p0 -b.orig + +# Remove unnecessary animal sniffer +%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin + +# Remove providers-integrity from build (we don't have mks-api) +%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 + +# Partially remove cvs support for removal of netbeans-cvsclient +# It still works with cvsexe provider +%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 + +# Tests are skipped anyways, so remove dependency on mockito. +%pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-jazz +%pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-accurev + +# Put TCK tests into a separate sub-package +%mvn_package :%{pkg_name}-provider-cvstest test +%mvn_package :%{pkg_name}-provider-gittest test +%mvn_package :%{pkg_name}-provider-svntest test +%mvn_package :%{pkg_name}-test test +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +# Don't build and unit run tests because +# * accurev tests need porting to a newer hamcrest +# * vss tests fail with the version of junit in fedora +%mvn_build -f +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%doc LICENSE NOTICE +%dir %{_mavenpomdir}/%{pkg_name} +%dir %{_javadir}/%{pkg_name} + +%files test -f .mfiles-test +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Mon Feb 08 2016 Michal Srb - 1.8.1-2.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 1.8.1-2.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 1.8.1-2.11 +- maven33 rebuild + +* Thu Jan 15 2015 Mikolaj Izdebski - 1.8.1-2.10 +- Add directory ownership on %%{_mavenpomdir} subdir + +* Tue Jan 13 2015 Michael Simacek - 1.8.1-2.9 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 1.8.1-2.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 1.8.1-2.7 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.8.1-2.6 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1.8.1-2.5 +- Mass rebuild 2014-02-18 + +* Mon Feb 17 2014 Mikolaj Izdebski - 1.8.1-2.4 +- Add missing BR: maven-plugin-plugin + +* Fri Feb 14 2014 Mikolaj Izdebski - 1.8.1-2.3 +- SCL-ize build-requires and requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 1.8.1-2.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 1.8.1-2.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 1.8.1-2 +- Mass rebuild 2013-12-27 + +* Sun Aug 25 2013 Mat Booth - 1.8.1-1 +- Fix removal of cvs java provider, rhbz #962273 +- Update to latest upstream +- Drop upstreamed patches + +* Sat Aug 24 2013 Mat Booth - 1.7-10 +- Remove use of deprecated macros, rhbz #992204 +- Don't ship test jars in main package +- Install NOTICE file + +* Sat Aug 24 2013 Mat Booth - 1.7-9 +- Add patch to build against newer plexus default container, rhbz #996199 +- Drop unneeded BRs + +* Sat Aug 03 2013 Fedora Release Engineering - 1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 29 2013 Tomas Radej - 1.7-8 +- Remove dep on mockito +- Remove MavenScmCli as plexus-container-default is not present +- Remove maven-assembly-plugin's configuration as it uses MavenScmCli + +* Fri Jun 28 2013 Mikolaj Izdebski - 1.7-7 +- Remove BR: maven2-common-poms + +* Fri Jun 28 2013 Mikolaj Izdebski - 1.7-7 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.7-5 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 15 2012 Mikolaj Izdebski - 1.7-4 +- Install LICENSE file + +* Tue Aug 21 2012 Stanislav Ochotnicky - 1.7-3 +- Remove unneeded mockito build dependency +- Use new pom_ macros instead of patches + +* Thu Jul 19 2012 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 26 2012 Tomas Radej - 1.7-1 +- Updated to latest upstream version +- plexus-maven-plugin -> plexus-component-metadata + +* Mon Apr 23 2012 Guido Grazioli - 1.6-3 +- Fix typo + +* Mon Apr 23 2012 Guido Grazioli - 1.6-2 +- Remove -client-with-dependencies jar to get rid of duplicate libraries +- Switch off maven execution debug output + +* Mon Apr 09 2012 Guido Grazioli - 1.6-1 +- Update to 1.6 release +- Fix typo in description +- Remove unused patches 001 (mockito now available), 004 and 006 +- Update patch 007 (plexus-containers-component-metadata) +- Move source encoding setting to separate patch + +* Fri Feb 3 2012 Stanislav Ochotnicky - 1.5-5 +- Remove cvsjava provider to get rid of netbeans-cvsclient dep + +* Fri Jan 13 2012 Fedora Release Engineering - 1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Nov 18 2011 Bruno Wolff III 1.5-3 +- Fix issue with bad requires by maven-scm-test + +* Tue Nov 15 2011 Jaromir Capik 1.5-2 +- Migration from plexus-maven-plugin to plexus-containers-component-metadata + +* Tue Apr 5 2011 Alexander Kurtakov 0:1.5-1 +- Update to upstream 1.5 release. +- Build with maven 3. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 11 2011 Stanislav Ochotnicky - 0:1.4-5 +- Drop buildroot definition +- Use mavenpomdir macro +- Make jars versionless (for real) + +* Mon Jan 3 2011 Alexander Kurtakov 0:1.4-4 +- Drop tomcat BRs. +- No more versioned jar and javadoc. + +* Wed Sep 08 2010 Guido Grazioli 0:1.4-2 +- Fix BR +- Remove unused patch + +* Tue Sep 07 2010 Guido Grazioli 0:1.4-1 +- Update to upstream 1.4 (#626455) +- Require netbeans-cvsclient instead of netbeans-ide (#572165) + +* Mon May 10 2010 Guido Grazioli 0:1.2-6 +- Link netbeans-lib-cvsclient jar in the right place. +- Switch to xz compression. +- Sanitize files owned. +- Use %%global. + +* Mon Feb 8 2010 Alexander Kurtakov 0:1.2-5 +- Fix BR/Rs for netbeans-ide[version] to netbeans-ide rename. + +* Thu Sep 17 2009 Alexander Kurtakov 0:1.2-4 +- Fix maven-scm-plugin depmap. + +* Sat Sep 12 2009 Alexander Kurtakov 0:1.2-3 +- BR maven-surefire-provider-junit. +- BR plexus-maven-plugin. +- BR maven2-plugin-assembly. + +* Sat Sep 12 2009 Alexander Kurtakov 0:1.2-2 +- Add doxia-sitetools BR. + +* Sat Sep 12 2009 Alexander Kurtakov 0:1.2-1 +- Update to upstream 1.2. + +* Tue Sep 01 2009 Andrew Overholt 1.0-0.5.rc1.2 +- Bump release + +* Tue Sep 01 2009 Andrew Overholt 1.0-0.5.rc1.1 +- Add tomcat5, tomcat5-servlet-2.4-api, + maven-shared-plugin-testing-harness, and tomcat5-jsp-2.0-api BRs + +* Mon Aug 31 2009 Andrew Overholt 1.0-0.5.rc1 +- 1.0 RC1 (courtesy Deepak Bhole) +- Remove gcj support +- Add netbeans-ide11 requirement +- Change name on surefire plugin BR + +* Sat Jul 25 2009 Fedora Release Engineering - 0:1.0-0.4.b3.1.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Mar 23 2009 Deepak Bhole - 0:1.0-0.3.b3.1.7 +- Remove ppc64 arch exclusion + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-0.3.b3.1.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 1.0-0.2.b3.1.6 +- drop repotag + +* Thu Jun 26 2008 Deepak Bhole 1.0-0.2.b3.1jpp.5 +- Fix mapping for the scm plugin + +* Thu May 29 2008 Tom "spot" Callaway 1.0-0.2.b3.1jpp.4 +- fix license tag + +* Thu Feb 28 2008 Deepak Bhole 1.0-0.2.b3.1jpp.3 +- Rebuild + +* Fri Sep 21 2007 Deepak Bhole 0:1.0-0.1.b3.2jpp.2 +- Rebuild with excludearch for ppc64 + +* Tue Feb 27 2007 Tania Bento 0:1.0-0.1.b3.2jpp.1 +- Fixed %%Release. +- Fixed %%BuildRoot. +- Removed %%Vendor. +- Removed %%Distribution. +- Removed %%post and %%postun sections for javadoc. +- Fixed instructions on how to generate source drop. +- Marked documentation files as %%doc in %%files section. +- Fixed %%Summary. +- Fixed %%description. + +* Tue Oct 17 2006 Deepak Bhole - 0:1.0-0.b3.2jpp +- Update for maven 9jpp. + +* Tue Sep 18 2006 Deepak Bhole - 0:1.0-0.b3.1jpp +- Initial build