466503 : Removed extraneous configurators
Change-Id: Ie33b97034bacef49ccef99e977f6be45a1846624
Signed-off-by: Fred Bricon <fbricon@gmail.com>
diff --git a/org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF b/org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF
index 4bec1fb..0ede4a3 100644
--- a/org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.wtp.jpa/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@
org.eclipse.jpt.jpa.core;bundle-version="3.3.0",
org.eclipse.jpt.common.core;bundle-version="1.3.0",
org.eclipse.wst.common.project.facet.core,
- org.eclipse.m2e.core,
- org.eclipse.m2e.maven.runtime,
+ org.eclipse.m2e.core;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.6.0,2.0.0)",
org.eclipse.core.resources,
org.eclipse.jdt.core,
org.eclipse.emf.common,
diff --git a/org.eclipse.m2e.wtp.jpa/lifecycle-mapping-metadata.xml b/org.eclipse.m2e.wtp.jpa/lifecycle-mapping-metadata.xml
index 13879f5..7130a86 100644
--- a/org.eclipse.m2e.wtp.jpa/lifecycle-mapping-metadata.xml
+++ b/org.eclipse.m2e.wtp.jpa/lifecycle-mapping-metadata.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<lifecycleMappingMetadata>
-
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
@@ -17,36 +16,5 @@
</configurator>
</action>
</pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>war</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <configurator>
- <id>org.eclipse.m2e.wtp.jpa.configurator.wtp</id>
- </configurator>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>ejb</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <configurator>
- <id>org.eclipse.m2e.wtp.jpa.configurator.wtp</id>
- </configurator>
- </action>
- </pluginExecution>
</pluginExecutions>
-
</lifecycleMappingMetadata>
\ No newline at end of file
diff --git a/org.eclipse.m2e.wtp.jpa/plugin.xml b/org.eclipse.m2e.wtp.jpa/plugin.xml
index 3ce7f0f..3798b98 100644
--- a/org.eclipse.m2e.wtp.jpa/plugin.xml
+++ b/org.eclipse.m2e.wtp.jpa/plugin.xml
@@ -9,22 +9,15 @@
id="org.eclipse.m2e.wtp.jpa.configurator.jdt"
class="org.eclipse.m2e.wtp.jpa.internal.configurators.JpaProjectConfigurator"
name="%jpa_project_configurator"
- secondaryTo="org.eclipse.m2e.jdt.javaConfigurator"/>
+ runsAfter="org.eclipse.m2e.jdt.javaConfigurator?,org.maven.ide.eclipse.configuration.wtp.configurator?"/>
</extension>
- <extension point="org.eclipse.m2e.core.projectConfigurators">
- <configurator
- id="org.eclipse.m2e.wtp.jpa.configurator.wtp"
- class="org.eclipse.m2e.wtp.jpa.internal.configurators.JpaProjectConfigurator"
- name="%jpa_project_configurator_wtp"
- secondaryTo="org.maven.ide.eclipse.configuration.wtp.configurator"/>
- </extension>
<extension
point="org.eclipse.m2e.wtp.javaeeConfiguratorEnabler">
<javaeeConfiguratorEnabler
id="org.eclipse.m2e.wtp.jpa.enabler"
label="%jpa_enabler_label"
description="%jpa_enabler_description"
- configuratorIds="org.eclipse.m2e.wtp.jpa.configurator.wtp,org.eclipse.m2e.wtp.jpa.configurator.jdt"
+ configuratorIds="org.eclipse.m2e.wtp.jpa.configurator.jdt"
/>
</extension>
<extension
