rpms/xmvn
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add build requires on build-helper plugin and fix previous patch

Browse Source 
The patch needed a testcase update as well. Squashed 2 commits from upstream
This commit is contained in:
Stanislav Ochotnicky 2013-05-31 16:48:20 +02:00
parent 7d4c2bfd08
commit 2ea84e46db
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0002-Implement-desired-handling-dots-in-JPP-groupId.patch
View File

@ -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@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 31 May 2013 16:13:58 +0200 Date: Fri, 31 May 2013 16:13:58 +0200
Subject: [PATCH 2/2] Implement desired handling dots in JPP groupId 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 ++++++- .../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 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 index 3d8c7a5..23cb006 100644
@ -29,6 +31,22 @@ index 3d8c7a5..23cb006 100644
} }
path.append( artifactId ); 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 1.8.1.4

4
xmvn.spec
View File

@ -10,7 +10,8 @@ Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar
# from upstream commit ccc197d to fix NPE # from upstream commit ccc197d to fix NPE
Patch0: 0001-Be-careful-when-unboxing-Boolean-that-can-be-null.patch 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 Patch1: 0002-Implement-desired-handling-dots-in-JPP-groupId.patch
@ -24,6 +25,7 @@ BuildRequires: plexus-utils
BuildRequires: xbean BuildRequires: xbean
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
BuildRequires: maven-dependency-plugin BuildRequires: maven-dependency-plugin
BuildRequires: maven-plugin-build-helper
Requires: maven Requires: maven
Requires: beust-jcommander Requires: beust-jcommander