-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #214 from marklogic-community/feature/bumps
Updating all dependencies
- Loading branch information
Showing
12 changed files
with
81 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/getting-started/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/test-examples/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,31 @@ | ||
| plugins { | ||
| id "com.github.jk1.dependency-license-report" version "1.17" | ||
| } | ||
|
|
||
| dependencies { | ||
| api project(":marklogic-unit-test-client") | ||
| api "com.marklogic:ml-javaclient-util:4.6.0" | ||
| api "com.marklogic:ml-javaclient-util:5.0.0" | ||
| api "org.jdom:jdom2:2.0.6.1" | ||
| api "org.junit.jupiter:junit-jupiter:5.10.0" | ||
| api "org.springframework:spring-context:5.3.29" | ||
| api "org.springframework:spring-test:5.3.29" | ||
| api "com.fasterxml.jackson.core:jackson-databind:2.15.2" | ||
| api 'org.slf4j:slf4j-api:1.7.36' | ||
|
|
||
| api "org.junit.jupiter:junit-jupiter:5.11.2" | ||
| api "org.springframework:spring-context:5.3.39" | ||
| api "org.springframework:spring-test:5.3.39" | ||
| api "com.fasterxml.jackson.core:jackson-databind:2.17.2" | ||
| api 'org.slf4j:slf4j-api:2.0.16' | ||
| implementation "jaxen:jaxen:2.0.0" | ||
| } | ||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| } | ||
|
|
||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| classifier 'sources' | ||
| from sourceSets.main.allSource | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| classifier "javadoc" | ||
| from javadoc | ||
| } | ||
|
|
||
| artifacts { | ||
| archives javadocJar, sourcesJar | ||
| } | ||
| signing { | ||
| sign configurations.archives | ||
| } | ||
|
|
||
| task generatePomForDependencyGraph(dependsOn: "generatePomFileForMainJavaPublication") { | ||
| description = "Prepare for a release by making a copy of the generated pom file in the root directory so that it " + | ||
| "can enable Github's Dependency Graph feature, which does not yet support Gradle" | ||
| doLast { | ||
| def preamble = '<?xml version="1.0" encoding="UTF-8"?>' | ||
| def comment = "<!--\n" + | ||
| "This file was generated via Gradle and is being used primarily for github's Dependency Graph feature.\n" + | ||
| "It is not intended to be used to build this project.\n" + | ||
| "-->" | ||
| def fileText = file("build/publications/mainJava/pom-default.xml").getText() | ||
| file("pom.xml").setText(fileText.replace(preamble, preamble + comment)) | ||
| } | ||
| // Publishing setup - see https://docs.gradle.org/current/userguide/publishing_setup.html . | ||
| java { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mainJava(MavenPublication) { | ||
| groupId = group | ||
| version = version | ||
| from components.java | ||
| pom { | ||
| name = "${group}:${project.name}" | ||
| description = "Supports testing MarkLogic applications" | ||
|
|
@@ -79,29 +52,6 @@ publishing { | |
| developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git" | ||
| } | ||
| } | ||
| from components.java | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
| if (project.hasProperty("mavenUser")) { | ||
| name = "nexus" | ||
| credentials { | ||
| username mavenUser | ||
| password mavenPassword | ||
| } | ||
| url publishUrl | ||
| allowInsecureProtocol = true | ||
| } else { | ||
| name = "central" | ||
| url = mavenCentralUrl | ||
| credentials { | ||
| username mavenCentralUsername | ||
| password mavenCentralPassword | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,31 @@ | ||
| 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.5.2" | ||
|
|
||
| // Used to generate a license report | ||
| id "com.github.jk1.dependency-license-report" version "1.17" | ||
| id "com.marklogic.ml-gradle" version "5.0.0" | ||
| } | ||
|
|
||
| dependencies { | ||
| api "com.marklogic:marklogic-client-api:6.3.0" | ||
| implementation "org.slf4j:slf4j-api:1.7.36" | ||
| api "com.marklogic:marklogic-client-api:7.0.0" | ||
| implementation "org.slf4j:slf4j-api:2.0.16" | ||
|
|
||
| testImplementation "org.junit.jupiter:junit-jupiter:5.10.0" | ||
| testImplementation "org.junit.jupiter:junit-jupiter:5.11.2" | ||
| } | ||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| } | ||
|
|
||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| classifier 'sources' | ||
| from sourceSets.main.allSource | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| classifier "javadoc" | ||
| from javadoc | ||
| } | ||
|
|
||
| artifacts { | ||
| archives javadocJar, sourcesJar | ||
| } | ||
| signing { | ||
| sign configurations.archives | ||
| } | ||
|
|
||
| task generatePomForDependencyGraph(dependsOn: "generatePomFileForMainJavaPublication") { | ||
| description = "Prepare for a release by making a copy of the generated pom file in the root directory so that it " + | ||
| "can enable Github's Dependency Graph feature, which does not yet support Gradle" | ||
| doLast { | ||
| def preamble = '<?xml version="1.0" encoding="UTF-8"?>' | ||
| def comment = "<!--\n" + | ||
| "This file was generated via Gradle and is being used primarily for github's Dependency Graph feature.\n" + | ||
| "It is not intended to be used to build this project.\n" + | ||
| "-->" | ||
| def fileText = file("build/publications/mainJava/pom-default.xml").getText() | ||
| file("pom.xml").setText(fileText.replace(preamble, preamble + comment)) | ||
| } | ||
| // Publishing setup - see https://docs.gradle.org/current/userguide/publishing_setup.html . | ||
| java { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mainJava(MavenPublication) { | ||
| groupId = group | ||
| version = version | ||
| from components.java | ||
| pom { | ||
| name = "${group}:${project.name}" | ||
| description = "Supports testing MarkLogic applications" | ||
|
|
@@ -77,29 +52,6 @@ publishing { | |
| developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git" | ||
| } | ||
| } | ||
| from components.java | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
| } | ||
| } | ||
| repositories { | ||
| maven { | ||
| if (project.hasProperty("mavenUser")) { | ||
| name = "nexus" | ||
| credentials { | ||
| username mavenUser | ||
| password mavenPassword | ||
| } | ||
| url publishUrl | ||
| allowInsecureProtocol = true | ||
| } else { | ||
| name = "central" | ||
| url = mavenCentralUrl | ||
| credentials { | ||
| username mavenCentralUsername | ||
| password mavenCentralPassword | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.