commit 23ed4c9b324f0ec16b6a33daaea177946573c72b
Author: Gerard Ryan <gerard(a)ryan.lt>
Date: Mon Sep 30 23:00:34 2013 +0100
Add patch for maven 3.1.0
eclipse-m2e-core-test-maven310-launcher.patch | 11 +++++++++++
eclipse-m2e-core.spec | 9 ++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-m2e-core-test-maven310-launcher.patch
b/eclipse-m2e-core-test-maven310-launcher.patch
new file mode 100644
index 0000000..d46e38e
--- /dev/null
+++ b/eclipse-m2e-core-test-maven310-launcher.patch
@@ -0,0 +1,11 @@
+---
org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java.orig 2013-09-29
21:29:24.119333226 +0100
++++
org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java 2013-09-29
21:29:50.083872167 +0100
+@@ -97,7 +97,7 @@
+ }
+
+ public String getMainTypeName(ILaunchConfiguration configuration) {
+- return launchSupport.getVersion().startsWith("3.0") ? LAUNCHER_TYPE3 :
LAUNCHER_TYPE; //$NON-NLS-1$
++ return launchSupport.getVersion().startsWith("3.") ? LAUNCHER_TYPE3 :
LAUNCHER_TYPE; //$NON-NLS-1$
+ }
+
+ public String[] getClasspath(ILaunchConfiguration configuration) {
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 8b931d1..3f5cbfb 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -7,7 +7,7 @@
Name: eclipse-m2e-core
Version: 1.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Maven integration for Eclipse
Group: Development/Tools
@@ -53,6 +53,9 @@ Patch10: %{name}-indexer-5.1.1.patch
# API change in aether (remove once implemented)
Patch11: %{name}-new-eclipse-aether-api.patch
+# Patch org.eclipse.m2e.launching for maven 3.1.0
+# Remove this for 1.5.0 since it's an upstream patch
+Patch12: %{name}-test-maven310-launcher.patch
BuildArch: noarch
@@ -304,6 +307,7 @@ find -name MANIFEST.MF \
%patch9
%patch10
%patch11
+%patch12
rm
org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/FilterRepositorySystemSession.java
@@ -449,6 +453,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Sun Sep 29 2013 Gerard Ryan <galileo(a)fedoraproject.org> - 1.4.0-5
+- Fixes for maven 3.1.0
+
* Sat Aug 24 2013 Gerard Ryan <galileo(a)fedoraproject.org> - 1.4.0-4
- Bump release to rebuild in rawhide/f20