Skip to content

Commit

Permalink
Bumped to 1.3.0
Browse files Browse the repository at this point in the history
And using latest ml-gradle/ml-javaclient-util releases too, which came out yesterday
  • Loading branch information
rjrudin committed Feb 7, 2023
1 parent 7289f61 commit bea489a
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 19 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.marklogic:marklogic-unit-test-client:1.2.1"
classpath "com.marklogic:ml-gradle:4.3.5"
classpath "com.marklogic:marklogic-unit-test-client:1.3.0"
classpath "com.marklogic:ml-gradle:4.5.0"
}
}
Expand All @@ -43,7 +43,7 @@ repositories {
}
dependencies {
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
mlBundle "com.marklogic:marklogic-unit-test-modules:1.3.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ subprojects {
apply plugin: "signing"

group = "com.marklogic"
version = "1.3.0-SNAPSHOT"
version = "1.3.0"

java {
sourceCompatibility = 1.8
Expand Down
5 changes: 1 addition & 4 deletions marklogic-junit5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ plugins {

dependencies {
api project(":marklogic-unit-test-client")
api ("com.marklogic:ml-javaclient-util:4.4.0") {
// Prefer the version coming from marklogic-unit-test-client
exclude module: "marklogic-client-api"
}
api "com.marklogic:ml-javaclient-util:4.5.0"
api "org.jdom:jdom2:2.0.6.1"
api "org.junit.jupiter:junit-jupiter:5.9.2"
api "org.springframework:spring-context:5.3.24"
Expand Down
8 changes: 4 additions & 4 deletions marklogic-junit5/examples/simple-ml-gradle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ Next, add the following dependencies:
dependencies {
// existing dependencies
testImplementation "com.marklogic:marklogic-junit5:1.2.1"
testImplementation "com.marklogic:marklogic-junit5:1.3.0"
// Forcing Spring to use logback instead of commons-logging
testImplementation "ch.qos.logback:logback-classic:1.2.11"
testImplementation "ch.qos.logback:logback-classic:1.3.5"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
}

Expand Down Expand Up @@ -107,8 +107,8 @@ You'll still be able to leverage all of the testing support in AbstractMarkLogic
If you'd like to write and execute marklogic-unit-test test modules, add the following to your build.gradle file as well (grab
the latest version for both dependencies):

mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
testImplementation "com.marklogic:marklogic-unit-test-client:1.2.1"
mlBundle "com.marklogic:marklogic-unit-test-modules:1.3.0"
testImplementation "com.marklogic:marklogic-unit-test-client:1.3.0"

In addition, add the following to gradle.properties so that you can store test modules in a directory separate from
your application modules:
Expand Down
4 changes: 2 additions & 2 deletions marklogic-junit5/examples/simple-ml-gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ repositories {
}

dependencies {
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
mlBundle "com.marklogic:marklogic-unit-test-modules:1.3.0"

api "com.marklogic:marklogic-client-api:6.1.0"

testImplementation "com.marklogic:marklogic-junit5:1.2.1"
testImplementation "com.marklogic:marklogic-junit5:1.3.0"

// Forcing Spring to use logback instead of commons-logging
testImplementation "ch.qos.logback:logback-classic:1.3.5"
Expand Down
6 changes: 3 additions & 3 deletions marklogic-junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>ml-javaclient-util</artifactId>
<version>4.3.7</version>
<version>4.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -58,7 +58,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -76,7 +76,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version>
<version>2.14.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion marklogic-unit-test-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
// ml-gradle is used for deploying a test application so that this project itself can be tested
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"

// Used to generate a license report
id "com.github.jk1.dependency-license-report" version "1.17"
Expand Down
2 changes: 1 addition & 1 deletion marklogic-unit-test-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-client-api</artifactId>
<version>6.0.0</version>
<version>6.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit bea489a

Please sign in to comment.