From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Thu, 8 Dec 2016 15:33:36 +0000 (-0500)
Subject: releng: Add 2.2.0 baseline and fix API errors
X-Git-Url: https://git.efficios.com/?a=commitdiff_plain;h=5e479c4fa8d46c977561d00f316b9d3d47d0626e;p=deliverable%2Ftracecompass.git

releng: Add 2.2.0 baseline and fix API errors

Change-Id: Ibd9762699e2bd4616c34d6641d678f89eafafb65
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/86730
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.os.linux.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF
index 5ce1b52328..8aa91e6111 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.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: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.analysis.os.linux.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.analysis.os.linux.core.Activator
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/IKernelAnalysisEventLayout.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/IKernelAnalysisEventLayout.java
index dc8afdf4a6..8a583c0544 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/IKernelAnalysisEventLayout.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/IKernelAnalysisEventLayout.java
@@ -225,7 +225,7 @@ public interface IKernelAnalysisEventLayout {
      * from the waking context.
      *
      * @return The name of the event
-     * @since 2.1
+     * @since 2.2
      */
     default String eventSchedProcessWaking() {
         return "sched_waking"; //$NON-NLS-1$
diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.2.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.2.0.target
new file mode 100644
index 0000000000..3425a7097a
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.2.0.target
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="tracecompass-baseline-2.2.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/ur2-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/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF
index 0404091143..eae7c0758a 100644
--- a/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF
+++ b/statesystem/org.eclipse.tracecompass.statesystem.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: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.statesystem.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.statesystem.core.Activator
diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/StateSystemUtils.java b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/StateSystemUtils.java
index 8c90bece69..df9b4e7030 100644
--- a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/StateSystemUtils.java
+++ b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/StateSystemUtils.java
@@ -286,7 +286,7 @@ public final class StateSystemUtils {
      * Iterator class to allow 2-way iteration over intervals of a given
      * attribute. Not thread-safe!
      *
-     * @since 2.1
+     * @since 2.2
      */
     public static class QuarkIterator implements Iterator<ITmfStateInterval> {
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF
index 9d067230eb..223d6acd78 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF
+++ b/tmf/org.eclipse.tracecompass.tmf.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: 2.2.0.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.tmf.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.tmf.core.Activator
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisParameterProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisParameterProvider.java
index 00872a8aed..d80771522e 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisParameterProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/IAnalysisParameterProvider.java
@@ -68,7 +68,7 @@ public interface IAnalysisParameterProvider {
     /**
      * Dispose of the parameter provider
      *
-     * @since 2.2
+     * @since 2.3
      */
     default void dispose() {
         /* override to perform any necessary cleanup */
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
index ddedde2d4e..4f8ea79de2 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/analysis/TmfAnalysisManager.java
@@ -57,7 +57,7 @@ public class TmfAnalysisManager {
     /**
      * Disposes the analysis manager
      *
-     * @since 2.2
+     * @since 2.3
      */
     public static void dispose() {
         TmfAnalysisParameterProviders.dispose();
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
index 711fe252a2..32dd6ac9ac 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/statesystem/TmfStateSystemAnalysisModule.java
@@ -195,7 +195,7 @@ public abstract class TmfStateSystemAnalysisModule extends TmfAbstractAnalysisMo
      * Get the file where to save the results of the analysis
      *
      * @return The file to save the results in
-     * @since 2.2
+     * @since 2.3
      */
     @VisibleForTesting
     protected @Nullable File getSsFile() {
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java
index b7332b8cc2..7594c461b8 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTraceManager.java
@@ -109,7 +109,7 @@ public final class TmfTraceManager {
     /**
      * Disposes the trace manager
      *
-     * @since 2.2
+     * @since 2.3
      */
     public void dispose() {
         TmfSignalManager.deregister(this);
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 b008836d58..ed88ebf7a7 100644
--- 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.2.0.qualifier
+Bundle-Version: 2.3.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/markers/PeriodicMarkerEventSource.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/markers/PeriodicMarkerEventSource.java
index 15062f95d6..eea5488e67 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/markers/PeriodicMarkerEventSource.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/markers/PeriodicMarkerEventSource.java
@@ -67,7 +67,7 @@ public class PeriodicMarkerEventSource implements IMarkerEventSource {
          *            the reference marker time in time units
          * @param index
          *            the reference marker index
-         * @since 2.2
+         * @since 2.3
          */
         public Reference(long time, long index) {
             this.time = time;
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/ITmfProjectModelElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/ITmfProjectModelElement.java
index 05624c3029..7317862435 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/ITmfProjectModelElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/ITmfProjectModelElement.java
@@ -116,7 +116,7 @@ public interface ITmfProjectModelElement {
     /**
      * Recursively dispose of the element and its children.
      *
-     * @since 2.2
+     * @since 2.3
      */
     default void dispose() {
         getChildren().forEach(element -> element.dispose());
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
index 0b3aa0c2d9..26d95f4617 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfCommonProjectElement.java
@@ -104,6 +104,9 @@ public abstract class TmfCommonProjectElement extends TmfProjectModelElement {
     // ITmfProjectModelElement
     // ------------------------------------------------------------------------
 
+    /**
+     * @since 2.3
+     */
     @Override
     public void dispose() {
         super.dispose();
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectRegistry.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectRegistry.java
index 56bd8ccb29..824bae07e9 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectRegistry.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectRegistry.java
@@ -59,7 +59,7 @@ public class TmfProjectRegistry implements IResourceChangeListener {
     /**
      * Disposes the project registry
      *
-     * @since 2.2
+     * @since 2.3
      */
     public static void dispose() {
         ResourcesPlugin.getWorkspace().removeResourceChangeListener(INSTANCE);
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
index ea8a64c5ed..30a49678df 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
@@ -1611,7 +1611,7 @@ public class TimeGraphControl extends TimeGraphBaseControl
      *
      * @param entry the time graph entry
      * @return the bounds of the entry, or null if the entry is not visible
-     * @since 2.2
+     * @since 2.3
      */
     public Rectangle getItemBounds(ITimeGraphEntry entry) {
         int idx = fItemData.findItemIndex(entry);