Skip to content

Commit

Permalink
DHFPROD-5563: Updating the versions and setting up pipeline for 5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
SameeraPriyathamTadikonda committed Oct 28, 2020
1 parent 293434f commit 0f9e907
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ pipeline{
stage('code-review'){
when {
allOf {
changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'develop', title: '', url: ''
changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'feature/5.4-develop', title: '', url: ''
}
beforeAgent true
}
Expand Down Expand Up @@ -478,7 +478,7 @@ pipeline{
}
stage('Merge-PR'){
when {
changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'develop', title: '', url: ''
changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'feature/5.4-develop', title: '', url: ''
beforeAgent true
}
agent {label 'dhmaster'};
Expand Down
4 changes: 2 additions & 2 deletions examples/dh-5-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
if (project.hasProperty("testing")) {
classpath "com.marklogic:ml-data-hub:5.3-SNAPSHOT"
classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
} else {
classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
}
Expand All @@ -27,7 +27,7 @@ repositories {

dependencies {
if (project.hasProperty("testing")) {
compile "com.marklogic:marklogic-data-hub:5.3-SNAPSHOT"
compile "com.marklogic:marklogic-data-hub:5.4-SNAPSHOT"
} else {
compile "com.marklogic:marklogic-data-hub:5.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/dhf5-custom-hook/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath "net.saliman:gradle-properties-plugin:1.5.1"
if (project.hasProperty("testing")) {
classpath "com.marklogic:ml-data-hub:5.3-SNAPSHOT"
classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
} else {
classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/insurance/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath "net.saliman:gradle-properties-plugin:1.5.1"
if (project.hasProperty("testing")) {
classpath "com.marklogic:ml-data-hub:5.3-SNAPSHOT"
classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
} else {
classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/mapping-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath "net.saliman:gradle-properties-plugin:1.5.1"
if (project.hasProperty("testing")) {
classpath "com.marklogic:ml-data-hub:5.3-SNAPSHOT"
classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
} else {
classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/patient-hub/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath "net.saliman:gradle-properties-plugin:1.5.1"
if (project.hasProperty("testing")) {
classpath "com.marklogic:ml-data-hub:5.3-SNAPSHOT"
classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
} else {
classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/smart-mastering-complete/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath "net.saliman:gradle-properties-plugin:1.5.1"
if (project.hasProperty("testing")) {
classpath "com.marklogic:ml-data-hub:5.3-SNAPSHOT"
classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
} else {
classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=5.3-SNAPSHOT
version=5.4-SNAPSHOT
publishUrl=file:../marklogic-data-hub/releases
systemProp.file.encoding=utf-8
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ public static String getBuildVersion() {
}

String version = properties.getProperty("version");
return "${project.version}".equals(version) ? "5.3-SNAPSHOT" : version;
return "${project.version}".equals(version) ? "5.4-SNAPSHOT" : version;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"role-name": "data-hub-admin",
"description": "5.3-SNAPSHOT: Permits developing and operating a Data Hub application, along with clearing databases",
"description": "5.4-SNAPSHOT: Permits developing and operating a Data Hub application, along with clearing databases",
"role": [
"data-hub-developer"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {

// This gradle plugin extends the ml-gradle plugin with
// commands that make Data Hub do its magic
id 'com.marklogic.ml-data-hub' version '5.3-SNAPSHOT'
id 'com.marklogic.ml-data-hub' version '5.4-SNAPSHOT'
}

repositories {
Expand All @@ -30,7 +30,7 @@ repositories {
dependencies {
// this allows you to write custom java code that depends
// on the Data Hub library
compile 'com.marklogic:marklogic-data-hub:5.3-SNAPSHOT'
compile 'com.marklogic:marklogic-data-hub:5.4-SNAPSHOT'
compile 'com.marklogic:marklogic-xcc:9.0.7'
}

Expand Down
2 changes: 1 addition & 1 deletion pipeline.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ReleaseBranch:release/5.3.0
ReleaseBranch:release/5.4.0
ExecutionBranch:develop

0 comments on commit 0f9e907

Please sign in to comment.