JBDS-4533 Require rh-eclipse47-eclipse-m2e-wtp

Signed-off-by: nickboldt <nboldt@redhat.com>
jbdevstudio · Oct 12, 2017 · 8d7c404 · 8d7c404
1 parent 5688f53
commit 8d7c404
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/features/com.jboss.devstudio.core.rpm.feature/feature.xml b/features/com.jboss.devstudio.core.rpm.feature/feature.xml
@@ -61,12 +61,6 @@
    <requires>
     <import feature="org.eclipse.buildship"/>
 
-    <!-- TODO remove these https://issues.jboss.org/browse/JBDS-4533 -->
-    <import feature="org.eclipse.m2e.wtp.feature"/>
-    <import feature="org.eclipse.m2e.wtp.jaxrs.feature"/>
-    <import feature="org.eclipse.m2e.wtp.jpa.feature"/>
-    <import feature="org.eclipse.m2e.wtp.jsf.feature"/>
-
     <!-- TODO remove these https://issues.jboss.org/browse/JBDS-4532 -->
     <import feature="org.jboss.tools.maven.apt.feature"/>
     <import feature="org.jboss.tools.maven.cdi.feature"/>

diff --git a/features/com.jboss.devstudio.core.rpmdeps.feature/feature.xml b/features/com.jboss.devstudio.core.rpmdeps.feature/feature.xml
@@ -63,6 +63,10 @@
     <import feature="org.eclipse.jst.ws.jaxws.feature"/>
     <import feature="org.eclipse.linuxtools.docker.feature"/>
     <import feature="org.eclipse.m2e.feature"/>
+    <import feature="org.eclipse.m2e.wtp.feature"/>
+    <import feature="org.eclipse.m2e.wtp.jaxrs.feature"/>
+    <import feature="org.eclipse.m2e.wtp.jpa.feature"/>
+    <import feature="org.eclipse.m2e.wtp.jsf.feature"/>
     <import feature="org.eclipse.mylyn.wikitext_feature"/>
     <import feature="org.eclipse.platform"/>
     <import feature="org.eclipse.rcp" />

diff --git a/rpm/build.sh b/rpm/build.sh
@@ -16,13 +16,13 @@ https://devstudio.redhat.com/static/11/stable/updates/central/devstudio-11.0.0.G
     echo "Example 3: $0 -clean -u \"https://devstudio.redhat.com/11/snapshots/updates/\" -mo \"--no-clean --update\""
     echo ""
     echo "Example 4a: $0 /build.sh -lus -clean -mo \"--no-clean --update\" -u \\
-\"https://devstudio.redhat.com/targetplatforms/devstudiotarget/4.71.0.AM3-SNAPSHOT/REPO/,\\
-https://devstudio.redhat.com/targetplatforms/jbtcentraltarget/4.71.0.AM3-SNAPSHOT/REPO/,\\
+\"https://devstudio.redhat.com/targetplatforms/devstudiotarget/4.71.0.Final-SNAPSHOT/REPO/,\\
+https://devstudio.redhat.com/targetplatforms/jbtcentraltarget/4.71.0.Final-SNAPSHOT/REPO/,\\
 https://devstudio.redhat.com/11/snapshots/updates/central/master/\" # use locally built update site"
     echo ""
     echo "Example 4b: $0 /build.sh -bus -clean -mo \"--no-clean --update\" -u \\
-\"https://devstudio.redhat.com/targetplatforms/devstudiotarget/4.71.0.AM3-SNAPSHOT/REPO/,\\
-https://devstudio.redhat.com/targetplatforms/jbtcentraltarget/4.71.0.AM3-SNAPSHOT/REPO/,\\
+\"https://devstudio.redhat.com/targetplatforms/devstudiotarget/4.71.0.Final-SNAPSHOT/REPO/,\\
+https://devstudio.redhat.com/targetplatforms/jbtcentraltarget/4.71.0.Final-SNAPSHOT/REPO/,\\
 https://devstudio.redhat.com/11/snapshots/updates/central/master/\" # build and use local update site"
     echo ""
     exit 1;

diff --git a/rpm/devstudio.blacklist.txt b/rpm/devstudio.blacklist.txt
@@ -184,6 +184,20 @@ org.sonatype.m2e.egit.feature
 org.sonatype.m2e.mavenarchiver
 org.sonatype.m2e.mavenarchiver.feature
 
+# JBDS-4533 m2e-wtp
+# find /opt/rh/rh-eclipse47/root/usr/share/eclipse/droplets/m2e-wtp/eclipse -name "org.eclipse.m2e.wtp*" | sed -e "s#.\+\(features\|plugins\)/\(.\+\)#\2#" | sort | uniq | sed -e "s#\(.\+\)_[0-9.rv-]\+\(.jar\|\)#\1#"
+org.eclipse.m2e.wtp
+org.eclipse.m2e.wtp.feature
+org.eclipse.m2e.wtp.jaxrs
+org.eclipse.m2e.wtp.jaxrs.feature
+org.eclipse.m2e.wtp.jpa
+org.eclipse.m2e.wtp.jpa.feature
+org.eclipse.m2e.wtp.jsf
+org.eclipse.m2e.wtp.jsf.feature
+org.eclipse.m2e.wtp.overlay
+org.eclipse.m2e.wtp.overlay.ui
+org.eclipse.m2e.wtp.sdk.feature
+
 # JBDS-4259 still need guava 0.15.0 for org.eclipse.recommenders and gson for org.eclipse.jgit.pgm
 # com.google.guava
 # com.google.gson

diff --git a/rpm/devstudio.removelist.txt b/rpm/devstudio.removelist.txt
@@ -477,6 +477,17 @@ org.eclipse.m2e.profiles.ui
 org.eclipse.m2e.refactoring
 org.eclipse.m2e.scm
 org.eclipse.m2e.workspace.cli
+org.eclipse.m2e.wtp
+org.eclipse.m2e.wtp.feature
+org.eclipse.m2e.wtp.jaxrs
+org.eclipse.m2e.wtp.jaxrs.feature
+org.eclipse.m2e.wtp.jpa
+org.eclipse.m2e.wtp.jpa.feature
+org.eclipse.m2e.wtp.jsf
+org.eclipse.m2e.wtp.jsf.feature
+org.eclipse.m2e.wtp.overlay
+org.eclipse.m2e.wtp.overlay.ui
+org.eclipse.m2e.wtp.sdk.feature
 org.eclipse.mylyn.commons.core
 org.eclipse.mylyn.commons.net
 org.eclipse.mylyn.commons.notifications.core

diff --git a/rpm/devstudio.spec.template b/rpm/devstudio.spec.template
@@ -39,9 +39,10 @@ Requires: rh-eclipse47-eclipse-cdt-parsers
 
 # m2e deps
 Requires: rh-eclipse47-eclipse-m2e-core rh-eclipse47-eclipse-m2e-workspace 
-# JBDS-4532 m2e extras
+# JBDS-4532, JBDS-4533 m2e extras
 Requires: rh-eclipse47-eclipse-m2e-buildhelper rh-eclipse47-eclipse-m2e-egit rh-eclipse47-eclipse-m2e-mavenarchiver
 Requires: rh-eclipse47-eclipse-m2e-tycho
+Requires: rh-eclipse47-eclipse-m2e-wtp
 
 # rse deps: org.eclipse.rse.core and org.eclipse.rse.ui
 Requires: rh-eclipse47-eclipse-rse
@@ -175,6 +176,9 @@ echo "org.slf4j.api,1.7.4,plugins/org.slf4j.api_1.7.4.jar,4,false" >> %{buildroo
 # %{buildroot}/usr/lib64/eclipse/eclipse.ini
 
 %changelog
+* Thu Oct 12 2017 Nick Boldt <nboldt@redhat.com> 11.1.0.20171012
+- JBDS-4533 Require rh-eclipse47-eclipse-m2e-wtp
+
 * Fri Oct 06 2017 Nick Boldt <nboldt@redhat.com> 11.1.0.20171006
 - JBDS-4567, JBDS-4537, JBDS-4578, JBDS-4579 Require rh-eclipse47-eclipse-dtp, rh-eclipse47-eclipse-webtools-common, servertools, sourceediting, javaee, jsf, dali
 - JBDS-4532 Require m2e extras: rh-eclipse47-eclipse-m2e-buildhelper, egit, mavenarchiver