From 2a2c8ce7c1c446ee12931b89645e34ecb7bbd856 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 21 Jun 2019 11:27:12 +0100
Subject: [PATCH 5/6] Remove mandatory attirbutes from OSGi manifests, which
 cause problems with P2

---
 .../org.eclipse.m2e.archetype.common/pom.xml         |  4 ++--
 .../org.eclipse.m2e.maven.indexer/pom.xml            |  3 +--
 .../org.eclipse.m2e.maven.runtime/pom.xml            | 12 ++++++------
 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 9fa1b09..4975150 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
@@ -80,8 +80,8 @@
 
             <_exportcontents>
               META-INF.plexus;-noimport:=true;x-internal:=true,
-              org.apache.maven.archetype.*;provider=m2e;mandatory:=provider;x-internal:=true,
-              org.codehaus.plexus.velocity;provider=m2e;mandatory:=provider;x-internal:=true,
+              org.apache.maven.archetype.*;provider=m2e;x-internal:=true,
+              org.codehaus.plexus.velocity;provider=m2e;x-internal:=true,
             </_exportcontents>
 
             <Import-Package>
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 85d3dfe..b1a7f8f 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
@@ -63,8 +63,7 @@
 
             <_exportcontents>
               META-INF.plexus;-noimport:=true,
-              org.apache.lucene.*;provider=m2e;mandatory:=provider,
-              org.apache.maven.*;provider=m2e;mandatory:=provider,
+              org.apache.maven.*;provider=m2e,
             </_exportcontents>
 
             <Import-Package>
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 8e7c53a..2390698 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
@@ -138,12 +138,12 @@
             <_exportcontents>
               META-INF.plexus;-noimport:=true,
               META-INF.sisu;-noimport:=true,
-              org.apache.maven.*;provider=m2e;mandatory:=provider,
-              org.codehaus.plexus.*;provider=m2e;mandatory:=provider,
-              org.sonatype.plexus.*;provider=m2e;mandatory:=provider,
-              org.eclipse.aether.*;provider=m2e;mandatory:=provider;version=1.1.1,
-              com.google.inject.*;provider=m2e;mandatory:=provider,
-              io.takari.*;provider=m2e;mandatory:=provider
+              org.apache.maven.*;provider=m2e,
+              org.codehaus.plexus.*;provider=m2e,
+              org.sonatype.plexus.*;provider=m2e,
+              org.eclipse.aether.*;provider=m2e,
+              com.google.inject.*;provider=m2e,
+              io.takari.*;provider=m2e
             </_exportcontents>
 
             <Import-Package>
-- 
2.20.1