Skip to content

Commit d015e90

Browse files
committed
Switch the gradleDefaults version to support the new tag system
1 parent 04f3028 commit d015e90

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

apps/omar-geoscript-app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.10"
1010
classpath "net.errbuddy.plugins:babel-asset-pipeline:2.1.1"
1111
classpath 'com.bmuschko:gradle-docker-plugin:3.0.12'
12-
classpath 'io.ossim:gradleDefaults:1.6-SNAPSHOT'
12+
classpath 'io.ossim:gradleDefaults:1.7-SNAPSHOT'
1313
}
1414
}
1515

@@ -36,7 +36,7 @@ io.ossim.gradleDefaults.Variables.setVersionVariables(project)
3636
dockerBuildDir="${rootProject.projectDir}/docker"
3737
version "${buildVersion}-${buildVersionTag}"
3838
jarDestination = "${projectDir}/build/libs/${project.name}-${version}.jar"
39-
io.ossim.gradleDefaults.Docker.addDockerTasks(project, dockerRegistryUrl, dockerRegistryUsername, dockerRegistryPassword, name, dockerImageTag, dockerBuildDir, jarDestination, ["BASE_IMAGE": "${dockerRegistryUrl}/${dockerBaseImage}"])
39+
io.ossim.gradleDefaults.Docker.addDockerTasks(project, dockerRegistryUrl, dockerRegistryUsername, dockerRegistryPassword, name, dockerImageTag, dockerBuildDir, jarDestination, ["BASE_IMAGE": "${dockerRegistryUrl}/${dockerBaseImage}:${dockerFromTag}"])
4040
io.ossim.gradleDefaults.Openshift.addOpenshiftTasks(project, openshiftUrl, openshiftUsername, openshiftPassword, openshiftProjectName, openshiftServiceName, dockerRegistryUrl, name, dockerImageTag)
4141

4242
dependencyManagement {

apps/omar-geoscript-app/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ groupName=io.ossim.omar.apps
77
dockerRegistryUrl=quay.io/radiantsolutions
88
dockerRegistryUsername=
99
dockerRegistryPassword=
10-
dockerImageTag=latest
10+
dockerImageTag=
1111
dockerBaseImage=omar-base
1212
dockerBuildDir=
1313

plugins/omar-geoscript-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
dependencies {
77
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
88
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.10"
9-
classpath 'io.ossim:gradleDefaults:1.6-SNAPSHOT'
9+
classpath 'io.ossim:gradleDefaults:1.7-SNAPSHOT'
1010
}
1111
}
1212

0 commit comments

Comments
 (0)