From 7989c321ab9107427137a695c4cc78e907f18979 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Jul 2013 08:05:04 +0200 Subject: [PATCH] Allow installation of Eclipse plugins in javadir --- xmvn-eclipse-plugin.patch | 11 +++++++++++ xmvn.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 xmvn-eclipse-plugin.patch diff --git a/xmvn-eclipse-plugin.patch b/xmvn-eclipse-plugin.patch new file mode 100644 index 0000000..bdcf508 --- /dev/null +++ b/xmvn-eclipse-plugin.patch @@ -0,0 +1,11 @@ +--- xmvn-core/src/main/java/org/fedoraproject/maven/installer/JarInstaller.java~ 2013-05-24 10:12:18.000000000 +0200 ++++ xmvn-core/src/main/java/org/fedoraproject/maven/installer/JarInstaller.java 2013-07-23 07:58:47.020084935 +0200 +@@ -43,7 +43,7 @@ + @Override + public List getSupportedPackagingTypes() + { +- return Arrays.asList( "bundle", "ejb", "jar", "maven-plugin" ); ++ return Arrays.asList( "bundle", "eclipse-plugin", "ejb", "jar", "maven-plugin" ); + } + + @Override diff --git a/xmvn.spec b/xmvn.spec index bcdfae5..c08242b 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 0.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -18,6 +18,9 @@ Patch1: 0002-Implement-desired-handling-dots-in-JPP-groupId.patch # of tools.jar without specifying system scope or systemPath Patch2: 0003-Implement-Java-home-resolver.patch +# Allow installation of Eclipse plugins in javadir +Patch3: %{name}-eclipse-plugin.patch + # Since this version maven uses sonatype-aether symlinks BuildRequires: maven >= 3.0.5-8 @@ -61,6 +64,7 @@ This package provides %{summary}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 # Add cglib test dependency as a workaround for rhbz#911365 %pom_add_dep cglib:cglib::test %{name}-core @@ -150,6 +154,9 @@ end %doc LICENSE NOTICE %changelog +* Tue Jul 23 2013 Mikolaj Izdebski - 0.5.0-7 +- Allow installation of Eclipse plugins in javadir + * Mon Jul 22 2013 Mikolaj Izdebski - 0.5.0-6 - Remove workaround for plexus-archiver bug - Use sonatype-aether symlinks