7:51 p.m.
Author: snjeza
Date: 2010-02-22 13:51:37 -0500 (Mon, 22 Feb 2010)
New Revision: 20421
Modified:
trunk/maven/features/org.jboss.tools.maven.feature/feature.xml
trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5899 Maven integration NPE's
Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2010-02-22 18:51:16 UTC
(rev 20420)
+++ trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2010-02-22 18:51:37 UTC
(rev 20421)
@@ -1,42 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.maven.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName"
- plugin="org.jboss.tools.maven.ui">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <!-- <url>
- <update label="%updateSiteName"
url="http://download.jboss.org/jbosstools/updates/stable/galileo/&qu...
- </url> -->
- <!-- this is a DEPENDENCY SITE, not a DISCOVERY SITE, so there's no point having
it be discovered AFTER the feature's already installed
- <discovery label="m2eclipse Updates"
url="http://m2eclipse.sonatype.org/update-dev/"/>
- -->
-
- <plugin
- id="org.jboss.tools.maven.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.maven.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.maven.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.maven.ui">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.maven.ide.eclipse.feature"
version="0.10.0" match="greaterOrEqual"/>
+ <import feature="org.maven.ide.eclipse.wtp.feature"
version="0.10.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.jboss.tools.maven.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.maven.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2010-02-22
18:51:16 UTC (rev 20420)
+++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2010-02-22
18:51:37 UTC (rev 20421)
@@ -1,28 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.maven.seam.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName"
- plugin="org.jboss.tools.maven.seam">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.jboss.tools.maven.seam"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.maven.seam.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.maven.seam">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.maven.ide.eclipse.feature"
version="0.10.0" match="greaterOrEqual"/>
+ <import feature="org.maven.ide.eclipse.wtp.feature"
version="0.10.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.jboss.tools.maven.seam"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>