Remove special version handling during CI build
This commit removes the timestamp generation during CI build
and uses 'BUILD-SNAPSHOT' instead.
diff --git a/build.gradle b/build.gradle
index 206d374..4374dda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,22 +42,12 @@
}
}
-def timestamp = new Date().format('yyyyMMddHHmmss', TimeZone.getTimeZone('GMT'))
-
defaultTasks 'clean', 'jar', 'build', 'distZip'
def Properties versions = new Properties()
versions.load(new FileInputStream(project.rootProject.file('gradle.properties')))
project.ext.props = versions
-allprojects() {
- if (System.properties['ci.build'] == 'true') {
- version = '3.8.0.D-' + timestamp
- } else {
- version = '3.8.0.BUILD-SNAPSHOT'
- }
-}
-
ext.appsProjects = [
project(':apps:org.eclipse.virgo.apps.repository.core'),
project(':apps:org.eclipse.virgo.apps.repository.web'),
@@ -617,15 +607,12 @@
apply plugin: 'org.eclipse.virgo.bundlor'
- task('addProjectVersionToGradlePropertiesTask', type: Copy) {
+ task('copyGradlePropertiesTask', type: Copy) {
ext.outputDir = new File(buildDir, 'bundlor-properties')
inputs.file project.rootProject.file('gradle.properties')
outputs.dir ext.outputDir
from project.rootProject.file('gradle.properties')
into ext.outputDir
- filter(ReplaceTokens, tokens: [
- 'VIRGO.VERSION': version,
- ])
}
task('mergeClassesAndResources', type: Copy, dependsOn: 'compileJava') {
@@ -638,7 +625,7 @@
into ext.bundlorInputPath
}
- project.tasks.'bundlor'.dependsOn('addProjectVersionToGradlePropertiesTask', 'mergeClassesAndResources')
+ project.tasks.'bundlor'.dependsOn('copyGradlePropertiesTask', 'mergeClassesAndResources')
bundlor {
ext.bundlorInputPath = new File(buildDir, 'bundlor-inputPath')
diff --git a/gradle.properties b/gradle.properties
index 2f7890b..a5de31d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,4 @@
-# will be replaced before running the bundlor task
-version = @VIRGO.VERSION@
+version = 3.8.0.BUILD-SNAPSHOT
# Eclipse JDT Core Batch Compiler
ecjVersion = 4.6.1
