[eclipse-m2e-core] Update to upstream version 1.3.1

Gerard Ryan galileo at fedoraproject.org
Mon Apr 8 21:00:20 UTC 2013 

commit a73b304f347c19626f91787f7c1e0e79d1b13818
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Mon Apr 8 22:00:07 2013 +0100

    Update to upstream version 1.3.1

 ...=> eclipse-m2e-core-fix-m2e.core-manifest.patch |    4 ++--
 eclipse-m2e-core-m2e.core-resourcefetcher.patch    |   13 +++----------
 ...pse-m2e-core-remotearchetypecatalogdialog.patch |    6 +++---
 eclipse-m2e-core.spec                              |   19 ++++++++++++-------
 4 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch b/eclipse-m2e-core-fix-m2e.core-manifest.patch
similarity index 80%
rename from eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch
rename to eclipse-m2e-core-fix-m2e.core-manifest.patch
index 9821eb7..e541158 100644
--- a/eclipse-m2e-core-fix-m2e.core-manifest-1.2.0.patch
+++ b/eclipse-m2e-core-fix-m2e.core-manifest.patch
@@ -1,8 +1,8 @@
 --- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig	2012-12-05 17:01:35.124604249 +0000
 +++ org.eclipse.m2e.core/META-INF/MANIFEST.MF	2012-12-05 17:02:55.092040497 +0000
 @@ -13,9 +13,10 @@
-  org.eclipse.m2e.archetype.common;bundle-version="[1.2.0,1.3.0)",
-  org.eclipse.m2e.maven.indexer;bundle-version="[1.2.0,1.3.0)",
+  org.eclipse.m2e.archetype.common;bundle-version="[1.3.0,1.4.0)",
+  org.eclipse.m2e.maven.indexer;bundle-version="[1.3.0,1.4.0)",
   slf4j.api,
 - com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)"
 + com.ning.async-http-client,
diff --git a/eclipse-m2e-core-m2e.core-resourcefetcher.patch b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
index e3f3052..bdd3635 100644
--- a/eclipse-m2e-core-m2e.core-resourcefetcher.patch
+++ b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
@@ -1,6 +1,6 @@
 --- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java.orig	2012-08-04 13:58:38.000000000 +0100
 +++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java	2012-08-04 13:54:49.000000000 +0100
-@@ -45,7 +45,7 @@
+@@ -44,7 +44,7 @@
  import org.codehaus.plexus.util.IOUtil;
  import org.codehaus.plexus.util.io.RawInputStreamFacade;
  
@@ -9,7 +9,7 @@
  import org.apache.maven.wagon.authentication.AuthenticationInfo;
  import org.apache.maven.wagon.proxy.ProxyInfo;
  import org.apache.maven.wagon.proxy.ProxyUtils;
-@@ -60,7 +60,7 @@
+@@ -59,7 +59,7 @@
   * 
   * @author Benjamin Hanzelmann
   */
@@ -18,7 +18,7 @@
  
    private static Logger log = LoggerFactory.getLogger(AsyncFetcher.class);
  
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@
      }
    }
  
@@ -27,10 +27,3 @@
    public InputStream retrieve(String name) throws IOException, FileNotFoundException {
      final String url = buildUrl(baseUrl, name);
  
-@@ -311,4 +311,4 @@
-     }
-   }
- 
--}
-\ No newline at end of file
-+}
diff --git a/eclipse-m2e-core-remotearchetypecatalogdialog.patch b/eclipse-m2e-core-remotearchetypecatalogdialog.patch
index 88f5777..58139ba 100644
--- a/eclipse-m2e-core-remotearchetypecatalogdialog.patch
+++ b/eclipse-m2e-core-remotearchetypecatalogdialog.patch
@@ -1,11 +1,11 @@
 --- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java.orig	2012-08-05 13:38:58.000000000 +0100
 +++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/RemoteArchetypeCatalogDialog.java	2012-08-05 13:44:20.000000000 +0100
-@@ -179,7 +179,7 @@
+@@ -180,7 +180,7 @@
              } finally {
                final IStatus s = status;
                @SuppressWarnings("unchecked")
--              final List<Archetype> archetypes = catalog==null ? Collections.emptyList() : catalog.getArchetypes();
-+              final List<Archetype> archetypes = catalog==null ? Collections.<Archetype>emptyList() : catalog.getArchetypes();
+-              final List<Archetype> archetypes = catalog == null ? Collections.emptyList() : catalog.getArchetypes();
++              final List<Archetype> archetypes = catalog == null ? Collections.<Archetype>emptyList() : catalog.getArchetypes();
                getShell().getDisplay().asyncExec(new Runnable() {
                  public void run() {
                    verifyButton.setEnabled(true);
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 24936b4..5cc35cf 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -1,12 +1,13 @@
 %global eclipse_dropins      %{_datadir}/eclipse/dropins
 %global install_loc_plugins  %{eclipse_dropins}/%{name}/eclipse/plugins
 %global install_loc_features %{eclipse_dropins}/%{name}/eclipse/features
-%global release_tag          %{version}.20120903-1050
-%global release_dir          releases/1.2/%{release_tag}
+%global release_tag          %{version}.20130219-1424
+%global x_y                  1.3
+%global release_dir          releases/%{x_y}/%{release_tag}
 
 Name:           eclipse-m2e-core
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Maven integration for Eclipse
 
 Group:          Development/Tools
@@ -15,10 +16,10 @@ Group:          Development/Tools
 License:        EPL and ASL 2.0
 URL:            http://eclipse.org/m2e/
 
-Source0:        http://git.eclipse.org/c/m2e/m2e-core.git/snapshot/m2e-core-releases/1.2/%{release_tag}.tar.bz2
+Source0:        http://git.eclipse.org/c/m2e/m2e-core.git/snapshot/%{release_dir}.tar.bz2
 
 # Add some necessary stuff (mainly requires & imports) to manifests
-Patch0:         %{name}-fix-m2e.core-manifest-1.2.0.patch
+Patch0:         %{name}-fix-m2e.core-manifest.patch
 Patch1:         %{name}-fix-m2e.core.ui-manifest-1.2.0.patch
 
 # AbstractResourceFetcher is now ResourceFetcher (interface)
@@ -199,10 +200,11 @@ cp -p m2e-maven-runtime/com.ning.async-http-client/src/main/resources/about_file
 %pom_disable_module org.eclipse.m2e.logback.feature
 %pom_disable_module org.eclipse.m2e.sdk.feature
 %pom_disable_module org.eclipse.m2e.site
+%pom_disable_module org.jboss.netty m2e-maven-runtime
 
 # jetty already has OSGI info, so doesn't need to be bundled like it is
 %pom_remove_dep org.eclipse.m2e:org.jboss.netty
-%pom_add_dep org.jboss.netty:netty
+%pom_add_dep io.netty:netty
 
 # async-http-client already has OSGI info, so doesn't need to be bundled
 # adding packaged version as a dep here causes some 'tycholock' problem
@@ -394,6 +396,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Sun Apr 07 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.3.1-1
+- Update to upstream version 1.3.1
+
 * Wed Feb 20 2013 Gerard Ryan <galileo at fedoraproject.org> - 1.2.0-7
 - Bump release to test again in koji (previously broken deps)

More information about the scm-commits mailing list