diff --git a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/xychart/ChartMultiViewer.java b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/xychart/ChartMultiViewer.java
index 4a4083f..d90d6e4 100644
--- a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/xychart/ChartMultiViewer.java
+++ b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/xychart/ChartMultiViewer.java
@@ -30,7 +30,6 @@
 import org.eclipse.tracecompass.tmf.ui.viewers.ILegendImageProvider2;
 import org.eclipse.tracecompass.tmf.ui.viewers.TmfTimeViewer;
 import org.eclipse.tracecompass.tmf.ui.viewers.TmfViewer;
-import org.eclipse.tracecompass.tmf.ui.viewers.tree.AbstractSelectTreeViewer;
 import org.eclipse.tracecompass.tmf.ui.viewers.tree.AbstractSelectTreeViewer2;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.TmfXYChartViewer;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.XYChartLegendImageProvider;
@@ -206,7 +205,7 @@
     }
 
     /**
-     * Method to couple {@link AbstractSelectTreeViewer} and
+     * Method to couple {@link AbstractSelectTreeViewer2} and
      * {@link TmfFilteredXYChartViewer} so that they use the same legend and
      * that the chart listens to selected items in the tree
      */
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui.swtbot.tests/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.callstack.ui.swtbot.tests/META-INF/MANIFEST.MF
index 36531e6..5edfa57 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui.swtbot.tests/META-INF/MANIFEST.MF
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui.swtbot.tests/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.tracecompass.incubator.analysis.core
 Import-Package: org.apache.log4j,
- org.swtchart,
  com.google.common.collect
 Export-Package: org.eclipse.tracecompass.incubator.callstack.core.ui.swtbot.tests.flamegraph
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.callstack.ui.swtbot.tests
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/META-INF/MANIFEST.MF b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/META-INF/MANIFEST.MF
index e05deea..3c05cb9 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/META-INF/MANIFEST.MF
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/META-INF/MANIFEST.MF
@@ -40,6 +40,5 @@
  com.google.common.base,
  com.google.common.cache,
  com.google.common.collect,
- org.apache.commons.lang3,
- org.swtchart
+ org.apache.commons.lang3
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.callstack.ui
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java
index b5991b1..2a6926d 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityView.java
@@ -17,8 +17,8 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density.AbstractSegmentStoreDensityView;
-import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density.AbstractSegmentStoreDensityViewer;
+import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityView;
+import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityViewer;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableViewer;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
 import org.eclipse.tracecompass.tmf.core.segment.SegmentDurationAspect;
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityViewer.java b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityViewer.java
index 07edcf7..2228706 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityViewer.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/views/functiondensity/FunctionDensityViewer.java
@@ -15,7 +15,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.ISegmentStoreProvider;
-import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density.AbstractSegmentStoreDensityViewer;
+import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityViewer;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack/feature.xml b/callstack/org.eclipse.tracecompass.incubator.callstack/feature.xml
index 4661938..93b86ad 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack/feature.xml
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack/feature.xml
@@ -38,7 +38,6 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.tracecompass.analysis.timing.ui"/>
       <import plugin="org.eclipse.tracecompass.tmf.ui"/>
-      <import plugin="org.swtchart"/>
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.tracecompass.analysis.profiling.core"/>
diff --git a/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml b/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
index a6aaa24..64098d7 100644
--- a/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
+++ b/common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
@@ -44,7 +44,7 @@
         <skipWebContentGeneration>true</skipWebContentGeneration>
         <associateSites>
            <site>https://download.eclipse.org/ease/release/0.7.0</site>
-           <site>https://dl.bintray.com/py4j/py4j-eclipse/0.10.8.1</site>
+           <site>http://eclipse.py4j.org</site>
         </associateSites>
         <skipBuildInfo>true</skipBuildInfo>
       </configuration>
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-2019-06.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-2019-06.target
index a298b33..c32191d 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-2019-06.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-2019-06.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-incubator-2019-06" sequenceNumber="4">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-incubator-2019-06" sequenceNumber="5">
 <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"/>
@@ -37,8 +37,6 @@
 <unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.apache.commons.math3" version="0.0.0"/>
-<unit id="org.swtchart" version="0.10.0.v201605200358"/>
-<unit id="org.swtchart.source" version="0.10.0.v201605200358"/>
 <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
 <unit id="org.json" version="0.0.0"/>
 <unit id="org.apache.derby" version="0.0.0"/>
@@ -168,7 +166,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.py4j.feature.feature.group" version="0.0.0"/>
-<repository location="http://eclipse.py4j.org."/>
+<repository location="http://eclipse.py4j.org/"/>
 </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
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 ff3fbd6..9e4c700 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tracecompass-incubator-master" sequenceNumber="47">
+<target name="tracecompass-incubator-master" sequenceNumber="48">
 <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"/>
@@ -30,8 +30,6 @@
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.apache.xml.serializer" version="0.0.0"/>
 <unit id="org.apache.commons.math3" version="0.0.0"/>
-<unit id="org.swtchart" version="0.10.0.v201605200358"/>
-<unit id="org.swtchart.source" version="0.10.0.v201605200358"/>
 <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
 <unit id="org.json" version="0.0.0"/>
 <unit id="org.apache.derby" version="0.0.0"/>
@@ -153,7 +151,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2020-12"/>
+<repository location="https://download.eclipse.org/releases/2020-12"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ease.feature.feature.group" version="0.0.0"/>
@@ -179,4 +177,4 @@
 -Xmx512M</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
-</target>
\ No newline at end of file
+</target>
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target
index 22918ce..a69679f 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tracecompass-incubator-master" sequenceNumber="4">
+<target name="tracecompass-incubator-master" sequenceNumber="5">
 <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"/>
@@ -43,8 +43,6 @@
 <unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.apache.commons.math3" version="0.0.0"/>
-<unit id="org.swtchart" version="0.10.0.v201605200358"/>
-<unit id="org.swtchart.source" version="0.10.0.v201605200358"/>
 <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
 <unit id="org.json" version="0.0.0"/>
 <unit id="org.apache.derby" version="0.0.0"/>
diff --git a/pom.xml b/pom.xml
index 9b3a75a..748bd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <testArgLine></testArgLine>
 
-    <tycho-version>1.3.0</tycho-version>
-    <tycho-extras-version>1.3.0</tycho-extras-version>
+    <tycho-version>1.7.0</tycho-version>
+    <tycho-extras-version>1.7.0</tycho-extras-version>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass.incubator/org.eclipse.tracecompass.incubator.git</tycho.scmUrl>
     <cbi-plugins.version>1.3.1</cbi-plugins.version>
     <target-platform>tracecompass-incubator-master</target-platform>
diff --git a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
index 4f1cb65..c8321a6 100644
--- a/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
+++ b/scripting/org.eclipse.tracecompass.incubator.scripting.ui/META-INF/MANIFEST.MF
@@ -39,5 +39,4 @@
  org.eclipse.tracecompass.incubator.scripting.ui.tracemarker,
  org.eclipse.tracecompass.incubator.scripting.ui.views
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.scripting.ui
-Import-Package: com.google.common.collect,
- org.swtchart
+Import-Package: com.google.common.collect
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/META-INF/MANIFEST.MF
index b9f6bbb..b0f2594 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/META-INF/MANIFEST.MF
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.incubator.ros.core,
  org.eclipse.tracecompass.tmf.ui,
- org.swtchart,
  org.eclipse.tracecompass.tmf.core,
  org.eclipse.tracecompass.analysis.os.linux.ui,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
diff --git a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui.swtbot.tests/META-INF/MANIFEST.MF b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui.swtbot.tests/META-INF/MANIFEST.MF
index 6ee34cf..b8744b9 100644
--- a/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui.swtbot.tests/META-INF/MANIFEST.MF
+++ b/vm/org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui.swtbot.tests/META-INF/MANIFEST.MF
@@ -25,6 +25,5 @@
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui.swtbot.test.vcpu;x-internal:=true
 Import-Package: com.google.common.collect,
- org.apache.log4j,
- org.swtchart
+ org.apache.log4j
 Automatic-Module-Name: org.eclipse.tracecompass.incubator.virtual.machine.analysis.ui.swtbot.tests