Skip to content

Commit 78d8fa2

Browse files
authored
Merge pull request #1485 from marklogic/feature/readme-version-update
Bumping to 6.0.0, couple minor tweaks
2 parents b61c953 + 6704a4c commit 78d8fa2

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ To build the client locally, complete the following steps:
77

88
1. Clone this repository on your machine.
99
2. Choose the appropriate branch (usually develop)
10-
3. Ensure you are using Java 8 or Java 11
10+
3. Ensure you are using Java 8 or Java 11 or Java 17 (the JVM version used to compile should not matter as compiler flags
11+
are set to ensure the compiled code will run on Java 8; Jenkins pipelines also exist to ensure that the tests pass on
12+
Java 8, 11, and 17, and thus they should for you locally as well; note that if you load the project into an IDE, you
13+
should use Java 8 in case your IDE does not process the build.gradle config that conditionally brings in JAXB dependencies
14+
required by Java 9+.)
1115
4. Verify that you can build the client by running `./gradlew build -x test`
1216

1317
"Running the tests" in the context of developing and submitting a pull request refers to running the tests found

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=com.marklogic
2-
version=6.0-SNAPSHOT
2+
version=6.0.0
33
describedName=MarkLogic Java Client API
44
publishUrl=file:../marklogic-java/releases
55

marklogic-client-api/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ description = "The official MarkLogic Java client API."
1111

1212
dependencies {
1313
if (JavaVersion.current().isJava9Compatible()) {
14-
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
15-
implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.2'
16-
implementation group: 'org.glassfish.jaxb', name: 'jaxb-core', version: '2.3.0.1'
14+
implementation 'javax.xml.bind:jaxb-api:2.3.1'
15+
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
16+
implementation 'org.glassfish.jaxb:jaxb-core:2.3.0.1'
1717
}
1818
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version:'4.10.0'
1919
implementation group: 'com.squareup.okhttp3', name: 'logging-interceptor', version:'4.10.0'

0 commit comments

Comments
 (0)