Bug 481272 - update Build Tools build
diff --git a/features/org.eclipse.releng.build.tools.feature.source/feature.xml b/features/org.eclipse.releng.build.tools.feature.source/feature.xml
index 0ce8c00..5679bd9 100644
--- a/features/org.eclipse.releng.build.tools.feature.source/feature.xml
+++ b/features/org.eclipse.releng.build.tools.feature.source/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.releng.build.tools.feature.source"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="1.0.101.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.0.qualifier">
diff --git a/features/org.eclipse.releng.build.tools.feature.source/pom.xml b/features/org.eclipse.releng.build.tools.feature.source/pom.xml
index 493aebd..ef2761b 100644
--- a/features/org.eclipse.releng.build.tools.feature.source/pom.xml
+++ b/features/org.eclipse.releng.build.tools.feature.source/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.releng.build.tools.feature.source</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.101-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.releng.build.tools.feature/feature.xml b/features/org.eclipse.releng.build.tools.feature/feature.xml
index a8df075..af73947 100644
--- a/features/org.eclipse.releng.build.tools.feature/feature.xml
+++ b/features/org.eclipse.releng.build.tools.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.releng.build.tools.feature"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="1.0.101.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.0.qualifier">
+      license-feature-version="1.0.1.v20140414-1359">
 
    <description>
       %description
diff --git a/features/org.eclipse.releng.build.tools.feature/pom.xml b/features/org.eclipse.releng.build.tools.feature/pom.xml
index 1694504..f07a537 100644
--- a/features/org.eclipse.releng.build.tools.feature/pom.xml
+++ b/features/org.eclipse.releng.build.tools.feature/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.platform</groupId>
   <artifactId>org.eclipse.releng.build.tools.feature</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.101-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index e25b631..d6799de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,9 @@
     <version>1.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <tycho.version>0.23.1</tycho.version>
-        <tycho-extras.version>0.23.1</tycho-extras.version>
-        <cbi-plugins.version>1.1.2</cbi-plugins.version>
+        <tycho.version>0.25.0</tycho.version>
+        <tycho-extras.version>0.25.0</tycho-extras.version>
+        <cbi-plugins.version>1.1.3</cbi-plugins.version>
         <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
         <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
         <buildType>I</buildType>
@@ -32,14 +32,15 @@
         <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
         <buildType>I</buildType>
         <buildId>${buildType}${buildTimestamp}</buildId>
-        <comparator.repo>http://download.eclipse.org/eclipse/updates/4.6-I-builds</comparator.repo>
+        <comparator.repo>http://download.eclipse.org/eclipse/updates/4.7-I-builds</comparator.repo>
         <egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
-        <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url>
         <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.12.0.v20150802-2146</cbi-jdt-version>
+        <cbi-jdt-version>3.12.0.v20160516-2131</cbi-jdt-version>
+        <cbi-jdt-apt-version>1.2.100.v20160418-1457</cbi-jdt-apt-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-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
         <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.6-I-builds</eclipse-p2-repo.url>
 
         <!-- CBI provided common license feature. (bug 394793) -->
@@ -57,16 +58,6 @@
     </modules>
     <pluginRepositories>
         <pluginRepository>
-            <id>tycho</id>
-            <url>${tycho-repo.url}</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
             <id>cbi-jdt</id>
             <url>${cbi-jdt-repo.url}</url>
             <releases>