Skip to content

Commit cc7c4cc

Browse files
stevecl5stevecl5
committed
build: update plugins and dependencies
Release-As: 6.0.2
1 parent 1116f72 commit cc7c4cc

22 files changed

Lines changed: 168 additions & 288 deletions

File tree

‎.vogue.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 46 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2+
id "com.github.mxenabled.coppuccino" version "6.+" apply false
3+
id "com.github.mxenabled.vogue" version "3.+"
24
id "idea"
3-
id "com.github.mxenabled.coppuccino" version "5.+" apply false
4-
id "com.github.mxenabled.vogue" version "2.+"
55
id "io.freefair.lombok" version "8.+" apply false
66
id "io.github.gradle-nexus.publish-plugin" version "1.1.+"
77
}
@@ -29,41 +29,40 @@ allprojects {
2929
group "com.mx.path-core"
3030
description "MX Path Core"
3131
version rootProject.version
32-
sourceCompatibility = JavaVersion.VERSION_17
33-
targetCompatibility = JavaVersion.VERSION_17
32+
33+
java {
34+
toolchain {
35+
languageVersion = JavaLanguageVersion.of(17)
36+
}
37+
}
3438

3539
repositories {
3640
mavenCentral()
3741
mavenLocal()
3842
}
39-
40-
configurations.configureEach {
41-
resolutionStrategy.eachDependency { details ->
42-
//Uncontrolled Recursion [High Severity][https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-10734078] in org.apache.commons:commons-lang3@3.17.0
43-
// introduced by net.sourceforge.pmd:pmd-java@7.16.0 > org.apache.commons:commons-lang3@3.17.0 and 7 other path(s)
44-
// This issue was fixed in versions: 3.18.0
45-
if (details.requested.group == "org.apache.commons" && details.requested.name == "commons-lang3") {
46-
details.useVersion "3.18.0"
47-
}
48-
//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
49-
// introduced by com.github.spotbugs:spotbugs@4.9.8 > org.apache.logging.log4j:log4j-core@2.25.2
50-
// This issue was fixed in versions: 2.25.3
51-
else if (details.requested.group == "org.apache.logging.log4j" && details.requested.name == "log4j-core") {
52-
details.useVersion "2.25.3"
53-
}
54-
}
55-
resolutionStrategy.cacheChangingModulesFor 0, "seconds"
56-
}
5743
}
5844

5945
subprojects {
6046
if (it.name != platformProject) {
61-
apply plugin: "java-library"
62-
apply plugin: "groovy"
6347
apply plugin: "com.github.mxenabled.coppuccino"
6448
apply plugin: "com.github.mxenabled.vogue"
49+
apply plugin: "groovy"
50+
apply plugin: "java-library"
6551
apply plugin: "io.freefair.lombok"
6652

53+
java {
54+
withSourcesJar()
55+
withJavadocJar()
56+
}
57+
58+
coppuccino {
59+
rootDir = "${projectDir}/"
60+
}
61+
62+
vogue {
63+
dependencyUpdatesOutputDir = "${projectDir}/build/dependencyUpdates"
64+
}
65+
6766
ext {
6867
mockitoVersion = "[5.0,6.0)"
6968
spockVersion = "2.4-M6-groovy-3.0"
@@ -72,49 +71,37 @@ subprojects {
7271

7372
dependencies {
7473
constraints {
75-
api("com.google.code.gson:gson") {
76-
version {
77-
require "[2.13.0,13.0.0)"
78-
}
79-
}
80-
api("io.opentracing:opentracing-api") {
81-
version {
82-
require "[0.33,0.34)"
83-
}
84-
}
85-
api("io.opentracing:opentracing-noop") {
86-
version {
87-
require "[0.33,0.34)"
88-
}
89-
}
90-
api("io.opentracing:opentracing-util") {
91-
version {
92-
require "[0.33,0.34)"
93-
}
94-
}
95-
api("com.google.guava:guava") {
96-
version {
97-
require "[32.0,33.0)"
98-
}
99-
}
100-
api("com.github.rholder:guava-retrying") {
101-
version {
102-
require "[2.0,3.0)"
103-
}
104-
}
74+
// --- Shared Libraries ---
75+
api "com.google.code.gson:gson:[2.13.0,3.0.0)"
76+
api "io.opentracing:opentracing-api:[0.33,0.34)"
77+
api "io.opentracing:opentracing-noop:[0.33,0.34)"
78+
api "io.opentracing:opentracing-util:[0.33,0.34)"
79+
api "com.google.guava:guava:[32.0,33.0)"
80+
api "com.github.rholder:guava-retrying:[2.0,3.0)"
81+
10582
api "com.datadoghq:dd-trace-api:1.38.0"
83+
api "org.apache.httpcomponents:httpclient:4.5.14"
10684
api "org.slf4j:slf4j-api:1.7.30"
107-
api "org.apache.httpcomponents:httpclient:4.5.13"
10885

10986
// -----------------------------------------------------------------
11087
// These re-add JAXB classes needed for SOAP interaction.
11188
// Version changes to any of these need to be tested (not just built)
112-
// with an apps that use SOAP.
89+
// with an app that uses SOAP.
11390
// -----------------------------------------------------------------
11491
api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4!!"
11592
api "jakarta.xml.soap:jakarta.xml.soap-api:3.0.2!!"
11693
api "com.sun.xml.bind:jaxb-impl:4.0.6!!"
11794
api "org.glassfish.jaxb:jaxb-runtime:4.0.6!!"
95+
96+
// --- Shared Testing Libraries ---
97+
api "org.slf4j:slf4j-simple:1.7.30"
98+
api "io.opentracing:opentracing-mock:0.33.0"
99+
100+
// --- Security Overrides ---
101+
// Pulled in by org.apache.httpcomponents:httpclient:4.5.14
102+
api("commons-codec:commons-codec:1.14") {
103+
because "Fixes Low Severity vulnerability SNYK-JAVA-COMMONSCODEC-561518"
104+
}
118105
}
119106

120107
testImplementation "org.mockito:mockito-inline:${project.ext.mockitoVersion}"
@@ -134,40 +121,14 @@ subprojects {
134121
}
135122
}
136123

137-
coppuccino {
138-
rootDir = "${projectDir}/"
139-
}
140-
141-
vogue {
142-
dependencyUpdatesOutputDir = "${projectDir}/build/dependencyUpdates"
143-
}
144-
145-
task sourcesJar(type: Jar, dependsOn: classes) {
146-
classifier = "sources"
147-
from sourceSets.main.allSource
148-
}
149-
150-
task packageJavadoc(type: Jar) {
151-
classifier = "javadoc"
152-
from javadoc
153-
}
154-
155-
artifacts {
156-
archives sourcesJar
157-
archives jar
158-
archives packageJavadoc
159-
}
160-
161124
if (publishedProjects.contains(it.name)) {
162125
apply plugin: "maven-publish"
163126
apply plugin: "signing"
164127

165128
publishing {
166129
publications {
167130
maven(MavenPublication) {
168-
from components.java
169-
artifact sourcesJar
170-
artifact packageJavadoc
131+
from(it.name == platformProject ? components.javaPlatform : components.java)
171132

172133
pom {
173134
groupId = project.group
@@ -232,25 +193,11 @@ nexusPublishing {
232193
}
233194

234195
task spotlessApply {
235-
subprojects.each {
236-
if (it.name != platformProject) {
237-
it.afterEvaluate {
238-
def spotlessApplyTask = it.tasks.findByName("spotlessApply")
239-
dependsOn(spotlessApplyTask)
240-
}
241-
}
242-
}
196+
dependsOn subprojects.findAll { it.name != platformProject }.collect { "${it.path}:spotlessApply" }
243197
}
244198

245199
task subdependencies {
246-
subprojects.each {
247-
if (it.name != platformProject) {
248-
it.afterEvaluate {
249-
def dependenciesTask = it.tasks.findByName("dependencies")
250-
dependsOn(dependenciesTask)
251-
}
252-
}
253-
}
200+
dependsOn subprojects.findAll { it.name != platformProject }.collect { "${it.path}:dependencies" }
254201
}
255202

256203
project.tasks.getByPath("dependencies").finalizedBy("subdependencies")

‎common/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ coppuccino {
55
}
66

77
dependencies {
8-
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.
8+
api "org.apache.commons:commons-text:1.14.0" // For string manipulation utilities
99
api "com.google.guava:guava"
1010
api "com.github.rholder:guava-retrying" // For Request retries
11-
api "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations
1211
api "com.google.code.gson:gson"
1312
api "org.yaml:snakeyaml:2.4"
14-
implementation "org.slf4j:slf4j-api"
13+
1514
implementation "org.objenesis:objenesis:3.3"
16-
testImplementation "org.objenesis:objenesis:3.3"
15+
implementation "org.slf4j:slf4j-api"
1716
}

‎common/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
55
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6-
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
6+
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath
77
com.github.spotbugs:spotbugs:4.9.8=spotbugs
88
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
99
com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -37,9 +37,9 @@ net.sourceforge.pmd:pmd-java:7.16.0=pmd
3737
org.antlr:antlr4-runtime:4.13.2=checkstyle
3838
org.antlr:antlr4-runtime:4.9.3=pmd
3939
org.apache.bcel:bcel:6.11.0=spotbugs
40-
org.apache.commons:commons-lang3:3.18.0=checkstyle,compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
41-
org.apache.commons:commons-text:1.14.0=spotbugs
42-
org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
40+
org.apache.commons:commons-lang3:3.18.0=checkstyle,compileClasspath,pmd,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
41+
org.apache.commons:commons-lang3:3.19.0=spotbugs
42+
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
4343
org.apache.commons:commons-text:1.3=checkstyle
4444
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd
4545
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd
@@ -73,7 +73,7 @@ org.jspecify:jspecify:1.0.0=checkstyle
7373
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
7474
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
7575
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
76-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
76+
org.junit:junit-bom:5.14.0=spotbugs,testCompileClasspath,testRuntimeClasspath
7777
org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
7878
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
7979
org.objenesis:objenesis:3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎context/gradle.lockfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ com.fasterxml.jackson.core:jackson-databind:2.21.0=runtimeClasspath,testRuntimeC
88
com.fasterxml.jackson:jackson-bom:2.21.0=runtimeClasspath,testRuntimeClasspath
99
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
1010
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11-
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
11+
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath
1212
com.github.spotbugs:spotbugs:4.9.8=spotbugs
1313
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
1414
com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
@@ -46,9 +46,9 @@ net.sourceforge.pmd:pmd-java:7.16.0=pmd
4646
org.antlr:antlr4-runtime:4.13.2=checkstyle
4747
org.antlr:antlr4-runtime:4.9.3=pmd
4848
org.apache.bcel:bcel:6.11.0=spotbugs
49-
org.apache.commons:commons-lang3:3.18.0=checkstyle,compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
50-
org.apache.commons:commons-text:1.14.0=spotbugs
51-
org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
org.apache.commons:commons-lang3:3.18.0=checkstyle,compileClasspath,pmd,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
org.apache.commons:commons-lang3:3.19.0=spotbugs
51+
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
5252
org.apache.commons:commons-text:1.3=checkstyle
5353
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd
5454
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd
@@ -82,7 +82,7 @@ org.jspecify:jspecify:1.0.0=checkstyle
8282
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
8383
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
8484
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
85-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
85+
org.junit:junit-bom:5.14.0=spotbugs,testCompileClasspath,testRuntimeClasspath
8686
org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
8787
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
8888
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath

‎gateway-generator/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ dependencies {
22
implementation project(":gateway")
33

44
implementation "com.squareup:javapoet:1.13.0"
5-
implementation "com.google.auto.service:auto-service:1.1.1"
6-
implementation "org.projectlombok:lombok:1.18.24"
75

6+
// Compiles the auto-service annotations and runs the processor
7+
compileOnly "com.google.auto.service:auto-service:1.1.1"
88
annotationProcessor "com.google.auto.service:auto-service:1.1.1"
99
}

0 commit comments

Comments
 (0)