Merge branch 'master' into pu

erlang · Jul 18, 2017 · 739aa16 · 739aa16
2 parents fa7a2fe + 3b27733
commit 739aa16
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,18 +2,18 @@
 
 pipeline {
 	agent any
-	options { 
-		disableConcurrentBuilds() 
+	options {
+		disableConcurrentBuilds()
 		timestamps()
-		skipDefaultCheckout() 
-		buildDiscarder(logRotator(numToKeepStr: '10')) 
+		skipDefaultCheckout()
+		buildDiscarder(logRotator(numToKeepStr: '10'))
 	}
 	stages {
 		stage('Checkout') {
 			steps{
 				retry(3) {
 					timeout(time: 30, unit: 'SECONDS') {
-						script { 
+						script {
 							checkout()
 						}
 					}
@@ -32,8 +32,8 @@ pipeline {
 
 		stage('Archive') {
 			steps{
-				script { 
-					archive = archive() 
+				script {
+					archive = archive()
 				}
 			}
 		}
@@ -63,7 +63,7 @@ def checkout() {
 	checkout([
 			$class: 'GitSCM',
 			branches: scm.branches,
-			extensions: scm.extensions + [[$class: 'CleanCheckout'], [$class: 'CloneOption', depth: 10, noTags: true, reference: '', shallow: true]],
+			extensions: scm.extensions + [[$class: 'CleanCheckout'], [$class: 'CloneOption', depth: 100, noTags: true, reference: '', shallow: true]],
 			userRemoteConfigs: scm.userRemoteConfigs
 			])
 
@@ -188,7 +188,7 @@ def p2_add_composite(def dir, def base) {
 }
 
 def generate_version_info(def vsn, def base) {
-	sh 'git describe > GIT_INFO'
+	sh 'git describe --tags > GIT_INFO'
 	def info = readFile('GIT_INFO').trim()
 	writeFile file: "${base}/info.js", text: "document.write('${info}');"
 	writeFile file: "${base}/version.js", text: "document.write('${vsn}');"

diff --git a/org.erlide.parent/pom.xml b/org.erlide.parent/pom.xml
@@ -54,7 +54,7 @@
 		<repository>
 			<id>kernel</id>
 			<layout>p2</layout>
-			<url>http://download.erlide.org/update/kernel/0.114.0</url>
+			<url>http://download.erlide.org/update/kernel/0.115.1</url>
 		</repository>
 	</repositories>
 
@@ -74,7 +74,7 @@
 
 
 		<module>../org.erlide.help</module>
-		
+
 		<module>../org.erlide.jvmcheck</module>
 		<module>../org.erlide.libs</module>
 		<module>../org.erlide.libs.annotations</module>

diff --git a/org.erlide.product.feature/feature.xml b/org.erlide.product.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.erlide.product.feature"
       label="erlide product feature"
-      version="0.52.0.qualifier"
+      version="0.52.1.qualifier"
       provider-name="erlide.org project"
       plugin="org.erlide.branding">
 
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import feature="org.erlide" version="0.50.1.qualifier" match="compatible"/>
+      <import feature="org.erlide" version="0.52.1.qualifier" match="compatible"/>
       <import feature="org.eclipse.platform" version="4.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.sdk" version="4.5.0"/>
    </requires>

diff --git a/org.erlide.product.feature/pom.xml b/org.erlide.product.feature/pom.xml
@@ -11,6 +11,6 @@
 	</parent>
 
 	<artifactId>org.erlide.product.feature</artifactId>
-	<version>0.52.0-SNAPSHOT</version>
+	<version>0.52.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.erlide.product.site/erlide.product b/org.erlide.product.site/erlide.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="erlide" uid="org.erlide.product" id="org.erlide.branding.product" application="org.eclipse.ui.ide.workbench" version="0.50.0" useFeatures="true" includeLaunchers="true">
+<product name="erlide" uid="org.erlide.product" id="org.erlide.branding.product" application="org.eclipse.ui.ide.workbench" version="0.52.1" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.erlide.branding/images/erl-zen-badge-160.png"/>