Skip to content

Commit c292328

Browse files
committed
Fixes for regression failures on 12-nightly
Also removed unused "CONTRIBUTING" file - we're using the one in the root directory.
1 parent c3679e9 commit c292328

File tree

6 files changed

+107
-304
lines changed

6 files changed

+107
-304
lines changed

.github/CONTRIBUTING.md

Lines changed: 0 additions & 185 deletions
This file was deleted.

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/AbstractFunctionalTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,14 @@ public abstract class AbstractFunctionalTest extends BasicJavaClientREST {
4343
protected static DatabaseClient client;
4444
protected static DatabaseClient schemasClient;
4545
protected static DatabaseClient adminModulesClient;
46+
protected static MarkLogicVersion markLogicVersion;
4647

4748
protected static boolean isML11OrHigher;
4849
private static String originalHttpPort;
4950
private static String originalRestServerName;
5051

5152
@BeforeAll
52-
public static void initializeClients() throws Exception {
53+
public static void initializeClients() {
5354
loadGradleProperties();
5455

5556
// Until all the tests can use the same ml-gradle-deployed app server, we need to have separate ports - one
@@ -59,9 +60,9 @@ public static void initializeClients() throws Exception {
5960
originalRestServerName = restServerName;
6061
restServerName = "java-functest";
6162

62-
MarkLogicVersion version = MarkLogicVersion.getMarkLogicVersion(connectAsAdmin());
63-
System.out.println("ML version: " + version.getVersionString());
64-
isML11OrHigher = version.getMajor() >= 11;
63+
markLogicVersion = MarkLogicVersion.getMarkLogicVersion(connectAsAdmin());
64+
System.out.println("ML version: " + markLogicVersion.getVersionString());
65+
isML11OrHigher = markLogicVersion.getMajor() >= 11;
6566

6667
client = newDatabaseClientBuilder().build();
6768
schemasClient = newDatabaseClientBuilder().withDatabase("java-functest-schemas").build();
@@ -90,7 +91,7 @@ public static void classTearDown() {
9091

9192
/**
9293
* Convenience method for easily writing some JSON docs where the content of the docs doesn't matter.
93-
*
94+
*
9495
* @param count
9596
* @param collections
9697
* @return

0 commit comments

Comments
 (0)