releng: Add 2.1.0 baseline and fix API errors

Change-Id: I794f2670e344bf98d3587abeaf97ea279d2a9b3f
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/81634
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Tested-by: Alexandre Montplaisir <alexmonthy@efficios.com>

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF
index 4e9e32182bd99efaa79cc1771e81551c78a657ed..e45246c1d18e1b0607c12505195fa58977b606d3 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.analysis.timing.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.analysis.timing.core.Activator

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java
index 8b80610b995a66d660bd8ac4102e732d21c6968a..23ce5f65f986db349d9273eb6ba15fa7c19c435d 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java
@@ -154,7 +154,7 @@ public class SegmentStoreStatistics {
      *
      * @param other
      *            The other segment store statistics
-     * @since 1.1
+     * @since 1.2
      */
     public void merge(SegmentStoreStatistics other) {
         if (other.fNbSegments == 0) {

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF
index 2a8f7240362f9c00886b868b218499affb2ea7e5..200ef44b5f424632ea7022a7ffffaf732d97955c 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ lttManifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.analysis.timing.ui;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.analysis.timing.ui.Activator

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java
index cf264dfc75b120d3e76059a95f345b24fcc375d2..5bb0544cf0529cb2a1d124d4250f50803f4b891d 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java
@@ -426,7 +426,7 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr
      * Get the type label
      *
      * @return the label
-     * @since 1.1
+     * @since 1.2
      */
     protected String getTypeLabel() {
         return checkNotNull(Messages.AbstractSegmentStoreStatisticsViewer_types);
@@ -436,7 +436,7 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr
      * Get the total column label
      *
      * @return the totals column label
-     * @since 1.1
+     * @since 1.2
      */
     protected String getTotalLabel() {
         return checkNotNull(Messages.AbstractSegmentStoreStatisticsViewer_total);

diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target
new file mode 100644 (file)
index 0000000..0151bcf
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="tracecompass-baseline-2.1.0" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tracecompass.analysis.graph.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.graph.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.lami.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.lami.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.os.linux.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.os.linux.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.timing.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.timing.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.btf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.btf.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.common.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.ctf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.ctf.parser" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.gdbtrace.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.gdbtrace.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.common.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.pcap.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.segmentstore.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.statesystem.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.analysis.xml.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.analysis.xml.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.chart.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.chart.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ctf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tracecompass/neon/milestones/ur1-rc4"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.core.runtime" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+</locations>
+</target>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF
index 77609d5973ab82184b3cdfaa09890ab4043c6b28..6c964c0b44982c25bb405d4ebc03131cba42c26c 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.tmf.ui;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.tmf.ui.Activator

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java
index 455b631d8f791040d58b39a9200e5215c37f42cb..f073027a660d920c80f6719f583ae03340f26124 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java
@@ -207,7 +207,7 @@ public abstract class TmfView extends ViewPart implements ITmfComponent {
      * simply <Primary ID> if secondary ID is null
      *
      * @return This view's view ID
-     * @since 2.1
+     * @since 2.2
      */
     protected String getViewId() {
         IViewSite viewSite = getViewSite();

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java
index 97e49e2147b50a12042b2c9e6ee21d3ddd2be5b4..2f736b1b83462aeef821c867bd6e14fbe32f2724 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java
@@ -20,7 +20,7 @@ import org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput;
  * extension to add the view, but the listener fixes the issue.
  *
  * @author Geneviève Bastien
- * @since 2.1
+ * @since 2.2
  */
 public class CallStackAnalysisListener implements ITmfNewAnalysisModuleListener {