diff --git a/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch b/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch index 4595066..573a8ab 100644 --- a/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch +++ b/0001-Fix-manifests-for-guava-and-use-OSGi-fied-archetypes.patch @@ -1,4 +1,4 @@ -From c9f454328addfa5984886d775d473b8ee7c223bb Mon Sep 17 00:00:00 2001 +From 16930d63935426cb9f295cab5eccec1b1dfb632e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Jun 2019 15:35:48 +0100 Subject: [PATCH 1/5] Fix manifests for guava and use OSGi-fied archetypes @@ -7,17 +7,18 @@ Subject: [PATCH 1/5] Fix manifests for guava and use OSGi-fied archetypes org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 4 +++- org.eclipse.m2e.core/META-INF/MANIFEST.MF | 4 +++- org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF | 2 +- + org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF | 2 +- - 4 files changed, 8 insertions(+), 4 deletions(-) + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF -index 179c8e8..e4d7d7f 100644 +index c4d5114..842e7d2 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF -@@ -36,7 +36,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.15.0,1.16.0)", - org.eclipse.core.expressions;bundle-version="3.4.101", +@@ -37,7 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.16.0,1.17.0)", org.eclipse.ui.forms;bundle-version="3.4.1", org.eclipse.jface.text, + org.eclipse.core.filebuffers, - org.eclipse.ui + org.eclipse.ui, + org.apache.maven.archetype.catalog, @@ -26,7 +27,7 @@ index 179c8e8..e4d7d7f 100644 org.eclipse.ltk.core.refactoring, org.slf4j;version="1.6.2" diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF -index e9a0428..3598d22 100644 +index d3ecce2..af681a0 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0", @@ -41,23 +42,36 @@ index e9a0428..3598d22 100644 Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF -index 2f155c1..68f61bb 100644 +index c9db5ed..ad892c7 100644 --- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF -@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime, +@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.ide, org.eclipse.core.filesystem, org.eclipse.ui.forms, -- com.google.guava;bundle-version="[27.1,28.0)" +- com.google.guava;bundle-version="[27.1,28.0)", ++ com.google.guava;bundle-version="[20.0,29.0)", + org.eclipse.m2e.editor;bundle-version="1.16.0", + org.eclipse.search;bundle-version="3.11.700", + org.eclipse.ui.views +diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +index 01be1cf..86402e7 100644 +--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF ++++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime, + org.eclipse.core.filesystem;bundle-version="1.7.500", + org.eclipse.m2e.discovery;bundle-version="1.16.0", + org.eclipse.m2e.model.edit;bundle-version="1.16.0", +- com.google.guava;bundle-version="27.0.0" + com.google.guava;bundle-version="[20.0,29.0)" - Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true, - org.eclipse.m2e.editor.xml.internal;x-internal:=true, - org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true, + Bundle-ActivationPolicy: lazy + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF -index e964a7f..c08fb21 100644 +index 5993fbe..380c9dd 100644 --- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF -@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.15.0,1.16.0)", +@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.16.0,1.17.0)", org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.debug.ui;bundle-version="3.10.0", org.eclipse.core.resources, @@ -67,5 +81,5 @@ index e964a7f..c08fb21 100644 org.eclipse.core.variables;bundle-version="3.2.0" Import-Package: org.slf4j;version="1.6.2" -- -2.26.0.rc2 +2.26.2 diff --git a/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch b/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch index e85497c..503a056 100644 --- a/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch +++ b/0002-Port-to-latest-versions-of-maven-indexer-and-lucene.patch @@ -1,4 +1,4 @@ -From 16e74caf9cdfdfacd2e4995840117d4a8d0a4f1a Mon Sep 17 00:00:00 2001 +From aace32fcbe00a2e79b640f8868459084c644b96d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Jun 2019 15:45:18 +0100 Subject: [PATCH 2/5] Port to latest versions of maven-indexer and lucene @@ -13,7 +13,7 @@ Subject: [PATCH 2/5] Port to latest versions of maven-indexer and lucene 6 files changed, 83 insertions(+), 71 deletions(-) diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml -index 6c34e73..9f4a91f 100644 +index c31e90b..5213090 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml @@ -27,7 +27,7 @@ @@ -33,7 +33,7 @@ index 6c34e73..9f4a91f 100644 + org.apache.lucene*,!* - org.eclipse.m2e.maven.runtime;bundle-version="[1.15.0,1.16.0)", + org.eclipse.m2e.maven.runtime;bundle-version="[1.16.0,1.17.0)", diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java index 4b155c1..6aa1359 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java @@ -442,5 +442,5 @@ index 37d6906..e7e0688 100644 } catch(NoSuchAlgorithmException ex) { throw new IOException("Unable to calculate digest"); -- -2.26.0.rc2 +2.26.2 diff --git a/0003-Adapt-to-API-change-in-aether.patch b/0003-Adapt-to-API-change-in-aether.patch index a949b2b..ad7315a 100644 --- a/0003-Adapt-to-API-change-in-aether.patch +++ b/0003-Adapt-to-API-change-in-aether.patch @@ -1,4 +1,4 @@ -From 5e701f8f6c7bed4c93844d1f9567c8e6cb3afde7 Mon Sep 17 00:00:00 2001 +From 7750d0adcca5ca745650540a53d903dad6befc8b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 21 Jun 2019 11:24:15 +0100 Subject: [PATCH 3/5] Adapt to API change in aether @@ -51,5 +51,5 @@ index 416decc..630992a 100644 } } -- -2.26.0.rc2 +2.26.2 diff --git a/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch b/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch index 0d17f5c..7e2757b 100644 --- a/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch +++ b/0004-Remove-mandatory-attirbutes-from-OSGi-manifests-whic.patch @@ -1,4 +1,4 @@ -From 760bfaf57e224337eb5f40b2e5f918ca904b6b0f Mon Sep 17 00:00:00 2001 +From e89abd3fe021b366f7d082a53823f3a99d18e7fd Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 21 Jun 2019 11:27:12 +0100 Subject: [PATCH 4/5] Remove mandatory attirbutes from OSGi manifests, which @@ -11,7 +11,7 @@ Subject: [PATCH 4/5] Remove mandatory attirbutes from OSGi manifests, which 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml -index 68d1db2..9279dce 100644 +index c6f2795..96ec268 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml @@ -91,8 +91,8 @@ @@ -26,7 +26,7 @@ index 68d1db2..9279dce 100644 diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml -index 9f4a91f..e073f24 100644 +index 5213090..3eff2a2 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml @@ -65,8 +65,7 @@ @@ -40,7 +40,7 @@ index 9f4a91f..e073f24 100644 diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml -index 2aa5313..d1f4ad4 100644 +index cc868e7..0ff5875 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml @@ -139,12 +139,12 @@ @@ -63,5 +63,5 @@ index 2aa5313..d1f4ad4 100644 -- -2.26.0.rc2 +2.26.2 diff --git a/0005-Port-to-latest-version-of-maven-archetypes.patch b/0005-Port-to-latest-version-of-maven-archetypes.patch index 3071663..e1a59ca 100644 --- a/0005-Port-to-latest-version-of-maven-archetypes.patch +++ b/0005-Port-to-latest-version-of-maven-archetypes.patch @@ -1,4 +1,4 @@ -From 9cb89a01a938b9468c244651d675563655fc57ef Mon Sep 17 00:00:00 2001 +From 3c3af2a6837f32c1234418bdc8416cf7ec921a01 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 25 Mar 2020 11:26:45 +0000 Subject: [PATCH 5/5] Port to latest version of maven-archetypes @@ -16,7 +16,7 @@ Subject: [PATCH 5/5] Port to latest version of maven-archetypes 9 files changed, 43 insertions(+), 339 deletions(-) diff --git a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml -index 9279dce..ca19922 100644 +index 96ec268..42de5a3 100644 --- a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml +++ b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml @@ -24,7 +24,7 @@ @@ -49,7 +49,7 @@ index 9279dce..ca19922 100644 commons-collections, commons-io, commons-lang, -- dom4j;version=2.1.1, +- dom4j;version=2.1.3, jchardet, jdom, oro, @@ -602,5 +602,5 @@ index e7e0688..61e3762 100644 throw new NoSuchComponentException(ex); } -- -2.26.0.rc2 +2.26.2 diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index 12b983d..365ba34 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -1,8 +1,8 @@ -%global release_dir m2e-core-8328691915d0e67544c97597b0ea02d559f0f4ea +%global release_dir m2e-core-%{version} Name: eclipse-m2e-core -Version: 1.15.0 -Release: 3%{?dist} +Version: 1.16.0 +Release: 1%{?dist} Summary: Maven integration for Eclipse # Most of components are under EPL, but some of them are licensed under @@ -201,6 +201,7 @@ Requires: maven-resolver-transport-wagon Requires: maven-resolver-util Requires: maven-shared-utils Requires: maven-wagon-file +Requires: maven-wagon-http Requires: maven-wagon-provider-api Requires: okhttp Requires: okio @@ -215,6 +216,7 @@ Requires: plexus-velocity Requires: sisu-inject Requires: sisu-plexus Requires: slf4j +Requires: jcl-over-slf4j Requires: velocity Requires: xml-commons-apis @@ -275,9 +277,16 @@ do rm -rf $mod done +# Don't build lemminx editor +%pom_disable_module org.eclipse.m2e.lemminx.feature +%pom_disable_module org.eclipse.m2e.editor.lemminx +%pom_disable_module org.eclipse.m2e.editor.lemminx.tests + # Don't ship tests %pom_disable_module org.eclipse.m2e.tests.common %pom_disable_module org.eclipse.m2e.core.tests +%pom_disable_module org.eclipse.m2e.jdt.tests +%pom_disable_module org.eclipse.m2e.editor.xml.sse.tests %pom_disable_module org.eclipse.m2e.importer.tests %pom_disable_module org.eclipse.m2e.binaryproject.tests %mvn_package ":*.tests*::{}:" __noinstall @@ -367,6 +376,9 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %license LICENSE-2.0.txt %changelog +* Thu Jun 25 2020 Mat Booth - 1.16.0-1 +- Update to latest upstream release + * Wed Apr 01 2020 Mat Booth - 1.15.0-3 - Add patch to fix NoClassDefFoundErrors diff --git a/sources b/sources index 7cd5736..42432c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2e-core-8328691915d0e67544c97597b0ea02d559f0f4ea.tar.xz) = 48b71abc8d7ad450a3f9e3d4e5ed03601065bd3f313bbd197f1513a9d72d29d115fe40b8ea73d6d7b185fc66799caac08c9871adc5118e60db35096180836c33 +SHA512 (m2e-core-1.16.0.tar.xz) = 3e96f475c948d682c665a65e263fb2da3b6cbf996d844ad47d738b1eba11602ee8084250d21ab5676e47667b53f41d3caaafba2cebf7d94c6917cb672e8e0f33