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
5 changes: 5 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Lines starting with '#' are comments.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @anu3990 @billfarber @rjrudin
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.5.2" }
plugins { id "com.marklogic.ml-gradle" version "4.5.3" }

Then run:

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
}

group = "com.marklogic"
version = "4.5.2"
version = "4.5.3"

java {
sourceCompatibility = 1.8
Expand All @@ -31,7 +31,7 @@ dependencies {
implementation gradleApi()
implementation localGroovy()

api 'com.marklogic:ml-app-deployer:4.5.2'
api 'com.marklogic:ml-app-deployer:4.5.3'
implementation "com.marklogic:mlcp-util:1.0.1"
implementation "com.marklogic:marklogic-data-movement-components:2.6.0"
implementation "commons-io:commons-io:2.11.0"
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

repositories {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
plugins {
id "com.marklogic.ml-gradle" version "4.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

//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.5.2"
id 'com.marklogic.ml-gradle' version "4.5.3"
}

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.5.2
mlGradleDependency=com.marklogic:ml-gradle:4.5.3
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
classpath "com.marklogic:ml-gradle:4.5.3"
}
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

/*
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
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.2
mlGradleVersion=4.5.3

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.2
mlGradleVersion=4.5.3

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
classpath "com.marklogic:ml-gradle:4.5.3"
}
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2
mlGradleVersion=4.5.3

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
classpath "com.marklogic:ml-gradle:4.5.3"
}
}

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.5.2"
classpath "com.marklogic:ml-gradle:4.5.3"
}
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
2 changes: 1 addition & 1 deletion examples/ssl-2way-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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}


Expand Down
17 changes: 11 additions & 6 deletions examples/ssl-project/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
This project shows how to use a certificate template to enable SSL connections on an app server (in this case, the
REST API server). Two things to note in this project:
This project demonstrates how to use a certificate template to enable SSL connections on an app server.

1. The src/main/ml-config/servers/rest-api-server.json config file shows an example of referring to the ID of a
certificate template.
1. The gradle.properties file shows how the mlSimpleSsl property is used to tell ml-gradle to use an SSL connection
when loading modules.
The project currently uses the `mlSimpleSsl` property to tell ml-gradle to use a "trust everything" approach for
communicating with the project's REST API server. This is only used for demonstration purposes and is not recommended
for a production environment. See
[this guide on SSL with ml-gradle](https://github.com/marklogic/ml-gradle/wiki/Loading-modules-via-SSL) for
information on properly configuring SSL usage.

Note the inclusion of an `ext` block in this project's `build.gradle` file. This automates the generation of a temp
certificate for the certificate template. This can also be accomplished by updating the app server via the MarkLogic
Admin UI; the Admin UI will check for a temp for the app server's certificate template and will create one if it does
not yet exist.
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

/*
Expand Down
4 changes: 1 addition & 3 deletions examples/ssl-project/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ mlHost=localhost
mlAppName=ssl-project
mlRestPort=8180
mlUsername=admin
mlPassword=admin
mlPassword=change in gradle-local.properties

# Since the REST API server for this sample project is configured to use a certificate template for SSL, we set this
# property to use a very simple SSLContext for communicating with the REST API server. This SSLContext is required for
# loading modules - i.e. in order to load options/services/transforms via the REST API server, we need an SSL connection.
#
# You can configure a more sophisticated SSLContext by setting the restSslContext property on mlAppConfig in an ext block in build.gradle.
#
# Starting in 3.17.0, there are additional properties for configuring an SSL connection based on the JVM's
# default keystore. See the Property Reference page in the ml-gradle Wiki for more information.
mlSimpleSsl=true
8 changes: 0 additions & 8 deletions examples/ssl-project/src/main/ml-config/servers/README.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"server-name": "%%NAME%%",
"authentication": "digestbasic",
"ssl-certificate-template": "%%certificate-templates-id-ssl-project-template%%"
"ssl-certificate-template": "ssl-project-template"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2"
classpath "com.marklogic:ml-gradle:4.5.3"
}
}

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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}
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.5.2
mlGradleVersion=4.5.3
marklogicUnitTestVersion=1.3.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.5.2"
id "com.marklogic.ml-gradle" version "4.5.3"
}

ext {
Expand Down
Loading