Updated to Jenkins version of p2gen plugin

.gitignore

@@ -1,6 +1,7 @@
+/.m2/
 bin/
-.gradle/
 build/
+.gradle/
 *._trace
 *.xtendbin
 org.eclipse.buildship.core.prefs

Jenkinsfile

@@ -1,4 +1,4 @@
-// tell Jenkins how to build projects from this repository
+// Tell Jenkins how to build projects from this repository
 node {
 	try {
 		stage 'Checkout'
@@ -15,7 +15,7 @@ node {
 		stage 'Maven Build'
         def mvnHome = tool 'M3'
         env.M2_HOME = "${mvnHome}"
-        sh "${mvnHome}/bin/mvn -f releng/pom.xml --batch-mode --update-snapshots clean install"
+        sh "${mvnHome}/bin/mvn -f releng --batch-mode --update-snapshots -Dmaven.repo.local=.m2/repository clean install"
         archive 'build/**/*.*'
 		
 		slackSend "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"

build.gradle

@@ -3,9 +3,14 @@
  */
 
 buildscript {
-	repositories.mavenLocal()
+	repositories {
+		jcenter()
+		maven {
+			url 'http://services.typefox.io/open-source/jenkins/job/gradle-plugins/lastStableBuild/artifact/build/maven-repository/'
+		}
+	}
 	dependencies {
-		classpath 'io.typefox:p2-repo-gen:0.1.0'
+		classpath 'io.typefox.gradle:io.typefox.gradle.p2gen:0.1.0'
 	}
 }
 

gradle/p2-deployment.gradle

@@ -3,16 +3,16 @@
  * The generator task should be rerun whenever necessary, e.g. when the version changes.
  */
 
-apply plugin: 'io.typefox.p2gen'
+apply plugin: 'io.typefox.gradle.p2gen'
 
 group = 'org.eclipse.xtext'
 
 p2gen {
-	targetRepository {
-		location "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${versions.xtext_bootstrap}/"
-		unit 'org.eclipse.xtext.sdk.feature.group'
+	dependencies {
+		repositoryUrl "http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${versions.xtext_bootstrap}/"
+		feature 'org.eclipse.xtext.sdk'
 	}
-	targetRepository {
-		location 'http://download.eclipse.org/releases/luna/201502271000/'
+	dependencies {
+		repositoryUrl 'http://download.eclipse.org/releases/luna/201502271000/'
 	}
 }

releng/pom.xml

@@ -18,11 +18,19 @@
 			<url>file:${root-dir}/build/maven-repository</url>
 		</repository>
 		<repository>
+			<id>BintrayJCenter</id>
+			<url>https://jcenter.bintray.com/</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-			<id>jcenter</id>
-			<url>http://jcenter.bintray.com</url>
+		</repository>
+		<repository>
+			<id>maven</id>
+			<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/maven-repository/</url>
+		</repository>
+		<repository>
+			<id>maven2</id>
+			<url>http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/master/lastStableBuild/artifact/build/maven-repository/</url>
 		</repository>
 	</repositories>
 

releng/releng-target/xtext-core.target.target

@@ -3,8 +3,8 @@
 <target name="org.eclipse.xtext.helios.target" sequenceNumber="0">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
-			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 			<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
+			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 			<repository location="http://download.eclipse.org/releases/luna/201502271000/"/>