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

Commit bd9dc38

Browse files
committed
Added properties for 2-way SSL
Added 8 properties for 4 connections - rest, appServices, manage, and admin - and then 8 more "global" properties that affect all 4 connections. The tests ensure that the properties are applied the config objects correctly, and the Java Client project has tests to verify that the properties work. Manual testing will be done with ml-gradle to ensure that everything works together.
1 parent 2c49492 commit bd9dc38

File tree

10 files changed

+958
-34
lines changed

10 files changed

+958
-34
lines changed

build.gradle

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,18 @@ repositories {
1919
mavenLocal()
2020
mavenCentral()
2121
maven {
22-
url "https://nexus.marklogic.com/repository/maven-snapshots/"
22+
url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
2323
}
2424
}
2525

2626
dependencies {
27-
api 'com.marklogic:ml-javaclient-util:4.6.0'
28-
api 'org.springframework:spring-web:5.3.29'
29-
api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
27+
api 'com.marklogic:ml-javaclient-util:4.7-SNAPSHOT'
28+
api 'org.springframework:spring-web:5.3.31'
29+
api 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
3030

3131
implementation 'jaxen:jaxen:1.2.0'
3232

33-
// Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002
34-
implementation 'com.squareup.okio:okio:3.4.0'
35-
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
33+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
3634
implementation 'io.github.rburgst:okhttp-digest:2.7'
3735

3836
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
@@ -42,10 +40,10 @@ dependencies {
4240
implementation 'commons-codec:commons-codec:1.15'
4341

4442
// For EqualsBuilder; added in 3.8.1 to support detecting if a mimetype's properties have changed or not
45-
implementation "org.apache.commons:commons-lang3:3.12.0"
43+
implementation "org.apache.commons:commons-lang3:3.14.0"
4644

4745
// For PreviewInterceptor; can be excluded if that feature is not used
48-
implementation("com.flipkart.zjsonpatch:zjsonpatch:0.4.14") {
46+
implementation("com.flipkart.zjsonpatch:zjsonpatch:0.4.16") {
4947
// Prefer the api version declared above
5048
exclude module: "jackson-databind"
5149
}
@@ -57,15 +55,15 @@ dependencies {
5755

5856
// Don't want to include this in the published jar, just the executable jar
5957
compileOnly "com.beust:jcommander:1.82"
60-
compileOnly "ch.qos.logback:logback-classic:1.3.5"
58+
compileOnly "ch.qos.logback:logback-classic:1.3.14"
6159

62-
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
63-
testImplementation 'org.springframework:spring-test:5.3.29'
64-
testImplementation 'commons-io:commons-io:2.11.0'
60+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
61+
testImplementation 'org.springframework:spring-test:5.3.31'
62+
testImplementation 'commons-io:commons-io:2.15.1'
6563
testImplementation 'xmlunit:xmlunit:1.6'
6664

6765
// Forcing Spring to use logback for testing instead of commons-logging
68-
testImplementation "ch.qos.logback:logback-classic:1.3.5"
66+
testImplementation "ch.qos.logback:logback-classic:1.3.14"
6967
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
7068
testImplementation "org.slf4j:slf4j-api:1.7.36"
7169
}
@@ -74,14 +72,14 @@ dependencies {
7472
sourceSets.main.resources.srcDir 'src/main/java'
7573

7674
task sourcesJar(type: Jar, dependsOn: classes) {
77-
classifier 'sources'
75+
archiveClassifier = 'sources'
7876
from sourceSets.main.allSource
7977
// For unknown reasons, Gradle 7.1 (but not 6.x) is complaining that AbstractManager.java is a duplicate.
8078
duplicatesStrategy = "exclude"
8179
}
8280

8381
task javadocJar(type: Jar, dependsOn: javadoc) {
84-
classifier "javadoc"
82+
archiveClassifier = "javadoc"
8583
from javadoc
8684
}
8785
javadoc.failOnError = false
@@ -131,9 +129,9 @@ publishing {
131129
}
132130
}
133131
scm {
134-
url = "[email protected]:marklogic-community/${project.name}.git"
135-
connection = "scm:[email protected]:marklogic-community/${project.name}.git"
136-
developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git"
132+
url = "[email protected]:marklogic/${project.name}.git"
133+
connection = "scm:[email protected]:marklogic/${project.name}.git"
134+
developerConnection = "scm:[email protected]:marklogic/${project.name}.git"
137135
}
138136
}
139137
from components.java

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip

0 commit comments

Comments
 (0)