Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.0"
classpath "com.marklogic:ml-gradle:4.2.1"
classpath "com.marklogic:marklogic-unit-test-client:1.2.1"
classpath "com.marklogic:ml-gradle:4.3.5"
}
}

Expand All @@ -43,7 +43,7 @@ repositories {
}

dependencies {
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.0"
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
}
```

Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ subprojects {
apply plugin: "signing"

group = "com.marklogic"
version = "1.2.0"
version = "1.2.1"

sourceCompatibility = "8"
targetCompatibility = "8"
java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

repositories {
mavenCentral()
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
# Using 6.9 until ml-gradle 4.3 is available, which will support 7.x
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
22 changes: 11 additions & 11 deletions marklogic-junit5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ plugins {

dependencies {
api project(":marklogic-unit-test-client")
api "com.marklogic:ml-javaclient-util:4.3.1"
api "org.jdom:jdom2:2.0.6"
api "org.junit.jupiter:junit-jupiter:5.7.2"
api "org.springframework:spring-context:5.3.18"
api "org.springframework:spring-test:5.3.18"
api "com.fasterxml.jackson.core:jackson-databind:2.11.1"
api "org.slf4j:slf4j-api:1.7.31"
api "com.marklogic:ml-javaclient-util:4.3.3"
api "org.jdom:jdom2:2.0.6.1"
api "org.junit.jupiter:junit-jupiter:5.9.0"
api "org.springframework:spring-context:5.3.22"
api "org.springframework:spring-test:5.3.22"
api "com.fasterxml.jackson.core:jackson-databind:2.12.6.1"
api 'org.slf4j:slf4j-api:1.7.36'

implementation "jaxen:jaxen:1.2.0"

testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'

// Forcing Spring to use logback instead of commons-logging
testImplementation "ch.qos.logback:logback-classic:1.2.4"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
testImplementation "org.slf4j:slf4j-api:1.7.31"
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
testImplementation 'org.slf4j:jcl-over-slf4j:1.7.36'
testImplementation 'org.slf4j:slf4j-api:1.7.36'
}

test {
Expand Down
13 changes: 5 additions & 8 deletions marklogic-junit5/examples/simple-ml-gradle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,11 @@ Next, add the following dependencies:
dependencies {
// existing dependencies

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

testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"

// Forcing Spring to use logback instead of commons-logging
testImplementation "ch.qos.logback:logback-classic:1.2.4"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
testImplementation "org.slf4j:slf4j-api:1.7.31"
testImplementation "ch.qos.logback:logback-classic:1.2.11"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
}

### Configure gradle.properties
Expand Down Expand Up @@ -110,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.0"
testImplementation "com.marklogic:marklogic-unit-test-client:1.2.0"
mlBundle "com.marklogic:marklogic-unit-test-modules:1.2.1"
testImplementation "com.marklogic:marklogic-unit-test-client:1.2.1"

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
11 changes: 4 additions & 7 deletions marklogic-junit5/examples/simple-ml-gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,13 @@ repositories {
}

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

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

testImplementation "com.marklogic:marklogic-junit5:1.2.0"

testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
testImplementation "com.marklogic:marklogic-junit5:1.2.1"

// Forcing Spring to use logback instead of commons-logging
testImplementation "ch.qos.logback:logback-classic:1.2.4"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.31"
testImplementation "org.slf4j:slf4j-api:1.7.31"
testImplementation "ch.qos.logback:logback-classic:1.2.12"
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
}
16 changes: 8 additions & 8 deletions marklogic-junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ It is not intended to be used to build this project.
<modelVersion>4.0.0</modelVersion>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-junit5</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<name>com.marklogic:marklogic-junit5</name>
<description>Supports testing MarkLogic applications</description>
<url>https://github.com/marklogic-community/marklogic-junit5</url>
Expand Down Expand Up @@ -40,37 +40,37 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-unit-test-client</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>ml-javaclient-util</artifactId>
<version>4.3.1</version>
<version>4.3.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6</version>
<version>2.0.6.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.2</version>
<version>5.9.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.3.18</version>
<version>5.3.22</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>5.3.18</version>
<version>5.3.22</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -82,7 +82,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.31</version>
<version>1.7.36</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions marklogic-unit-test-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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.2.1"
id "com.marklogic.ml-gradle" version "4.3.5"

// Used to generate a license report
id "com.github.jk1.dependency-license-report" version "1.17"
}

dependencies {
api "com.marklogic:marklogic-client-api:5.5.3"
implementation "org.slf4j:slf4j-api:1.7.31"
implementation "org.slf4j:slf4j-api:1.7.36"

testImplementation "org.junit.jupiter:junit-jupiter:5.7.2"
testImplementation "org.junit.jupiter:junit-jupiter:5.9.0"
}

test {
Expand Down
4 changes: 2 additions & 2 deletions marklogic-unit-test-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ It is not intended to be used to build this project.
<modelVersion>4.0.0</modelVersion>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-unit-test-client</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<name>com.marklogic:marklogic-unit-test-client</name>
<description>Supports testing MarkLogic applications</description>
<url>https://github.com/marklogic-community/marklogic-unit-test-client</url>
Expand Down Expand Up @@ -46,7 +46,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.31</version>
<version>1.7.36</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down