From c7881b5a9894ee1fdb2fa9bc5dd37359533627b5 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Mon, 28 May 2018 22:46:59 +0100
Subject: [PATCH] Bug 535239: [releng] Update versions

- dependency of orbit version updated to Photon M7 (and remove direct
  build against orbit-recipes Jenkins)
- build against Photon platform (instead of simrel) to reduce any circular
  dependency issues
- fix tycho-pomless version
- update tools.templates to be 1.1.0
- Set zip file name to be standard naming scheme CDT uses

Change-Id: If075e623317c9ac87df2cf67024cf6c35298c3f4
---
 .mvn/extensions.xml |  2 +-
 bundles/pom.xml     |  2 +-
 pom.xml             | 16 +++-------------
 repo/pom.xml        |  6 +++++-
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 9d93c39fd93..2e007209276 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </extension>
 </extensions>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index e12a5fa4e41..8c820cfab9d 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.tools.templates</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>bundle-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index 6b5be7c098d..22e250a03fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.eclipse.tools.templates</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -32,14 +32,9 @@
 	</licenses>
 
 	<repositories>
-		<repository>
-			<id>eclipse</id>
-			<url>http://download.eclipse.org/releases/oxygen/</url>
-			<layout>p2</layout>
-		</repository>
 		<repository>
 			<id>platform</id>
-			<url>http://download.eclipse.org/eclipse/updates/4.7/</url>
+			<url>http://download.eclipse.org/eclipse/updates/4.8milestones/</url>
 			<layout>p2</layout>
 		</repository>
 		<repository>
@@ -49,12 +44,7 @@
 		</repository>
 		<repository>
 			<id>orbit</id>
-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>orbit-recipes</id>
-			<url>https://hudson.eclipse.org/orbit/job/orbit-recipes/lastSuccessfulBuild/artifact/releng/repository/target/repository/</url>
+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20180504181223/repository/</url>
 			<layout>p2</layout>
 		</repository>
 	</repositories>
diff --git a/repo/pom.xml b/repo/pom.xml
index 2c9419a067e..f4feb24b2fe 100644
--- a/repo/pom.xml
+++ b/repo/pom.xml
@@ -5,10 +5,14 @@
 	<parent>
 		<groupId>org.eclipse.tools.templates</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>repo</artifactId>
 	<packaging>eclipse-repository</packaging>
+	
+	<build>
+		<finalName>org.eclipse.tools.templates.repo</finalName>
+	</build>
 </project>