mizdebsk pushed to eclipse-m2e-mavendev (master). "Don't use deprecated M2E method"

[notifications at fedoraproject.org]

From 198d3e36700ae68e54a945c40a53d5d6096220c4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon, 18 May 2015 17:12:06 +0200
Subject: Don't use deprecated M2E method


diff --git a/0001-don-t-use-m2e-internal-deprecated-methods.patch b/0001-don-t-use-m2e-internal-deprecated-methods.patch
new file mode 100644
index 0000000..ba5add6
--- /dev/null
+++ b/0001-don-t-use-m2e-internal-deprecated-methods.patch
@@ -0,0 +1,81 @@
+From d452522ca058a305f645297e9df76c313e928b9b Mon Sep 17 00:00:00 2001
+From: Igor Fedorenko <igor at ifedorenko.com>
+Date: Fri, 27 Mar 2015 22:27:17 -0400
+Subject: [PATCH] don't use m2e internal deprecated methods
+
+Signed-off-by: Igor Fedorenko <igor at ifedorenko.com>
+---
+ .../internal/launching/MavenITLaunchDelegate.java  | 25 ++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/com.ifedorenko.m2e.mavendev/src/com/ifedorenko/m2e/mavendev/internal/launching/MavenITLaunchDelegate.java b/com.ifedorenko.m2e.mavendev/src/com/ifedorenko/m2e/mavendev/internal/launching/MavenITLaunchDelegate.java
+index 0f45b39..5476455 100644
+--- a/com.ifedorenko.m2e.mavendev/src/com/ifedorenko/m2e/mavendev/internal/launching/MavenITLaunchDelegate.java
++++ b/com.ifedorenko.m2e.mavendev/src/com/ifedorenko/m2e/mavendev/internal/launching/MavenITLaunchDelegate.java
+@@ -13,6 +13,8 @@ package com.ifedorenko.m2e.mavendev.internal.launching;
+ import static org.eclipse.m2e.internal.launch.MavenLaunchUtils.quote;
+ 
+ import java.io.File;
++import java.io.IOException;
++import java.net.URL;
+ import java.util.ArrayList;
+ import java.util.HashSet;
+ import java.util.List;
+@@ -20,8 +22,11 @@ import java.util.Set;
+ 
+ import org.eclipse.core.internal.runtime.DevClassPathHelper;
+ import org.eclipse.core.runtime.CoreException;
++import org.eclipse.core.runtime.FileLocator;
+ import org.eclipse.core.runtime.IProgressMonitor;
++import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.Platform;
++import org.eclipse.core.runtime.Status;
+ import org.eclipse.debug.core.ILaunch;
+ import org.eclipse.debug.core.ILaunchConfiguration;
+ import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
+@@ -38,6 +43,8 @@ import org.eclipse.m2e.internal.launch.MavenRuntimeLaunchSupport;
+ import org.eclipse.m2e.internal.launch.MavenRuntimeLaunchSupport.VMArguments;
+ import org.osgi.framework.Bundle;
+ 
++import com.ifedorenko.m2e.mavendev.internal.MavenDevToolsActivator;
++
+ /**
+  * Launches Maven Integration Tests in development mode.
+  * <p/>
+@@ -134,17 +141,31 @@ public class MavenITLaunchDelegate
+             bundleRelativePath = "/";
+         }
+         Bundle bundle = Platform.getBundle( bundleId );
+-        cp.add( MavenLaunchUtils.getBundleEntry( bundle, bundleRelativePath ) );
++        cp.add( getBundleEntry( bundle, bundleRelativePath ) );
+         if ( DevClassPathHelper.inDevelopmentMode() )
+         {
+             for ( String cpe : DevClassPathHelper.getDevClassPath( bundleId ) )
+             {
+-                cp.add( MavenLaunchUtils.getBundleEntry( bundle, cpe ) );
++                cp.add( getBundleEntry( bundle, cpe ) );
+             }
+         }
+         return cp;
+     }
+ 
++    private String getBundleEntry( Bundle bundle, String path )
++        throws CoreException
++    {
++        URL entry = bundle.getEntry( path );
++        try
++        {
++            return FileLocator.toFileURL( entry ).getFile();
++        }
++        catch ( IOException e )
++        {
++            throw new CoreException( new Status( IStatus.ERROR, MavenDevToolsActivator.PLUGIN_ID, e.getMessage(), e ) );
++        }
++    }
++    
+     public String getTestClasspath( ILaunchConfiguration configuration )
+         throws CoreException
+     {
+-- 
+2.1.0
+
diff --git a/eclipse-m2e-mavendev.spec b/eclipse-m2e-mavendev.spec
index 7002d02..cc77856 100644
--- a/eclipse-m2e-mavendev.spec
+++ b/eclipse-m2e-mavendev.spec
@@ -1,6 +1,6 @@
 Name:           eclipse-m2e-mavendev
 Version:        0.2.0.201311250404
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven Development Tools
 License:        EPL
 URL:            https://github.com/ifedorenko/com.ifedorenko.m2e.mavendev
@@ -9,6 +9,9 @@ BuildArch:      noarch
 Source0:        https://github.com/ifedorenko/com.ifedorenko.m2e.mavendev/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        http://www.eclipse.org/legal/epl-v10.html
 
+# Backported from upstream commit 19102da
+Patch0:         0001-don-t-use-m2e-internal-deprecated-methods.patch
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.eclipse.tycho:tycho-maven-plugin)
 BuildRequires:  mvn(org.eclipse.tycho:tycho-p2-plugin)
@@ -40,6 +43,7 @@ install artifacts to the local Maven repository.
 
 %prep
 %setup -q -n com.ifedorenko.m2e.mavendev-%{version}
+%patch0 -p1
 find -name *.jar -delete
 cp -p %{SOURCE1} epl-v10.html
 
@@ -55,6 +59,9 @@ cp -p %{SOURCE1} epl-v10.html
 %doc README.md epl-v10.html
 
 %changelog
+* Mon May 18 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - error: line 12: Empty tag: Patch0:
+- Don't use deprecated M2E method
+
 * Tue Dec 9 2014 Alexander Kurtakov <akurtako at redhat.com> 0.2.0.201311250404-4
 - Fix FTBFS.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-m2e-mavendev.git/commit/?h=master&id=198d3e36700ae68e54a945c40a53d5d6096220c4