diff --git a/eclipse-m2e-core-fix-manifests.patch b/eclipse-m2e-core-fix-manifests.patch index 36e2634..4a52c3d 100644 --- a/eclipse-m2e-core-fix-manifests.patch +++ b/eclipse-m2e-core-fix-manifests.patch @@ -37,48 +37,9 @@ 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, ---- org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF.orig 2018-06-20 17:37:55.624371917 +0100 -+++ org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF 2018-06-20 17:38:56.972176498 +0100 -@@ -7,7 +7,6 @@ - Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.9.0,1.10.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[1.9.0,1.10.0)", - org.eclipse.m2e.sourcelookup;bundle-version="[1.9.0,1.10.0)", -- org.slf4j.api;bundle-version="1.6.1", - org.eclipse.equinox.common;bundle-version="3.6.0", - org.eclipse.m2e.jdt;bundle-version="[1.9.0,1.10.0)", - org.eclipse.core.resources;bundle-version="3.7.0", -@@ -18,5 +17,6 @@ - org.eclipse.jdt.launching;bundle-version="3.10.0" - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - Export-Package: org.eclipse.m2e.binaryproject.internal;x-friends:="org.eclipse.m2e.sourcelookup,org.eclipse.m2e.sourcelookup.ui" -+Import-Package: org.slf4j;version="1.6.2" - Bundle-ActivationPolicy: lazy - Bundle-Activator: org.eclipse.m2e.binaryproject.internal.BinaryProjectPlugin ---- org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF.orig 2018-06-20 17:39:51.596002497 +0100 -+++ org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF 2018-06-20 17:40:22.919902716 +0100 -@@ -7,7 +7,6 @@ - Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.9.0,1.10.0)", - org.eclipse.m2e.maven.runtime;bundle-version="[1.9.0,1.10.0)", - org.eclipse.m2e.binaryproject;bundle-version="[1.9.0,1.10.0)", -- org.slf4j.api;bundle-version="1.6.1", - org.junit;bundle-version="4.0.0", - org.eclipse.m2e.tests.common;bundle-version="[1.9.0,1.10.0)", - org.eclipse.equinox.common;bundle-version="3.6.100", -@@ -15,4 +14,5 @@ - org.eclipse.m2e.jdt;bundle-version="[1.9.0,1.10.0)", - org.eclipse.jdt.core;bundle-version="3.8.1", - org.eclipse.core.runtime;bundle-version="3.8.0" -+Import-Package: org.slf4j;version="1.6.2" - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 --- org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF.orig 2018-06-20 17:45:06.045000839 +0100 +++ org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF 2018-06-20 17:46:00.735826625 +0100 -@@ -10,15 +10,15 @@ - org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.jdt.debug;bundle-version="3.8.0", - org.eclipse.jdt.launching;bundle-version="3.9.0", -- org.slf4j.api;bundle-version="1.6.1", - org.eclipse.debug.core;bundle-version="3.7.0", - org.eclipse.core.runtime;bundle-version="3.7.0", +@@ -15,7 +15,7 @@ org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.debug.ui;bundle-version="3.10.0", org.eclipse.core.resources, @@ -86,7 +47,4 @@ + com.google.guava;bundle-version="[18.0.0,21.0.0)", com.google.gson;bundle-version="2.2.4", org.eclipse.core.variables;bundle-version="3.2.0" -+Import-Package: org.slf4j;version="1.6.2" - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - Bundle-ActivationPolicy: lazy - Eclipse-BundleShape: dir + Import-Package: org.slf4j;version="1.6.2" diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec index e733399..b53de11 100644 --- a/eclipse-m2e-core.spec +++ b/eclipse-m2e-core.spec @@ -1,8 +1,8 @@ -%global release_dir m2e-core-c304dad55ce0f80d2cfcf75497280148ecdf1baf +%global release_dir m2e-core-9023e95103872f7ab9f670987d26a60210cc7d21 Name: eclipse-m2e-core -Version: 1.9.0 -Release: 2%{?dist} +Version: 1.9.1 +Release: 0.1%{?dist} Summary: Maven integration for Eclipse # Most of components are under EPL, but some of them are licensed under @@ -67,8 +67,11 @@ BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-embedder) BuildRequires: mvn(org.apache.maven.wagon:wagon-file) +BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) BuildRequires: mvn(org.eclipse.aether:aether-impl) +BuildRequires: mvn(org.eclipse.aether:aether-spi) +BuildRequires: mvn(org.eclipse.aether:aether-util) BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.eclipse.tycho:tycho-maven-plugin) @@ -266,6 +269,17 @@ done %mvn_package ":*.tests*::{}:" tests %mvn_package ":::{}:" +# Ensure all necessary resolver deps are present +pushd m2e-maven-runtime/org.eclipse.m2e.maven.runtime +%pom_remove_dep "org.apache.maven.resolver:" +%pom_add_dep "org.apache.maven.resolver:maven-resolver-api:1.1.0" +%pom_add_dep "org.apache.maven.resolver:maven-resolver-impl:1.1.0" +%pom_add_dep "org.apache.maven.resolver:maven-resolver-connector-basic:1.1.0" +%pom_add_dep "org.apache.maven.resolver:maven-resolver-spi:1.1.0" +%pom_add_dep "org.apache.maven.resolver:maven-resolver-transport-wagon:1.1.0" +%pom_add_dep "org.apache.maven.resolver:maven-resolver-util:1.1.0" +popd + # Embed all Maven dependencies. They may be some superflous deps # added this way, but in Fedora we don't have enough manpower to test # dependency correctness. And we don't even run m2e tests... @@ -321,6 +335,9 @@ xmvn-subst -s $(find %{buildroot}%{_datadir}/eclipse/droplets/m2e-core -name jar %changelog +* Thu Aug 23 2018 Mat Booth - 1.9.1-0.1 +- Update to latest snapshot + * Thu Jul 12 2018 Fedora Release Engineering - 1.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 778a9dc..73edfaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2e-core-c304dad55ce0f80d2cfcf75497280148ecdf1baf.tar.xz) = 46b8e841e94140034220f109689c439620a54b9ee860e0d7ae29ad8bb40185ceab40cfe11dc9c150e669da40a9a3d3f62eeaa7837ae82b74e762633730f1d655 +SHA512 (m2e-core-9023e95103872f7ab9f670987d26a60210cc7d21.tar.xz) = d9fabfc1aa7e96fbcdb596f6350afca8221951b4ae415d1e2cf42970a08d1a43afddd2695d3d19361493392e8956755e1a2e3059bba15f8a2cdc183a3e193320