Skip to content

Commit e9bb8d3

Browse files
authored
Merge pull request #1721 from marklogic/feature/minor-bumps
Added test comments and bumped test-app dependencies
2 parents 2b21e3e + 8da51e4 commit e9bb8d3

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

marklogic-client-api/src/test/java/com/marklogic/client/test/PlanExpressionTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ public void testRedactRegex() {
219219
assertEquals("the=g=text", cTargetVal);
220220
}
221221

222-
// Currently failing on 12-nightly due to server bug - https://progresssoftware.atlassian.net/browse/MLE-17611
223222
@Test
224223
public void testRedactUsPhone() {
225224
final String testStr = "123-456-7890";

marklogic-client-api/src/test/java/com/marklogic/client/test/ssl/OneWaySSLTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ void defaultSslContext() throws Exception {
8484
assertTrue(ex.getCause() instanceof SSLException, "Unexpected cause: " + ex.getCause());
8585
}
8686

87+
// Currently failing on 12-nightly due to https://progresssoftware.atlassian.net/browse/MLE-17505 .
8788
@Test
8889
void noSslContext() {
8990
DatabaseClient client = Common.newClientBuilder().build();

marklogic-client-api/src/test/java/com/marklogic/client/test/ssl/TwoWaySSLTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public static void teardown() {
9797
* - When the breakpoint is hit, look for the location of the files in stdout.
9898
* - Copy those files to a more accessible location and use them for accessing the 8012 app server.
9999
*/
100+
// Currently failing on 12-nightly due to https://progresssoftware.atlassian.net/browse/MLE-17505 .
100101
@Test
101102
void digestAuthentication() {
102103
// This client uses our Java KeyStore file with a client certificate in it, so it should work.

test-app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
2-
id 'com.marklogic.ml-gradle' version '4.8.0'
2+
id 'com.marklogic.ml-gradle' version '5.0.0'
33
id 'java'
44
id "com.github.psxpaul.execfork" version "0.2.2"
55
}
66

77
dependencies {
8-
implementation "io.undertow:undertow-core:2.2.32.Final"
9-
implementation "io.undertow:undertow-servlet:2.2.32.Final"
10-
implementation "com.marklogic:ml-javaclient-util:4.8.0"
8+
implementation "io.undertow:undertow-core:2.2.37.Final"
9+
implementation "io.undertow:undertow-servlet:2.2.37.Final"
10+
implementation "com.marklogic:ml-javaclient-util:5.0.0"
1111
implementation 'org.slf4j:slf4j-api:2.0.16'
1212
implementation 'ch.qos.logback:logback-classic:1.3.14'
1313
implementation "com.fasterxml.jackson.core:jackson-databind:2.17.2"

0 commit comments

Comments
 (0)