Skip to content

Commit 46d5467

Browse files
committed
Merge branch 'master' into develop
2 parents 38d95da + ca02b7c commit 46d5467

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ subprojects {
33
apply plugin: "maven-publish"
44

55
group = "com.marklogic"
6-
version = "1.5-SNAPSHOT"
6+
version = "1.5.0"
77

88
java {
99
sourceCompatibility = 1.8

docs/Gemfile.lock

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ GEM
224224
rb-fsevent (0.11.2)
225225
rb-inotify (0.10.1)
226226
ffi (~> 1.0)
227-
rexml (3.3.6)
228-
strscan
227+
rexml (3.3.9)
229228
rouge (3.26.0)
230229
ruby2_keywords (0.0.5)
231230
rubyzip (2.3.2)
@@ -240,7 +239,6 @@ GEM
240239
faraday (>= 0.17.3, < 3)
241240
simpleidn (0.2.1)
242241
unf (~> 0.1.4)
243-
strscan (3.1.0)
244242
terminal-table (1.8.0)
245243
unicode-display_width (~> 1.1, >= 1.1.1)
246244
typhoeus (1.4.0)

0 commit comments

Comments
 (0)