[xmvn] Add build requires on build-helper plugin and fix previous patch
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri May 31 14:50:49 UTC 2013
commit 2ea84e46dbff07897473cff67e32455f8462c391
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri May 31 16:48:20 2013 +0200
Add build requires on build-helper plugin and fix previous patch
The patch needed a testcase update as well. Squashed 2 commits from upstream
...ment-desired-handling-dots-in-JPP-groupId.patch | 22 ++++++++++++++++++-
xmvn.spec | 4 ++-
2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/0002-Implement-desired-handling-dots-in-JPP-groupId.patch b/0002-Implement-desired-handling-dots-in-JPP-groupId.patch
index 9a27c08..73a35ea 100644
--- a/0002-Implement-desired-handling-dots-in-JPP-groupId.patch
+++ b/0002-Implement-desired-handling-dots-in-JPP-groupId.patch
@@ -1,11 +1,13 @@
-From 21994e6933147073498f5609834329e848a1cf99 Mon Sep 17 00:00:00 2001
+From 77bfaf47ff78d0de7d005dd2185c05c197c717c2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 31 May 2013 16:13:58 +0200
Subject: [PATCH 2/2] Implement desired handling dots in JPP groupId
+Dots in JPP groupId should not be replaced with slashes
---
.../src/main/java/org/fedoraproject/maven/repository/Layout.java | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ .../test/java/org/fedoraproject/maven/repository/LayoutTest.java | 4 ++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/repository/Layout.java b/xmvn-core/src/main/java/org/fedoraproject/maven/repository/Layout.java
index 3d8c7a5..23cb006 100644
@@ -29,6 +31,22 @@ index 3d8c7a5..23cb006 100644
}
path.append( artifactId );
+diff --git a/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java b/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java
+index 5f63969..f2330f0 100644
+--- a/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java
++++ b/xmvn-core/src/test/java/org/fedoraproject/maven/repository/LayoutTest.java
+@@ -42,9 +42,9 @@ public class LayoutTest
+
+ assertEquals( "an-example/artifact/used-FOR42.testing/blah-1.2.3-foo/used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
+ Layout.MAVEN.getArtifactPath( artifact ) );
+- assertEquals( "an-example/artifact/used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
++ assertEquals( "an-example.artifact/used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
+ Layout.JPP.getArtifactPath( artifact ) );
+- assertEquals( "an-example/artifact/used-FOR42.testing.ext-ens.ion",
++ assertEquals( "an-example.artifact/used-FOR42.testing.ext-ens.ion",
+ Layout.JPP_VERSIONLESS.getArtifactPath( artifact ) );
+ assertEquals( "an-example.artifact-used-FOR42.testing-blah-1.2.3-foo.ext-ens.ion",
+ Layout.FLAT.getArtifactPath( artifact ) );
--
1.8.1.4
diff --git a/xmvn.spec b/xmvn.spec
index c2b3d32..7ff2fb5 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -10,7 +10,8 @@ Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar
# from upstream commit ccc197d to fix NPE
Patch0: 0001-Be-careful-when-unboxing-Boolean-that-can-be-null.patch
-# from upstream commit f62ca1f to fix handling of packages with dots in groupid
+# from upstream commits f62ca1f and f6b2c9 to fix handling of packages with dots
+# in groupid
Patch1: 0002-Implement-desired-handling-dots-in-JPP-groupId.patch
@@ -24,6 +25,7 @@ BuildRequires: plexus-utils
BuildRequires: xbean
BuildRequires: xml-commons-apis
BuildRequires: maven-dependency-plugin
+BuildRequires: maven-plugin-build-helper
Requires: maven
Requires: beust-jcommander
More information about the scm-commits
mailing list