|
 |
998de9f |
From 139c88b7412e236b7357bc8fc5f1217f2f6655fc Mon Sep 17 00:00:00 2001
|
|
|
6ea16d2 |
From: Mat Booth <mat.booth@redhat.com>
|
|
|
6ea16d2 |
Date: Fri, 21 Jun 2019 11:27:12 +0100
|
|
|
82aede6 |
Subject: [PATCH 4/6] Remove mandatory attirbutes from OSGi manifests, which
|
|
|
6ea16d2 |
cause problems with P2
|
|
|
6ea16d2 |
|
|
|
6ea16d2 |
---
|
|
|
6ea16d2 |
.../org.eclipse.m2e.archetype.common/pom.xml | 4 ++--
|
|
|
6ea16d2 |
.../org.eclipse.m2e.maven.indexer/pom.xml | 3 +--
|
|
|
6ea16d2 |
.../org.eclipse.m2e.maven.runtime/pom.xml | 12 ++++++------
|
|
|
6ea16d2 |
3 files changed, 9 insertions(+), 10 deletions(-)
|
|
|
6ea16d2 |
|
|
|
6ea16d2 |
diff --git a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
|
|
|
f6a869e |
index c6f2795..96ec268 100644
|
|
|
6ea16d2 |
--- a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
|
|
|
6ea16d2 |
+++ b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/pom.xml
|
|
|
0593cb3 |
@@ -91,8 +91,8 @@
|
|
 |
5989260 |
|
|
|
5989260 |
<_exportcontents>
|
|
|
9887d4e |
META-INF.plexus;-noimport:=true;x-internal:=true,
|
|
|
9887d4e |
- org.apache.maven.archetype.*;provider=m2e;mandatory:=provider;x-internal:=true,
|
|
|
9887d4e |
- org.codehaus.plexus.velocity;provider=m2e;mandatory:=provider;x-internal:=true,
|
|
|
9887d4e |
+ org.apache.maven.archetype.*;provider=m2e;x-internal:=true,
|
|
|
9887d4e |
+ org.codehaus.plexus.velocity;provider=m2e;x-internal:=true,
|
|
|
5989260 |
</_exportcontents>
|
|
|
5989260 |
|
|
|
5989260 |
<Import-Package>
|
|
|
6ea16d2 |
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
|
|
|
f6a869e |
index 5213090..3eff2a2 100644
|
|
|
6ea16d2 |
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
|
|
|
6ea16d2 |
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/pom.xml
|
|
|
293108a |
@@ -65,8 +65,7 @@
|
|
|
5989260 |
|
|
|
5989260 |
<_exportcontents>
|
|
|
5989260 |
META-INF.plexus;-noimport:=true,
|
|
|
5989260 |
- org.apache.lucene.*;provider=m2e;mandatory:=provider,
|
|
|
5989260 |
- org.apache.maven.*;provider=m2e;mandatory:=provider,
|
|
|
5989260 |
+ org.apache.maven.*;provider=m2e,
|
|
|
5989260 |
</_exportcontents>
|
|
|
5989260 |
|
|
|
5989260 |
<Import-Package>
|
|
|
6ea16d2 |
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
|
|
|
f6a869e |
index cc868e7..0ff5875 100644
|
|
|
6ea16d2 |
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
|
|
|
6ea16d2 |
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
|
|
|
0593cb3 |
@@ -139,12 +139,12 @@
|
|
|
5989260 |
<_exportcontents>
|
|
|
5989260 |
META-INF.plexus;-noimport:=true,
|
|
|
5989260 |
META-INF.sisu;-noimport:=true,
|
|
|
5989260 |
- org.apache.maven.*;provider=m2e;mandatory:=provider,
|
|
|
5989260 |
- org.codehaus.plexus.*;provider=m2e;mandatory:=provider,
|
|
|
5989260 |
- org.sonatype.plexus.*;provider=m2e;mandatory:=provider,
|
|
|
c234084 |
- org.eclipse.aether.*;provider=m2e;mandatory:=provider;version=1.1.1,
|
|
|
5989260 |
- com.google.inject.*;provider=m2e;mandatory:=provider,
|
|
|
5989260 |
- io.takari.*;provider=m2e;mandatory:=provider
|
|
|
5989260 |
+ org.apache.maven.*;provider=m2e,
|
|
|
5989260 |
+ org.codehaus.plexus.*;provider=m2e,
|
|
|
5989260 |
+ org.sonatype.plexus.*;provider=m2e,
|
|
|
5989260 |
+ org.eclipse.aether.*;provider=m2e,
|
|
|
5989260 |
+ com.google.inject.*;provider=m2e,
|
|
|
5989260 |
+ io.takari.*;provider=m2e
|
|
|
5989260 |
</_exportcontents>
|
|
|
5989260 |
|
|
|
5989260 |
<Import-Package>
|
|
|
6ea16d2 |
--
|
|
|
f789efe |
2.28.0
|
|
|
6ea16d2 |
|