mizdebsk pushed to maven-scm (master). "Update to upstream version 1.9.4"

[notifications at fedoraproject.org]

>From 31abd4c4e6ccf8622d8ad441c49163b60b2d8ba7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 2 Apr 2015 06:47:59 +0200
Subject: Update to upstream version 1.9.4


diff --git a/.gitignore b/.gitignore
index 22b3603..b475db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /maven-scm-1.9-source-release.zip
 /maven-scm-1.9.1-source-release.zip
 /maven-scm-1.9.2-source-release.zip
+/maven-scm-1.9.4-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
index 16f05f2..a4e296e 100644
--- 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
@@ -1,4 +1,4 @@
-From 8ba1b5b97c0933c7d9929485188673efd8bc8f9b Mon Sep 17 00:00:00 2001
+From 0db1ffa121389a9de38b350119aafe8a605752de Mon Sep 17 00:00:00 2001
 From: Mat Booth <mbooth at apache.org>
 Date: Sun, 25 Aug 2013 14:08:40 +0100
 Subject: [PATCH] port maven-scm to latest version of plexus default container
@@ -65,18 +65,19 @@ index c1a08bf..b99d798 100644
          catch ( Exception ex )
          {
 diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
-index 9e83331..4527ce5 100644
+index f8c0e08..004ce33 100644
 --- a/maven-scm-plugin/pom.xml
 +++ b/maven-scm-plugin/pom.xml
-@@ -41,14 +41,14 @@
+@@ -41,7 +41,7 @@
    <description>Maven Plugin that allows accessing different SCMs.</description>
  
    <properties>
--    <mavenVersion>2.0.6</mavenVersion>
+-    <mavenVersion>2.2.1</mavenVersion>
 +    <mavenVersion>3.0.5</mavenVersion>
      <mavenPluginVersion>3.2</mavenPluginVersion>
    </properties>
-   
+ 
+@@ -52,7 +52,7 @@
    <dependencies>
      <dependency>
        <groupId>org.apache.maven</groupId>
@@ -85,7 +86,7 @@ index 9e83331..4527ce5 100644
        <version>${mavenVersion}</version>
      </dependency>
      <dependency>
-@@ -117,7 +117,7 @@
+@@ -121,7 +121,7 @@
      <dependency>
        <groupId>org.apache.maven.plugin-testing</groupId>
        <artifactId>maven-plugin-testing-harness</artifactId>
@@ -231,13 +232,13 @@ index f8ea542..6f7ef3d 100644
  
      @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
+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.cli.AccuRevJUnitUtil;
- import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
+@@ -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;
@@ -429,10 +430,10 @@ index 7ed4403..6c22cde 100644
      }
  
 diff --git a/pom.xml b/pom.xml
-index dd956d8..2028b1d 100644
+index 57fec4e..076b53f 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -255,7 +255,7 @@
+@@ -253,7 +253,7 @@
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
          <artifactId>plexus-container-default</artifactId>
@@ -442,5 +443,5 @@ index dd956d8..2028b1d 100644
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
 -- 
-1.8.4.2
+2.1.0
 
diff --git a/maven-scm.spec b/maven-scm.spec
index 3b9b84c..c73fc68 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           maven-scm
-Version:        1.9.2
-Release:        2%{?dist}
+Version:        1.9.4
+Release:        1%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 URL:            http://maven.apache.org/scm
@@ -127,6 +127,9 @@ sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Apr  2 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.9.4-1
+- Update to upstream version 1.9.4
+
 * Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.9.2-2
 - Add missing dependency on JUnit (SCM-786)
 
diff --git a/sources b/sources
index fe380b5..3945834 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fd4e1073c3ebb369fb42f1393ed2f0c  maven-scm-1.9.2-source-release.zip
+dd7c3aab47ede7cdd18b31af57945bfa  maven-scm-1.9.4-source-release.zip
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/maven-scm.git/commit/?h=master&id=31abd4c4e6ccf8622d8ad441c49163b60b2d8ba7