From 3d01fa16fb99bf484a52d1f65682955c107e487c Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Thu, 1 Aug 2013 16:33:45 -0400
Subject: [PATCH] lttng: Partially revert 9017d8.

Plugin/Feature versions cannot change major version number on a
non-major release. Revert all plugins that went from 1.0.0 to 2.1.0.

Change-Id: Id3ff0976c381cb92e3d58a0128a24c5838def8ae
Reviewed-on: https://git.eclipse.org/r/15069
Tested-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---
 org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF        | 2 +-
 org.eclipse.linuxtools.ctf.parser/pom.xml                     | 2 +-
 .../META-INF/MANIFEST.MF                                      | 4 ++--
 org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml            | 2 +-
 org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF     | 2 +-
 org.eclipse.linuxtools.gdbtrace.core/pom.xml                  | 2 +-
 org.eclipse.linuxtools.gdbtrace.help/META-INF/MANIFEST.MF     | 2 +-
 org.eclipse.linuxtools.gdbtrace.help/pom.xml                  | 2 +-
 org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF | 4 ++--
 org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml              | 2 +-
 org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF       | 4 ++--
 org.eclipse.linuxtools.gdbtrace.ui/pom.xml                    | 2 +-
 org.eclipse.linuxtools.gdbtrace/feature.xml                   | 4 ++--
 org.eclipse.linuxtools.gdbtrace/pom.xml                       | 2 +-
 org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF    | 4 ++--
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
index bb97094924..4042466e17 100644
--- a/org.eclipse.linuxtools.ctf.parser/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.ctf.parser/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: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.ctf.parser
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.linuxtools.ctf.parser/pom.xml b/org.eclipse.linuxtools.ctf.parser/pom.xml
index 2795e97c89..543c0b1526 100644
--- a/org.eclipse.linuxtools.ctf.parser/pom.xml
+++ b/org.eclipse.linuxtools.ctf.parser/pom.xml
@@ -20,7 +20,7 @@
   <name>Linux Tools CTF Parser Plug-in</name>
   <groupId>org.eclipse.linuxtools.ctf</groupId>
   <artifactId>org.eclipse.linuxtools.ctf.parser</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
index bd614b0f42..887aadcf08 100644
--- a/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.core.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.core.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
- org.eclipse.linuxtools.gdbtrace.core;bundle-version="2.1.0"
+ org.eclipse.linuxtools.gdbtrace.core;bundle-version="1.1.0"
 Export-Package: org.eclipse.linuxtools.gdbtrace.core.tests
diff --git a/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml b/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
index 77655e1546..6e939442fd 100644
--- a/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace.core.tests/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.core.tests</artifactId>
   <groupId>org.eclipse.linuxtools.gdbtrace</groupId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis Core Tests Plug-in</name>
diff --git a/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
index f94a038a79..4a89fd1cdf 100644
--- a/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.linuxtools.internal.gdbtrace.core.GdbTraceCorePlugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.linuxtools.gdbtrace.core/pom.xml b/org.eclipse.linuxtools.gdbtrace.core/pom.xml
index b604d357ee..c9c918f0f8 100644
--- a/org.eclipse.linuxtools.gdbtrace.core/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace.core/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.core</artifactId>
   <groupId>org.eclipse.linuxtools.gdbtrace</groupId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis Core Plug-in</name>
diff --git a/org.eclipse.linuxtools.gdbtrace.help/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.gdbtrace.help/META-INF/MANIFEST.MF
index 5b24fc1ca7..de1dfe0591 100644
--- a/org.eclipse.linuxtools.gdbtrace.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.help/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: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.help;singleton:=true
 Require-Bundle: org.eclipse.help
diff --git a/org.eclipse.linuxtools.gdbtrace.help/pom.xml b/org.eclipse.linuxtools.gdbtrace.help/pom.xml
index 493581eb90..e6b1a956fa 100644
--- a/org.eclipse.linuxtools.gdbtrace.help/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace.help/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.help</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis Help Plug-in</name>
diff --git a/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
index e97cfce596..e96aa718c7 100644
--- a/org.eclipse.linuxtools.gdbtrace.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.ui.tests/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: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.ui.tests;singleton:=true
 Bundle-ActivationPolicy: lazy
@@ -10,5 +10,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.core.runtime,
  org.eclipse.ui,
- org.eclipse.linuxtools.gdbtrace.ui;bundle-version="2.1.0"
+ org.eclipse.linuxtools.gdbtrace.ui;bundle-version="1.1.0"
 Export-Package: org.eclipse.linuxtools.gdbtrace.ui.tests
diff --git a/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml b/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
index 5b8b95c8b1..2cb9f5aafe 100644
--- a/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace.ui.tests/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.ui.tests</artifactId>
   <groupId>org.eclipse.linuxtools.gdbtrace</groupId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis UI Tests Plug-in</name>
diff --git a/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
index 27764150db..f506ce32ee 100644
--- a/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUIPlugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.ui,
  org.eclipse.linuxtools.tmf.core;bundle-version="2.1.0",
  org.eclipse.linuxtools.tmf.ui;bundle-version="2.1.0",
- org.eclipse.linuxtools.gdbtrace.core;bundle-version="2.1.0"
+ org.eclipse.linuxtools.gdbtrace.core;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.linuxtools.internal.gdbtrace.ui;x-friends:="org.eclipse.linuxtools.gdbtrace.ui.tests",
diff --git a/org.eclipse.linuxtools.gdbtrace.ui/pom.xml b/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
index 1b7e1c03da..054d3a4442 100644
--- a/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace.ui/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.gdbtrace.ui</artifactId>
   <groupId>org.eclipse.linuxtools.gdbtrace</groupId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis UI Plug-in</name>
diff --git a/org.eclipse.linuxtools.gdbtrace/feature.xml b/org.eclipse.linuxtools.gdbtrace/feature.xml
index d3d6c91cad..00a26a1229 100644
--- a/org.eclipse.linuxtools.gdbtrace/feature.xml
+++ b/org.eclipse.linuxtools.gdbtrace/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.gdbtrace"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="1.1.0.qualifier"
       provider-name="%featureProvider"
       license-feature="org.eclipse.linuxtools.license.feature"
       license-feature-version="1.0.0.qualifier">
@@ -39,7 +39,7 @@
       <import plugin="org.eclipse.cdt.dsf.gdb.ui"/>
       <import plugin="org.eclipse.linuxtools.tmf.core" version="2.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.linuxtools.tmf.ui" version="2.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.gdbtrace.core" version="2.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.gdbtrace.core" version="1.1.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.linuxtools.gdbtrace/pom.xml b/org.eclipse.linuxtools.gdbtrace/pom.xml
index bb63596e72..dbb5b3ddbe 100644
--- a/org.eclipse.linuxtools.gdbtrace/pom.xml
+++ b/org.eclipse.linuxtools.gdbtrace/pom.xml
@@ -19,7 +19,7 @@
 
   <artifactId>org.eclipse.linuxtools.gdbtrace</artifactId>
   <groupId>org.eclipse.linuxtools.gdbtrace</groupId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <name>Linux Tools GDB Tracepoint Analysis Feature</name>
diff --git a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
index 039694275b..0d7a8e6f85 100644
--- a/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.alltests/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.linuxtools.ctf.core.tests;bundle-version="2.1.0",
- org.eclipse.linuxtools.gdbtrace.core.tests;bundle-version="2.1.0",
- org.eclipse.linuxtools.gdbtrace.ui.tests;bundle-version="2.1.0",
+ org.eclipse.linuxtools.gdbtrace.core.tests;bundle-version="1.1.0",
+ org.eclipse.linuxtools.gdbtrace.ui.tests;bundle-version="1.1.0",
  org.eclipse.linuxtools.lttng2.core.tests;bundle-version="2.1.0",
  org.eclipse.linuxtools.lttng2.ui.tests;bundle-version="2.1.0",
  org.eclipse.linuxtools.lttng2.kernel.core.tests;bundle-version="2.1.0",
-- 
2.34.1