Skip to content

Commit 05604ff

Browse files
committed
#572 Upgrading dependencies and supporting Java 8 again
1 parent 5776edb commit 05604ff

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ examples/mlcp-project/data/export/
1818
.idea
1919
*.iml
2020
out
21+
gradle-local.properties
22+
snyk

build.gradle

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ plugins {
77
id "com.github.jk1.dependency-license-report" version "1.3"
88
id "com.gradle.plugin-publish" version "0.11.0"
99
id "java-gradle-plugin"
10+
11+
id "net.saliman.properties" version "1.5.1"
12+
id "io.snyk.gradle.plugin.snykplugin" version "0.4"
1013
}
1114

12-
sourceCompatibility = "9"
13-
targetCompatibility = "9"
15+
sourceCompatibility = "8"
16+
targetCompatibility = "8"
1417

1518
repositories {
1619
mavenLocal() // Used for local development only
@@ -20,16 +23,19 @@ repositories {
2023
dependencies {
2124
compile gradleApi()
2225
compile localGroovy()
23-
compile "com.marklogic:ml-app-deployer:4.1.0-rc1"
26+
compile "com.marklogic:ml-app-deployer:4.1.0-SNAPSHOT"
2427
compile "com.marklogic:mlcp-util:0.9.0"
25-
compile "com.marklogic:marklogic-data-movement-components:2.0.0"
28+
compile "com.marklogic:marklogic-data-movement-components:2.2.0"
2629
compile "commons-io:commons-io:2.8.0"
2730

2831
compileOnly "com.marklogic:marklogic-unit-test-client:1.0.0"
2932

3033
testCompile localGroovy()
3134
testCompile gradleTestKit()
3235
testCompile 'xmlunit:xmlunit:1.3'
36+
37+
// Force spock-core to use 4.13.1 to avoid security issue in 4.11
38+
testCompile 'junit:junit:4.13.1'
3339
testCompile('org.spockframework:spock-core:1.1-groovy-2.4') {
3440
exclude module: 'groovy-all'
3541
}
@@ -99,3 +105,12 @@ pluginBundle {
99105
version = project.version
100106
}
101107
}
108+
109+
// See https://github.com/snyk/gradle-plugin for more information
110+
snyk {
111+
//arguments = '--all-sub-projects'
112+
severity = 'low'
113+
api = snykToken
114+
autoDownload = true
115+
autoUpdate = true
116+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group=com.marklogic
2-
version=4.1.0-rc1
2+
version=4.1.0-SNAPSHOT
33
javadocsDir=../gh-pages-marklogic-java/javadocs

0 commit comments

Comments
 (0)