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
26 changes: 13 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ subprojects {
mavenCentral()
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation"]
// Allows for identifying compiler warnings and treating them as errors.
tasks.withType(JavaCompile).configureEach {
options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation", "-Werror"]
options.deprecation = true
options.warnings = true
}

tasks.withType(Test).configureEach {
Expand All @@ -38,17 +40,15 @@ subprojects {
events = ['started', 'passed', 'skipped', 'failed']
exceptionFormat = 'full'
}

// Will remove this in a future PR to determine if they're needed or not.
systemProperty "file.encoding", "UTF-8"
systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
}

// Until we do a cleanup of javadoc errors, the build (and specifically the javadoc task) fails on Java 11
// and higher. Preventing that until the cleanup can occur.
javadoc.failOnError = false
tasks.withType(Javadoc).configureEach {
// Until we do a cleanup of javadoc errors, the build (and specifically the javadoc task) fails on Java 11
// and higher. Preventing that until the cleanup can occur.
failOnError = false

// Ignores warnings on param tags with no descriptions. Will remove this once javadoc errors are addressed.
// Until then, it's just a lot of noise.
javadoc.options.addStringOption('Xdoclint:none', '-quiet')
// Ignores warnings on param tags with no descriptions. Will remove this once javadoc errors are addressed.
// Until then, it's just a lot of noise.
options.addStringOption('Xdoclint:none', '-quiet')
}
}
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
group=com.marklogic
version=8.0-SNAPSHOT
describedName=MarkLogic Java Client API
publishUrl=file:../marklogic-java/releases

okhttpVersion=5.1.0
Expand Down
12 changes: 6 additions & 6 deletions marklogic-client-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ publishing {
mainJava(MavenPublication) {
from components.java
pom {
name = "${group}:${project.name}"
name = "${project.group}:${project.name}"
description = "The MarkLogic Java Client API"
packaging = "jar"
url = "https://github.com/marklogic/java-client-api"
licenses {
license {
name = "The Apache License, Version 2.0"
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
}
}
developers {
Expand All @@ -160,9 +160,9 @@ publishing {
}
}
scm {
url = "git@github.com:marklogic/java-client-api.git"
connection = "scm:git:git@github.com:marklogic/java-client-api.git"
developerConnection = "scm:git:git@github.com:marklogic/java-client-api.git"
url = "https://github.com/marklogic/java-client-api"
connection = "https://github.com/marklogic/java-client-api"
developerConnection = "https://github.com/marklogic/java-client-api"
}
}
}
Expand All @@ -174,7 +174,7 @@ publishing {
username = mavenUser
password = mavenPassword
}
url publishUrl
url = publishUrl
allowInsecureProtocol = true
} else {
name = "central"
Expand Down
21 changes: 13 additions & 8 deletions ml-development-tools/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

/*
* Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
Expand All @@ -12,6 +14,10 @@ plugins {

dependencies {
compileOnly gradleApi()

// This is a runtime dependency of marklogic-client-api but is needed for compiling.
compileOnly "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4"

implementation project(':marklogic-client-api')
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.0'
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jacksonVersion}"
Expand All @@ -29,7 +35,7 @@ dependencies {
// Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting
// copied twice. This started occurring with the upgrade of Gradle from 6.x to 7.x.
tasks.processResources {
duplicatesStrategy = "exclude"
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}

tasks.register("mlDevelopmentToolsJar", Jar) {
Expand All @@ -45,15 +51,15 @@ gradlePlugin {
id = 'com.marklogic.ml-development-tools'
displayName = 'ml-development-tools MarkLogic Data Service Tools'
description = 'ml-development-tools plugin for developing data services on MarkLogic'
tags.set(['marklogic', 'progress'])
tags = ['marklogic', 'progress']
implementationClass = 'com.marklogic.client.tools.gradle.ToolsPlugin'
}
}
}

publishing {
publications {
main(MavenPublication) {
mainJava(MavenPublication) {
from components.java
}
}
Expand All @@ -70,11 +76,10 @@ publishing {
}
}

compileKotlin {
kotlinOptions.jvmTarget = '17'
}
compileTestKotlin {
kotlinOptions.jvmTarget = '17'
tasks.withType(KotlinCompile).configureEach {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
}
}

tasks.register("generateTests", JavaExec) {
Expand Down