Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit ddeec85

Browse files
committed
#433 Upgraded to Spring 5.3.7
Removed OBE bintray config as well, and shifting to 4.2.0-rc1 of ml-javaclient-util
1 parent 4e3145d commit ddeec85

File tree

2 files changed

+16
-36
lines changed

2 files changed

+16
-36
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ src/test/resources/entity-services-project/src
1515
target
1616
gradle-local.properties
1717
snyk
18+
.vscode

build.gradle

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
plugins {
22
id "java-library"
33
id "maven-publish"
4-
id "eclipse"
5-
id "idea"
6-
id "com.jfrog.bintray" version "1.8.4"
74
id "com.github.jk1.dependency-license-report" version "1.3"
8-
95
id "net.saliman.properties" version "1.5.1"
106
id "io.snyk.gradle.plugin.snykplugin" version "0.4"
117
}
@@ -15,24 +11,30 @@ targetCompatibility = "8"
1511

1612
repositories {
1713
mavenLocal()
18-
jcenter()
1914
mavenCentral()
15+
16+
// Still need this for ml-junit
17+
// Once marklogic-junit5 is published to mavenCentral, we can convert all the tests over to JUnit5 and
18+
// then remove this as a repository
19+
jcenter()
2020
}
2121

2222
dependencies {
23-
api 'com.marklogic:ml-javaclient-util:4.1.1'
23+
api 'com.marklogic:ml-javaclient-util:4.2.0-rc1'
2424
api 'jaxen:jaxen:1.2.0'
2525
api 'org.apache.httpcomponents:httpclient:4.5.13'
26-
api 'org.springframework:spring-web:5.2.9.RELEASE'
26+
api 'org.springframework:spring-web:5.3.7'
27+
28+
implementation 'org.jdom:jdom2:2.0.6'
2729

2830
// Forcing httpclient to use this to address https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518
29-
api 'commons-codec:commons-codec:1.13'
31+
implementation 'commons-codec:commons-codec:1.13'
3032

3133
// For EqualsBuilder; added in 3.8.1 to support detecting if a mimetype's properties have changed or not
32-
api "org.apache.commons:commons-lang3:3.11"
34+
implementation "org.apache.commons:commons-lang3:3.12.0"
3335

3436
// For PreviewInterceptor; can be excluded if that feature is not used
35-
api "com.flipkart.zjsonpatch:zjsonpatch:0.4.11"
37+
implementation "com.flipkart.zjsonpatch:zjsonpatch:0.4.11"
3638

3739
// Required for Java 11
3840
api "javax.xml.bind:jaxb-api:2.3.1"
@@ -43,9 +45,10 @@ dependencies {
4345
compileOnly "com.beust:jcommander:1.78"
4446
compileOnly "ch.qos.logback:logback-classic:1.2.3"
4547

48+
// This uses JUnit 4; we'll soon replace this with marklogic-junit5 and JUnit5
4649
testImplementation 'com.marklogic:ml-junit:3.2.0'
47-
// Force ml-junit to use 5.2.8 instead of 4.1.5
48-
testImplementation "org.springframework:spring-test:5.2.9.RELEASE"
50+
51+
testImplementation "org.springframework:spring-test:5.3.7"
4952
testImplementation 'commons-io:commons-io:2.8.0'
5053

5154
// Forcing Spring to use logback for testing instead of commons-logging
@@ -66,43 +69,19 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
6669
classifier "javadoc"
6770
from file(javadocsDir + "/" + project.name)
6871
}
69-
7072
javadoc.destinationDir = file(javadocsDir + "/" + project.name)
7173
javadoc.failOnError = false
7274

7375
publishing {
7476
publications {
7577
mainJava(MavenPublication) {
7678
from components.java
77-
}
78-
sourcesJava(MavenPublication) {
79-
from components.java
8079
artifact sourcesJar
81-
}
82-
mavenJavadoc(MavenPublication) {
8380
artifact javadocJar
8481
}
8582
}
8683
}
8784

88-
if (project.hasProperty("myBintrayUser")) {
89-
bintray {
90-
user = myBintrayUser
91-
key = myBintrayKey
92-
publications = ['mainJava', 'sourcesJava']
93-
pkg {
94-
repo = 'maven'
95-
name = project.name
96-
licenses = ['Apache-2.0']
97-
vcsUrl = 'https://github.com/rjrudin/' + project.name + '.git'
98-
version {
99-
name = project.version
100-
released = new Date()
101-
}
102-
}
103-
}
104-
}
105-
10685
test {
10786
testLogging {
10887
events 'started','passed', 'skipped', 'failed'

0 commit comments

Comments
 (0)