Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeneviève Bastien2019-07-03 13:48:29 -0400
committerGenevieve Bastien2019-08-01 16:06:25 -0400
commit8f103465128b788ba0672dfdbbe3d357f9377154 (patch)
tree66ac63d7ddde069e61f788b2480e91fc17f7bc52
parent1122cc964aa2f35fcdd2d8c189e9d7e18cd4babb (diff)
downloadorg.eclipse.tracecompass.incubator-8f103465128b788ba0672dfdbbe3d357f9377154.tar.gz
org.eclipse.tracecompass.incubator-8f103465128b788ba0672dfdbbe3d357f9377154.tar.xz
org.eclipse.tracecompass.incubator-8f103465128b788ba0672dfdbbe3d357f9377154.zip
releng: Remove common associateSites in update site
To avoid incubator plugin installation to interfere with TraceCompass's dependencies, we should publish the plugins that come from common update sites in the incubator update site and reserver the associateSites to external dependencies and libraries. Also added the org.mozilla.javascript 1.7.5 in the target because the latest version 1.7.10 has a bug with EASE Script Shell (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=548644) Change-Id: I066850a32182df85e57989f0e5abed106ad55342 Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net> Reviewed-on: https://git.eclipse.org/r/145421 Tested-by: CI Bot Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
-rw-r--r--common/org.eclipse.tracecompass.incubator.releng-site/category.xml8
-rw-r--r--common/org.eclipse.tracecompass.incubator.releng-site/pom.xml2
-rw-r--r--common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target3
3 files changed, 10 insertions, 3 deletions
diff --git a/common/org.eclipse.tracecompass.incubator.releng-site/category.xml b/common/org.eclipse.tracecompass.incubator.releng-site/category.xml
index 5521c131..22d6d785 100644
--- a/common/org.eclipse.tracecompass.incubator.releng-site/category.xml
+++ b/common/org.eclipse.tracecompass.incubator.releng-site/category.xml
@@ -65,6 +65,14 @@
<bundle id="org.eclipse.lsp4j.jsonrpc"/>
<bundle id="org.eclipse.xtext.xbase.lib"/>
<bundle id="org.apache.commons.lang"/>
+ <bundle id="org.mozilla.javascript"/>
+ <bundle id="org.eclipse.wst.jsdt.ui"/>
+ <bundle id="org.eclipse.wst.jsdt.core"/>
+ <bundle id="org.eclipse.wst.jsdt.debug.core"/>
+ <bundle id="org.eclipse.wst.jsdt.debug.ui"/>
+ <bundle id="com.google.javascript"/>
+ <bundle id="com.google.protobuf"/>
+ <bundle id="org.eclipse.wst.jsdt.manipulation"/>
<category-def name="trace-types" label="Trace Types"/>
<category-def name="virtualization" label="Virtualization"/>
<category-def name="analyses" label="Analyses"/>
diff --git a/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml b/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
index e0d5392b..1f1e915f 100644
--- a/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
+++ b/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
@@ -41,8 +41,6 @@
<removeDefaultCategory>true</removeDefaultCategory>
<skipWebContentGeneration>true</skipWebContentGeneration>
<associateSites>
- <site>https://download.eclipse.org/webtools/downloads/drops/R3.13.0/I-latest/repository/</site>
- <site>http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/</site>
<site>http://download.eclipse.org/ease/update/release</site>
<site>https://dl.bintray.com/py4j/py4j-eclipse/0.10.4</site>
</associateSites>
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
index d1f1e45e..8fa3e62b 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-incubator-master" sequenceNumber="30">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-incubator-master" sequenceNumber="31">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -89,6 +89,7 @@
<unit id="org.glassfish.jersey.ext.entityfiltering.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="0.0.0"/>
<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="0.0.0"/>
+<unit id="org.mozilla.javascript" version="1.7.5.v201504281450"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

Back to the top