Skip to content

build: update plugins and dependencies #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevecl5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: update plugins and dependencies #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions .vogue.yml
View file
Open in desktop

This file was deleted.

250 changes: 96 additions & 154 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "com.github.mxenabled.coppuccino" version "6.+" apply false
id "com.github.mxenabled.vogue" version "3.+"
id "idea"
id "com.github.mxenabled.coppuccino" version "5.+" apply false
id "com.github.mxenabled.vogue" version "2.+"
id "io.freefair.lombok" version "8.+" apply false
id "io.github.gradle-nexus.publish-plugin" version "1.1.+"
}
Expand All @@ -21,100 +21,82 @@ def publishedProjects = [
"utilities"
]

allprojects {
if (it.name != platformProject) {
apply plugin: "java"
}

subprojects {
group "com.mx.path-core"
description "MX Path Core"
version rootProject.version
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

repositories {
mavenCentral()
mavenLocal()
}
if (it.name == platformProject) {
apply plugin: "java-platform"
} else {
apply plugin: "com.github.mxenabled.coppuccino"
apply plugin: "com.github.mxenabled.vogue"
apply plugin: "groovy"
apply plugin: "java-library"
apply plugin: "io.freefair.lombok"

configurations.configureEach {
resolutionStrategy.eachDependency { details ->
//Uncontrolled Recursion [High Severity][https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-10734078] in org.apache.commons:commons-lang3@3.17.0
// introduced by net.sourceforge.pmd:pmd-java@7.16.0 > org.apache.commons:commons-lang3@3.17.0 and 7 other path(s)
// This issue was fixed in versions: 3.18.0
if (details.requested.group == "org.apache.commons" && details.requested.name == "commons-lang3") {
details.useVersion "3.18.0"
}
//Improper Validation of Certificate with Host Mismatch [Medium Severity][https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHELOGGINGLOG4J-14532782] in org.apache.logging.log4j:log4j-core@2.25.2
// introduced by com.github.spotbugs:spotbugs@4.9.8 > org.apache.logging.log4j:log4j-core@2.25.2
// This issue was fixed in versions: 2.25.3
else if (details.requested.group == "org.apache.logging.log4j" && details.requested.name == "log4j-core") {
details.useVersion "2.25.3"
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
withSourcesJar()
withJavadocJar()
}
resolutionStrategy.cacheChangingModulesFor 0, "seconds"
}
}

subprojects {
if (it.name != platformProject) {
apply plugin: "java-library"
apply plugin: "groovy"
apply plugin: "com.github.mxenabled.coppuccino"
apply plugin: "com.github.mxenabled.vogue"
apply plugin: "io.freefair.lombok"
coppuccino {
rootDir = "${projectDir}/"
}

vogue {
dependencyUpdatesOutputDir = "${projectDir}/build/dependencyUpdates"
}

repositories {
mavenCentral()
mavenLocal()
}

ext {
mockitoVersion = "[5.0,6.0)"
spockVersion = "2.4-M6-groovy-3.0"
junitVersion = "5.14.0"
openTracingVersion = "[0.33,0.34)"
slf4jVersion = "1.7.30"
}

dependencies {
constraints {
api("com.google.code.gson:gson") {
version {
require "[2.13.0,13.0.0)"
}
}
api("io.opentracing:opentracing-api") {
version {
require "[0.33,0.34)"
}
}
api("io.opentracing:opentracing-noop") {
version {
require "[0.33,0.34)"
}
}
api("io.opentracing:opentracing-util") {
version {
require "[0.33,0.34)"
}
}
api("com.google.guava:guava") {
version {
require "[32.0,33.0)"
}
}
api("com.github.rholder:guava-retrying") {
version {
require "[2.0,3.0)"
}
}
// --- Shared Libraries ---
api "com.google.code.gson:gson:[2.13.0,3.0.0)"
api "io.opentracing:opentracing-api:${project.ext.openTracingVersion}"
api "io.opentracing:opentracing-noop:${project.ext.openTracingVersion}"
api "io.opentracing:opentracing-util:${project.ext.openTracingVersion}"
api "com.google.guava:guava:[32.0,33.0)"
api "com.github.rholder:guava-retrying:[2.0,3.0)"

api "com.datadoghq:dd-trace-api:1.38.0"
api "org.slf4j:slf4j-api:1.7.30"
api "org.apache.httpcomponents:httpclient:4.5.13"
api "org.apache.httpcomponents:httpclient:4.5.14"
api "org.slf4j:slf4j-api:${project.ext.slf4jVersion}"

// -----------------------------------------------------------------
// These re-add JAXB classes needed for SOAP interaction.
// Version changes to any of these need to be tested (not just built)
// with an apps that use SOAP.
// with an app that uses SOAP.
// -----------------------------------------------------------------
api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4!!"
api "jakarta.xml.soap:jakarta.xml.soap-api:3.0.2!!"
api "com.sun.xml.bind:jaxb-impl:4.0.6!!"
api "org.glassfish.jaxb:jaxb-runtime:4.0.6!!"

// --- Shared Testing Libraries ---
api "io.opentracing:opentracing-mock:${project.ext.openTracingVersion}"
api "org.slf4j:slf4j-simple:${project.ext.slf4jVersion}"

// --- Security Overrides ---
// Pulled in by org.apache.httpcomponents:httpclient:4.5.14
api("commons-codec:commons-codec:1.14") {
because "Fixes Low Severity vulnerability SNYK-JAVA-COMMONSCODEC-561518"
}
}

testImplementation "org.mockito:mockito-inline:${project.ext.mockitoVersion}"
Expand All @@ -133,85 +115,59 @@ subprojects {
setAuthor true
}
}
}

coppuccino {
rootDir = "${projectDir}/"
}

vogue {
dependencyUpdatesOutputDir = "${projectDir}/build/dependencyUpdates"
}

task sourcesJar(type: Jar, dependsOn: classes) {
classifier = "sources"
from sourceSets.main.allSource
}

task packageJavadoc(type: Jar) {
classifier = "javadoc"
from javadoc
}

artifacts {
archives sourcesJar
archives jar
archives packageJavadoc
}

if (publishedProjects.contains(it.name)) {
apply plugin: "maven-publish"
apply plugin: "signing"

publishing {
publications {
maven(MavenPublication) {
from components.java
artifact sourcesJar
artifact packageJavadoc

pom {
groupId = project.group
artifactId = project.name
name = project.name
description = project.description
url = "https://github.com/mxenabled/path-core"

developers {
developer {
name = "MX"
email = "path@mx.com"
organization = "MX Technologies Inc."
url = "http://www.mx.com"
}
if (publishedProjects.contains(it.name)) {
apply plugin: "maven-publish"
apply plugin: "signing"

publishing {
publications {
maven(MavenPublication) {
from(project.name == platformProject ? components.javaPlatform : components.java)

pom {
groupId = project.group
artifactId = project.name
name = project.name
description = project.description
url = "https://github.com/mxenabled/path-core"

developers {
developer {
name = "MX"
email = "path@mx.com"
organization = "MX Technologies Inc."
url = "http://www.mx.com"
}
}

licenses {
license {
name = "Proprietary"
url = "https://github.com/mxenabled/path-core/blob/master/LICENSE"
distribution = "repo"
}
licenses {
license {
name = "Proprietary"
url = "https://github.com/mxenabled/path-core/blob/master/LICENSE"
distribution = "repo"
}
}

scm {
connection = "scm:git:git@github.com:mxenabled/path-core.git"
url = "https://github.com/mxenabled/path-core/tree/master"
}
scm {
connection = "scm:git:git@github.com:mxenabled/path-core.git"
url = "https://github.com/mxenabled/path-core/tree/master"
}
}
}
}
}

signing {
def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingKeyPassword")
if (signingKey != null && signingKey != "") {
useInMemoryPgpKeys(signingKey, signingPassword)
sign publishing.publications.maven
logger.lifecycle("Configuring signing for ${project.name}")
} else {
logger.lifecycle("Skipping artifact signing for ${project.name} - missing signing key")
}
signing {
def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingKeyPassword")
if (signingKey != null && signingKey != "") {
useInMemoryPgpKeys(signingKey, signingPassword)
sign publishing.publications.maven
logger.lifecycle("Configuring signing for ${project.name}")
} else {
logger.lifecycle("Skipping artifact signing for ${project.name} - missing signing key")
}
}
}
Expand All @@ -232,25 +188,11 @@ nexusPublishing {
}

task spotlessApply {
subprojects.each {
if (it.name != platformProject) {
it.afterEvaluate {
def spotlessApplyTask = it.tasks.findByName("spotlessApply")
dependsOn(spotlessApplyTask)
}
}
}
dependsOn subprojects.findAll { it.name != platformProject }.collect { "${it.path}:spotlessApply" }
}

task subdependencies {
subprojects.each {
if (it.name != platformProject) {
it.afterEvaluate {
def dependenciesTask = it.tasks.findByName("dependencies")
dependsOn(dependenciesTask)
}
}
}
dependsOn subprojects.findAll { it.name != platformProject }.collect { "${it.path}:dependencies" }
}

project.tasks.getByPath("dependencies").finalizedBy("subdependencies")
Expand Down
7 changes: 3 additions & 4 deletions common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ coppuccino {
}

dependencies {
api "org.apache.commons:commons-text:latest.release" // For string manipulation utilities. There is a very small overlap with Guava's strings class, but adds many more features.
api "org.apache.commons:commons-text:1.15.0" // For string manipulation utilities
api "com.google.guava:guava"
api "com.github.rholder:guava-retrying" // For Request retries
api "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations
api "com.google.code.gson:gson"
api "org.yaml:snakeyaml:2.4"
implementation "org.slf4j:slf4j-api"

implementation "org.objenesis:objenesis:3.3"
testImplementation "org.objenesis:objenesis:3.3"
implementation "org.slf4j:slf4j-api"
}
10 changes: 6 additions & 4 deletions common/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# This file is expected to be part of source control.
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath
com.github.spotbugs:spotbugs:4.9.8=spotbugs
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.1=pmd
com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
Expand Down Expand Up @@ -37,7 +37,9 @@ net.sourceforge.pmd:pmd-java:7.16.0=pmd
org.antlr:antlr4-runtime:4.13.2=checkstyle
org.antlr:antlr4-runtime:4.9.3=pmd
org.apache.bcel:bcel:6.11.0=spotbugs
org.apache.commons:commons-lang3:3.18.0=checkstyle,compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.18.0=checkstyle,pmd
org.apache.commons:commons-lang3:3.19.0=spotbugs
org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.14.0=spotbugs
org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.3=checkstyle
Expand Down Expand Up @@ -73,7 +75,7 @@ org.jspecify:jspecify:1.0.0=checkstyle
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
org.junit:junit-bom:5.14.0=annotationProcessor,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
Loading
Loading