From ee171eb05c70d1255dfe68234b1dd5cf87253d43 Mon Sep 17 00:00:00 2001
From: Thanh Ha
Date: Fri, 24 May 2013 21:06:02 -0400
Subject: Bug 408992 - Use eclipse-cbi-plugin 1.0.3 released version

- Also updated all cbi-plugin declarations to use a variable
  cbi-plugins.version to set the version just like we do with
  Tycho
---
 eclipse-platform-parent/pom.xml                          | 16 +++-------------
 .../eclipse-junit-tests/pom.xml                          |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 5fff1d422..84089c3c8 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -24,6 +24,7 @@
     <comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-I-builds</comparator.repo>
     <tycho.version>0.18.0</tycho.version>
     <tycho-extras.version>0.18.0</tycho-extras.version>
+    <cbi-plugins.version>1.0.3</cbi-plugins.version>
     <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/</orbit-repo.url>
     <jetty-repo.url>http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.10.v20130312/</jetty-repo.url>
     <ecf-repo.url>http://download.eclipse.org/rt/ecf/int6/site.p2/</ecf-repo.url>
@@ -39,7 +40,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
     <cbi-jdt-version>3.9.0.v20130515-1045</cbi-jdt-version>
-    <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
     <eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
     <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.3-I-builds</eclipse-p2-repo.url>
   </properties>
@@ -128,16 +128,6 @@
         <enabled>true</enabled>
       </snapshots>
     </pluginRepository>
-    <pluginRepository>
-      <id>cbi-snapshots</id>
-      <url>${cbi-snapshots-repo.url}</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
   </pluginRepositories>
   <build>
     <plugins>
@@ -150,7 +140,7 @@
       <plugin>
         <groupId>org.eclipse.cbi.maven.plugins</groupId>
         <artifactId>eclipse-cbi-plugin</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${cbi-plugins.version}</version>
         <executions>
           <execution>
             <goals>
@@ -442,7 +432,7 @@
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-jarsigner-plugin</artifactId>
-            <version>1.0.2</version>
+            <version>${cbi-plugins.version}</version>
             <executions>
               <execution>
                 <id>sign</id>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index f8cdd526f..81a82e13a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -164,7 +164,7 @@
       <plugin>
         <groupId>org.eclipse.cbi.maven.plugins</groupId>
         <artifactId>eclipse-cbi-plugin</artifactId>
-        <version>1.0.0</version>
+        <version>${cbi-plugins.version}</version>
         <executions>
           <execution>
             <id>plugin-versions</id>
-- 
cgit v1.2.3