Skip to content

Commit 443db79

Browse files
rjrudinrjrudin
authored
Merge pull request #214 from marklogic-community/feature/bumps
Updating all dependencies
2 parents 29bb0b3 + 566b0fd commit 443db79

File tree

12 files changed

+81
-181
lines changed

12 files changed

+81
-181
lines changed

‎build.gradle

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
subprojects {
22
apply plugin: "java-library"
33
apply plugin: "maven-publish"
4-
apply plugin: "signing"
54

65
group = "com.marklogic"
7-
version = "1.4-SNAPSHOT"
6+
version = "1.5-SNAPSHOT"
87

98
java {
109
sourceCompatibility = 1.8
@@ -18,18 +17,40 @@ subprojects {
1817
mavenLocal()
1918

2019
maven {
21-
url "https://nexus.marklogic.com/repository/maven-snapshots/"
20+
url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
2221
}
2322
}
2423

2524
dependencies {
2625
// Forcing Spring to use logback instead of commons-logging
27-
testImplementation "ch.qos.logback:logback-classic:1.3.5" // Not using 1.4.x yet as it requires Java 11
28-
testImplementation 'org.slf4j:jcl-over-slf4j:1.7.36'
29-
testImplementation 'org.slf4j:slf4j-api:1.7.36'
26+
testImplementation "ch.qos.logback:logback-classic:1.3.14" // Not using 1.4.x yet as it requires Java 11
27+
testImplementation 'org.slf4j:jcl-over-slf4j:2.0.16'
28+
testImplementation 'org.slf4j:slf4j-api:2.0.16'
3029
}
3130

3231
javadoc.failOnError = false
3332
// Ignores warnings on params that don't have descriptions, which is a little too noisy
3433
javadoc.options.addStringOption('Xdoclint:none', '-quiet')
34+
35+
publishing {
36+
repositories {
37+
maven {
38+
if (project.hasProperty("mavenUser")) {
39+
credentials {
40+
username mavenUser
41+
password mavenPassword
42+
}
43+
url publishUrl
44+
allowInsecureProtocol = true
45+
} else {
46+
name = "central"
47+
url = mavenCentralUrl
48+
credentials {
49+
username mavenCentralUsername
50+
password mavenCentralPassword
51+
}
52+
}
53+
}
54+
}
55+
}
3556
}

‎examples/getting-started/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
plugins {
1111
id "net.saliman.properties" version "1.5.2"
12-
id "com.marklogic.ml-gradle" version "4.5.2"
12+
id "com.marklogic.ml-gradle" version "5.0.0"
1313
}
1414

1515
repositories {

‎examples/getting-started/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎examples/test-examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
plugins {
1111
id "net.saliman.properties" version "1.5.2"
12-
id "com.marklogic.ml-gradle" version "4.6.0"
12+
id "com.marklogic.ml-gradle" version "5.0.0"
1313
}
1414

1515
repositories {

‎examples/test-examples/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

‎marklogic-junit5/build.gradle

Lines changed: 13 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,31 @@
1-
plugins {
2-
id "com.github.jk1.dependency-license-report" version "1.17"
3-
}
4-
51
dependencies {
62
api project(":marklogic-unit-test-client")
7-
api "com.marklogic:ml-javaclient-util:4.6.0"
3+
api "com.marklogic:ml-javaclient-util:5.0.0"
84
api "org.jdom:jdom2:2.0.6.1"
9-
api "org.junit.jupiter:junit-jupiter:5.10.0"
10-
api "org.springframework:spring-context:5.3.29"
11-
api "org.springframework:spring-test:5.3.29"
12-
api "com.fasterxml.jackson.core:jackson-databind:2.15.2"
13-
api 'org.slf4j:slf4j-api:1.7.36'
14-
5+
api "org.junit.jupiter:junit-jupiter:5.11.2"
6+
api "org.springframework:spring-context:5.3.39"
7+
api "org.springframework:spring-test:5.3.39"
8+
api "com.fasterxml.jackson.core:jackson-databind:2.17.2"
9+
api 'org.slf4j:slf4j-api:2.0.16'
1510
implementation "jaxen:jaxen:2.0.0"
1611
}
1712

1813
test {
1914
useJUnitPlatform()
2015
}
2116

22-
task sourcesJar(type: Jar, dependsOn: classes) {
23-
classifier 'sources'
24-
from sourceSets.main.allSource
25-
}
26-
27-
task javadocJar(type: Jar, dependsOn: javadoc) {
28-
classifier "javadoc"
29-
from javadoc
30-
}
31-
32-
artifacts {
33-
archives javadocJar, sourcesJar
34-
}
35-
signing {
36-
sign configurations.archives
37-
}
38-
39-
task generatePomForDependencyGraph(dependsOn: "generatePomFileForMainJavaPublication") {
40-
description = "Prepare for a release by making a copy of the generated pom file in the root directory so that it " +
41-
"can enable Github's Dependency Graph feature, which does not yet support Gradle"
42-
doLast {
43-
def preamble = '<?xml version="1.0" encoding="UTF-8"?>'
44-
def comment = "<!--\n" +
45-
"This file was generated via Gradle and is being used primarily for github's Dependency Graph feature.\n" +
46-
"It is not intended to be used to build this project.\n" +
47-
"-->"
48-
def fileText = file("build/publications/mainJava/pom-default.xml").getText()
49-
file("pom.xml").setText(fileText.replace(preamble, preamble + comment))
50-
}
17+
// Publishing setup - see https://docs.gradle.org/current/userguide/publishing_setup.html .
18+
java {
19+
withJavadocJar()
20+
withSourcesJar()
5121
}
5222

5323
publishing {
5424
publications {
5525
mainJava(MavenPublication) {
26+
groupId = group
27+
version = version
28+
from components.java
5629
pom {
5730
name = "${group}:${project.name}"
5831
description = "Supports testing MarkLogic applications"
@@ -79,29 +52,6 @@ publishing {
7952
developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git"
8053
}
8154
}
82-
from components.java
83-
artifact sourcesJar
84-
artifact javadocJar
85-
}
86-
}
87-
repositories {
88-
maven {
89-
if (project.hasProperty("mavenUser")) {
90-
name = "nexus"
91-
credentials {
92-
username mavenUser
93-
password mavenPassword
94-
}
95-
url publishUrl
96-
allowInsecureProtocol = true
97-
} else {
98-
name = "central"
99-
url = mavenCentralUrl
100-
credentials {
101-
username mavenCentralUsername
102-
password mavenCentralPassword
103-
}
104-
}
10555
}
10656
}
10757
}

‎marklogic-junit5/examples/simple-ml-gradle/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "net.saliman.properties" version "1.5.1"
3-
id "com.marklogic.ml-gradle" version "4.4.0"
3+
id "com.marklogic.ml-gradle" version "5.0.0"
44
id "java-library"
55
}
66

@@ -16,11 +16,11 @@ repositories {
1616
dependencies {
1717
mlBundle "com.marklogic:marklogic-unit-test-modules:1.4.0"
1818

19-
api "com.marklogic:marklogic-client-api:6.3.0"
19+
api "com.marklogic:marklogic-client-api:7.0.0"
2020

2121
testImplementation "com.marklogic:marklogic-junit5:1.4.0"
2222

2323
// Forcing Spring to use logback instead of commons-logging
24-
testImplementation "ch.qos.logback:logback-classic:1.3.5"
25-
testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
24+
testImplementation "ch.qos.logback:logback-classic:1.3.14"
25+
testImplementation "org.slf4j:jcl-over-slf4j:2.0.16"
2626
}

‎marklogic-junit5/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ It is not intended to be used to build this project.
4646
<dependency>
4747
<groupId>com.marklogic</groupId>
4848
<artifactId>ml-javaclient-util</artifactId>
49-
<version>4.6.0</version>
49+
<version>5.0.0</version>
5050
<scope>compile</scope>
5151
</dependency>
5252
<dependency>
@@ -58,31 +58,31 @@ It is not intended to be used to build this project.
5858
<dependency>
5959
<groupId>org.junit.jupiter</groupId>
6060
<artifactId>junit-jupiter</artifactId>
61-
<version>5.10.0</version>
61+
<version>5.11.2</version>
6262
<scope>compile</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.springframework</groupId>
6666
<artifactId>spring-context</artifactId>
67-
<version>5.3.29</version>
67+
<version>5.3.39</version>
6868
<scope>compile</scope>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.springframework</groupId>
7272
<artifactId>spring-test</artifactId>
73-
<version>5.3.29</version>
73+
<version>5.3.39</version>
7474
<scope>compile</scope>
7575
</dependency>
7676
<dependency>
7777
<groupId>com.fasterxml.jackson.core</groupId>
7878
<artifactId>jackson-databind</artifactId>
79-
<version>2.15.2</version>
79+
<version>2.17.2</version>
8080
<scope>compile</scope>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.slf4j</groupId>
8484
<artifactId>slf4j-api</artifactId>
85-
<version>1.7.36</version>
85+
<version>2.0.16</version>
8686
<scope>compile</scope>
8787
</dependency>
8888
<dependency>

‎marklogic-unit-test-client/build.gradle

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,31 @@
11
plugins {
22
// ml-gradle is used for deploying a test application so that this project itself can be tested
3-
id "com.marklogic.ml-gradle" version "4.5.2"
4-
5-
// Used to generate a license report
6-
id "com.github.jk1.dependency-license-report" version "1.17"
3+
id "com.marklogic.ml-gradle" version "5.0.0"
74
}
85

96
dependencies {
10-
api "com.marklogic:marklogic-client-api:6.3.0"
11-
implementation "org.slf4j:slf4j-api:1.7.36"
7+
api "com.marklogic:marklogic-client-api:7.0.0"
8+
implementation "org.slf4j:slf4j-api:2.0.16"
129

13-
testImplementation "org.junit.jupiter:junit-jupiter:5.10.0"
10+
testImplementation "org.junit.jupiter:junit-jupiter:5.11.2"
1411
}
1512

1613
test {
1714
useJUnitPlatform()
1815
}
1916

20-
task sourcesJar(type: Jar, dependsOn: classes) {
21-
classifier 'sources'
22-
from sourceSets.main.allSource
23-
}
24-
25-
task javadocJar(type: Jar, dependsOn: javadoc) {
26-
classifier "javadoc"
27-
from javadoc
28-
}
29-
30-
artifacts {
31-
archives javadocJar, sourcesJar
32-
}
33-
signing {
34-
sign configurations.archives
35-
}
36-
37-
task generatePomForDependencyGraph(dependsOn: "generatePomFileForMainJavaPublication") {
38-
description = "Prepare for a release by making a copy of the generated pom file in the root directory so that it " +
39-
"can enable Github's Dependency Graph feature, which does not yet support Gradle"
40-
doLast {
41-
def preamble = '<?xml version="1.0" encoding="UTF-8"?>'
42-
def comment = "<!--\n" +
43-
"This file was generated via Gradle and is being used primarily for github's Dependency Graph feature.\n" +
44-
"It is not intended to be used to build this project.\n" +
45-
"-->"
46-
def fileText = file("build/publications/mainJava/pom-default.xml").getText()
47-
file("pom.xml").setText(fileText.replace(preamble, preamble + comment))
48-
}
17+
// Publishing setup - see https://docs.gradle.org/current/userguide/publishing_setup.html .
18+
java {
19+
withJavadocJar()
20+
withSourcesJar()
4921
}
5022

5123
publishing {
5224
publications {
5325
mainJava(MavenPublication) {
26+
groupId = group
27+
version = version
28+
from components.java
5429
pom {
5530
name = "${group}:${project.name}"
5631
description = "Supports testing MarkLogic applications"
@@ -77,29 +52,6 @@ publishing {
7752
developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git"
7853
}
7954
}
80-
from components.java
81-
artifact sourcesJar
82-
artifact javadocJar
83-
}
84-
}
85-
repositories {
86-
maven {
87-
if (project.hasProperty("mavenUser")) {
88-
name = "nexus"
89-
credentials {
90-
username mavenUser
91-
password mavenPassword
92-
}
93-
url publishUrl
94-
allowInsecureProtocol = true
95-
} else {
96-
name = "central"
97-
url = mavenCentralUrl
98-
credentials {
99-
username mavenCentralUsername
100-
password mavenCentralPassword
101-
}
102-
}
10355
}
10456
}
10557
}

0 commit comments

Comments
 (0)