Skip to content

Commit 8c93337

Browse files
BillFarberBillFarber
authored
Merge pull request #695 from marklogic/dev
Merge 4.8.0 changes into master
2 parents 783e474 + aea6deb commit 8c93337

File tree

53 files changed

+127
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+127
-67
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion

‎build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id "com.gradle.plugin-publish" version "1.2.1"
88
id "java-gradle-plugin"
99

10-
id "net.saliman.properties" version "1.5.1"
10+
id "net.saliman.properties" version "1.5.2"
1111
id "io.snyk.gradle.plugin.snykplugin" version "0.4"
1212
}
1313

@@ -17,7 +17,7 @@ if (project.hasProperty("signing.keyId")) {
1717
}
1818

1919
group = "com.marklogic"
20-
version = "4.7.0"
20+
version = "4.8.0"
2121

2222
java {
2323
sourceCompatibility = 1.8
@@ -36,10 +36,10 @@ dependencies {
3636
implementation gradleApi()
3737
implementation localGroovy()
3838

39-
api 'com.marklogic:ml-app-deployer:4.7.0'
39+
api 'com.marklogic:ml-app-deployer:4.8.0'
4040
implementation "com.marklogic:mlcp-util:1.0.1"
41-
implementation "com.marklogic:marklogic-data-movement-components:2.7.0"
42-
implementation "commons-io:commons-io:2.15.1"
41+
implementation "com.marklogic:marklogic-data-movement-components:2.8.0"
42+
implementation "commons-io:commons-io:2.16.1"
4343

4444
compileOnly "com.marklogic:marklogic-unit-test-client:1.4.0"
4545

@@ -49,7 +49,7 @@ dependencies {
4949

5050
// Force spock-core to use 4.13.2 to avoid security issue in 4.11
5151
testImplementation 'junit:junit:4.13.2'
52-
testImplementation('org.spockframework:spock-core:2.1-groovy-3.0') {
52+
testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {
5353
exclude module: 'groovy-all'
5454
}
5555
}

‎examples/alert-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java"
33
id "eclipse"
4-
id "com.marklogic.ml-gradle" version "4.7.0"
4+
id "com.marklogic.ml-gradle" version "4.8.0"
55
}
66

77
repositories {

‎examples/corb2-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
}
2222

2323
plugins {
24-
id "com.marklogic.ml-gradle" version "4.7.0"
24+
id "com.marklogic.ml-gradle" version "4.8.0"
2525
}
2626

2727
repositories {

‎examples/cpf-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java"
33
id "eclipse"
4-
id "com.marklogic.ml-gradle" version "4.7.0"
4+
id "com.marklogic.ml-gradle" version "4.8.0"
55
}
66

77
repositories {

‎examples/custom-forests-and-replicas-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/custom-rest-rewriter-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}
44

55
task generateCustomRewriterModules {

‎examples/data-services/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java"
3-
id "net.saliman.properties" version "1.5.1"
4-
id "com.marklogic.ml-gradle" version "4.7.0"
3+
id "net.saliman.properties" version "1.5.2"
4+
id "com.marklogic.ml-gradle" version "4.8.0"
55
id 'com.marklogic.ml-development-tools' version '6.0.0'
66
}
77

‎examples/dependency-project/ml-gradle-client-project/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id "net.saliman.properties" version "1.5.1"
3-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "net.saliman.properties" version "1.5.2"
3+
id "com.marklogic.ml-gradle" version "4.8.0"
44
}
55

66
repositories {

‎examples/disconnected-project-using-plugins-and-gradlew/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ buildscript {
1313

1414
plugins {
1515
id 'java' //optional - delete if not needed
16-
id 'net.saliman.properties' version '1.5.1'
17-
id 'com.marklogic.ml-gradle' version "4.7.0"
16+
id 'net.saliman.properties' version '1.5.2'
17+
id 'com.marklogic.ml-gradle' version "4.8.0"
1818
}
1919

2020
repositories {

‎examples/disconnected-project/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mlGradleDependency=com.marklogic:ml-gradle:4.7.0
1+
mlGradleDependency=com.marklogic:ml-gradle:4.8.0
22
mlSalimanDependency=net.saliman:gradle-properties-plugin:1.4.6
33

44
mlHost=localhost

‎examples/docker-projects/single-node-with-nifi/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
// gradle -PenvironmentName=x ...
3-
id 'net.saliman.properties' version '1.5.1'
4-
id "com.marklogic.ml-gradle" version "4.7.0"
3+
id 'net.saliman.properties' version '1.5.2'
4+
id "com.marklogic.ml-gradle" version "4.8.0"
55
id 'com.avast.gradle.docker-compose' version "0.6.11"
66
}
77
dockerCompose {

‎examples/docker-projects/single-node/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
// gradle -PenvironmentName=x ...
3-
id 'net.saliman.properties' version '1.5.1'
4-
id "com.marklogic.ml-gradle" version "4.7.0"
3+
id 'net.saliman.properties' version '1.5.2'
4+
id "com.marklogic.ml-gradle" version "4.8.0"
55
id 'com.avast.gradle.docker-compose' version "0.6.11"
66
}
77
dockerCompose {

‎examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id 'net.saliman.properties' version '1.5.1'
3-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id 'net.saliman.properties' version '1.5.2'
3+
id "com.marklogic.ml-gradle" version "4.8.0"
44
id 'com.avast.gradle.docker-compose' version "0.6.11"
55
}
66
dockerCompose {

‎examples/entity-services-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/external-security/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/failover-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/flexrep-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
plugins {
14-
id "com.marklogic.ml-gradle" version "4.7.0"
14+
id "com.marklogic.ml-gradle" version "4.8.0"
1515
}
1616

1717
ext {

‎examples/flexrep-with-path-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenLocal()
55
}
66
dependencies {
7-
classpath "com.marklogic:ml-gradle:4.7.0"
7+
classpath "com.marklogic:ml-gradle:4.8.0"
88
}
99
}
1010

‎examples/httpbuilder-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
plugins {
8-
id "com.marklogic.ml-gradle" version "4.7.0"
8+
id "com.marklogic.ml-gradle" version "4.8.0"
99
}
1010

1111
/*

‎examples/ignore-resources-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}
44

55
ext {

‎examples/jdbc-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
id "java"
44
}
55

‎examples/local-testing-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313

1414
plugins {
15-
id "net.saliman.properties" version "1.5.1"
15+
id "net.saliman.properties" version "1.5.2"
1616
id "java"
1717
}
1818

‎examples/local-testing-project/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set this to the version you used when running
22
# "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
3-
mlGradleVersion=4.7.0
3+
mlGradleVersion=4.8.0
44

55
mlHost=localhost
66
mlAppName=example

‎examples/marklogic-cloud-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313

1414
plugins {
15-
id "net.saliman.properties" version "1.5.1"
15+
id "net.saliman.properties" version "1.5.2"
1616
}
1717

1818
apply plugin: "com.marklogic.ml-gradle"

‎examples/marklogic-cloud-project/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set this to the version you used when running
22
# "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
3-
mlGradleVersion=4.7.0
3+
mlGradleVersion=4.8.0
44

55
mlAppName=cloud-test
66

‎examples/maven-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/mimetypes-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/minimal-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
*/
88

99
plugins {
10-
id "com.marklogic.ml-gradle" version "4.7.0"
10+
id "com.marklogic.ml-gradle" version "4.8.0"
1111
}

‎examples/mlcp-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath "com.marklogic:ml-gradle:4.7.0"
13+
classpath "com.marklogic:ml-gradle:4.8.0"
1414
}
1515
}
1616

‎examples/no-appservers-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/partition-project/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mlGradleVersion=4.7.0
1+
mlGradleVersion=4.8.0
22

33
mlHost=localhost
44
mlAppName=partition-example

‎examples/properties-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
// processing the gradle-(environmentName).properties files.
44
id "net.saliman.properties" version "1.4.6"
55

6-
id "com.marklogic.ml-gradle" version "4.7.0"
6+
id "com.marklogic.ml-gradle" version "4.8.0"
77
}
88

99
task printHost {

‎examples/qbv-example/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}
44

55
repositories {

‎examples/redaction-ruleset-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}
44

55
repositories {

‎examples/role-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/roxy-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenLocal()
55
}
66
dependencies {
7-
classpath "com.marklogic:ml-gradle:4.7.0"
7+
classpath "com.marklogic:ml-gradle:4.8.0"
88
}
99
}
1010

‎examples/sample-project/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ buildscript {
88
mavenCentral()
99
}
1010
dependencies {
11-
classpath "com.marklogic:ml-gradle:4.7.0"
11+
classpath "com.marklogic:ml-gradle:4.8.0"
1212
}
1313
}
1414

1515
plugins {
1616
// The following plugins are optional
1717

18-
id "net.saliman.properties" version "1.5.1"
18+
id "net.saliman.properties" version "1.5.2"
1919

2020
// The Java plugin is used to compile and run JUnit tests
2121
id "java"

‎examples/schemas-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/ssl-2way-project/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id "net.saliman.properties" version "1.5.1"
3-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "net.saliman.properties" version "1.5.2"
3+
id "com.marklogic.ml-gradle" version "4.8.0"
44
}
55

66

‎examples/ssl-project/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id "net.saliman.properties" version "1.5.1"
3-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "net.saliman.properties" version "1.5.2"
3+
id "com.marklogic.ml-gradle" version "4.8.0"
44
}
55

66
/*

‎examples/temporal-lsqt-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/temporal-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/triggers-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenLocal()
55
}
66
dependencies {
7-
classpath "com.marklogic:ml-gradle:4.7.0"
7+
classpath "com.marklogic:ml-gradle:4.8.0"
88
}
99
}
1010

‎examples/uni-temporal-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}

‎examples/unit-test-project/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mlGradleVersion=4.7.0
1+
mlGradleVersion=4.8.0
22
marklogicUnitTestVersion=1.4.0
33

44
mlHost=localhost

‎examples/use-modulesdb-project/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.marklogic.ml-gradle" version "4.7.0"
2+
id "com.marklogic.ml-gradle" version "4.8.0"
33
}
44

55
ext {

0 commit comments

Comments
 (0)