Skip to content

Commit

Permalink
Bumped to 4.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rjrudin committed Feb 6, 2023
1 parent 86bcd43 commit e12e08f
Show file tree
Hide file tree
Showing 45 changed files with 51 additions and 75 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ running Gradle 7 or higher, you'll need to use ml-gradle 4.3.0 or higher.

Then, in an empty directory, create a file named "build.gradle" with your favorite text editor and enter the following:

plugins { id "com.marklogic.ml-gradle" version "4.4.0" }
plugins { id "com.marklogic.ml-gradle" version "4.5.0" }

Then run:

Expand Down
34 changes: 5 additions & 29 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ plugins {
id "maven-publish"
id "signing"

id "com.github.jk1.dependency-license-report" version "2.1"
// Ignored as it depends on Java 11; can uncomment and use Java 11 when it needs to be run
// id "com.github.jk1.dependency-license-report" version "2.1"
id "com.gradle.plugin-publish" version "0.20.0"
id "java-gradle-plugin"

Expand All @@ -12,49 +13,24 @@ plugins {
}

group = "com.marklogic"
version = "4.5-SNAPSHOT"
version = "4.5.0"

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

repositories {
mavenLocal()
maven {
url "https://nexus.marklogic.com/repository/maven-snapshots/"
}
mavenCentral()
}

// Do not cache changing modules
configurations.all {
resolutionStrategy {
cacheChangingModulesFor 0, 'seconds'
}
}

dependencies {
implementation gradleApi()
implementation localGroovy()

// Temporarily adding these until ready to release
api('com.marklogic:marklogic-client-api:6.1-SNAPSHOT') {
changing = true
}
api('com.marklogic:ml-javaclient-util:4.5-SNAPSHOT') {
changing = true
}

// Will update this when ready to release
api('com.marklogic:ml-app-deployer:4.5-SNAPSHOT') {
changing = true
}

api 'com.marklogic:ml-app-deployer:4.5.0'
implementation "com.marklogic:mlcp-util:1.0.1"
// TODO Will need to update this to 2.6.0 once it's released; the only planned change for this is to bump up the
// Java Client to 6.1.0
implementation "com.marklogic:marklogic-data-movement-components:2.5.0"
implementation "com.marklogic:marklogic-data-movement-components:2.6.0"
implementation "commons-io:commons-io:2.11.0"

compileOnly "com.marklogic:marklogic-unit-test-client:1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/alert-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java"
id "eclipse"
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/corb2-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/cpf-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java"
id "eclipse"
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-rest-rewriter-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

task generateCustomRewriterModules {
Expand Down
2 changes: 1 addition & 1 deletion examples/data-services/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java"
id "net.saliman.properties" version "1.5.1"
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
id 'com.marklogic.ml-development-tools' version '6.0.0'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

plugins {
id "net.saliman.properties" version "1.5.1"
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

//apply plugin: "com.marklogic.ml-gradle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
plugins {
id 'java' //optional - delete if not needed
id 'net.saliman.properties' version '1.5.1'
id 'com.marklogic.ml-gradle' version '4.4.0'
id 'com.marklogic.ml-gradle' version "4.5.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/disconnected-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mlGradleDependency=com.marklogic:ml-gradle:4.4.0
mlGradleDependency=com.marklogic:ml-gradle:4.5.0
mlSalimanDependency=net.saliman:gradle-properties-plugin:1.4.6

mlHost=localhost
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// gradle -PenvironmentName=x ...
id 'net.saliman.properties' version '1.5.1'
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
id 'com.avast.gradle.docker-compose' version "0.6.11"
}
dockerCompose {
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-projects/single-node/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// gradle -PenvironmentName=x ...
id 'net.saliman.properties' version '1.5.1'
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
id 'com.avast.gradle.docker-compose' version "0.6.11"
}
dockerCompose {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'net.saliman.properties' version '1.5.1'
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
id 'com.avast.gradle.docker-compose' version "0.6.11"
}
dockerCompose {
Expand Down
2 changes: 1 addition & 1 deletion examples/entity-services-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/external-security/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/failover-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/flexrep-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion examples/flexrep-with-path-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.marklogic:ml-gradle:4.4.0"
classpath "com.marklogic:ml-gradle:4.5.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/httpbuilder-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

/*
Expand Down
2 changes: 1 addition & 1 deletion examples/ignore-resources-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion examples/jdbc-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
id "java"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/local-testing-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set this to the version you used when running
# "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
mlGradleVersion=4.5-SNAPSHOT
mlGradleVersion=4.5.0

mlHost=localhost
mlAppName=example
Expand Down
2 changes: 1 addition & 1 deletion examples/marklogic-cloud-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set this to the version you used when running
# "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
mlGradleVersion=4.5-SNAPSHOT
mlGradleVersion=4.5.0

mlAppName=cloud-test

Expand Down
2 changes: 1 addition & 1 deletion examples/maven-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/mimetypes-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/minimal-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
*/

plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/mlcp-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.marklogic:ml-gradle:4.4.0"
classpath "com.marklogic:ml-gradle:4.5.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/no-appservers-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/partition-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mlGradleVersion=4.4.0
mlGradleVersion=4.5.0

mlHost=localhost
mlAppName=partition-example
Expand Down
2 changes: 1 addition & 1 deletion examples/properties-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
// processing the gradle-(environmentName).properties files.
id "net.saliman.properties" version "1.4.6"

id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

task printHost {
Expand Down
2 changes: 1 addition & 1 deletion examples/redaction-ruleset-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion examples/role-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/roxy-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.marklogic:ml-gradle:4.4.0"
classpath "com.marklogic:ml-gradle:4.5.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/sample-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.marklogic:ml-gradle:4.4.0"
classpath "com.marklogic:ml-gradle:4.5.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/schemas-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/ssl-2way-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}


Expand Down
2 changes: 1 addition & 1 deletion examples/ssl-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "net.saliman.properties" version "1.5.1"
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

/*
Expand Down
2 changes: 1 addition & 1 deletion examples/temporal-lsqt-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/temporal-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/triggers-project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.marklogic:ml-gradle:4.4.0"
classpath "com.marklogic:ml-gradle:4.5.0"
}
}

Expand Down
2 changes: 1 addition & 1 deletion examples/uni-temporal-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}
2 changes: 1 addition & 1 deletion examples/unit-test-project/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mlGradleVersion=4.4.0
mlGradleVersion=4.5.0
marklogicUnitTestVersion=1.1.0

mlHost=localhost
Expand Down
2 changes: 1 addition & 1 deletion examples/use-modulesdb-project/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.marklogic.ml-gradle" version "4.4.0"
id "com.marklogic.ml-gradle" version "4.5.0"
}

ext {
Expand Down
6 changes: 3 additions & 3 deletions 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>ml-gradle</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
<name>com.marklogic:ml-gradle</name>
<description>Gradle plugin for automating everything involving MarkLogic</description>
<url>https://github.com/marklogic-community/ml-gradle</url>
Expand Down Expand Up @@ -40,7 +40,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>ml-app-deployer</artifactId>
<version>4.4.0</version>
<version>4.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -52,7 +52,7 @@ It is not intended to be used to build this project.
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-data-movement-components</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit e12e08f

Please sign in to comment.