Skip to content

Commit e9ee441

Browse files
stevecl5stevecl5
committed
fix: resolve snyk vulnerabilities
build: update dependencies build: clean up gradle configuration files
1 parent ba2777c commit e9ee441

4 files changed

Lines changed: 65 additions & 86 deletions

File tree

‎build.gradle‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,37 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
plugins {
4+
id "com.github.mxenabled.coppuccino" version "6.+"
45
id "groovy"
5-
id "java"
6-
id "com.github.mxenabled.coppuccino" version "5.+"
7-
id "maven-publish"
86
id "java-gradle-plugin"
7+
id "maven-publish"
98
id "org.jetbrains.kotlin.jvm" version "2.1.0"
109
}
1110

1211
group "com.mx.vogue"
1312
version "3.0.1" // x-release-please-version
14-
sourceCompatibility = JavaVersion.VERSION_17
15-
targetCompatibility = JavaVersion.VERSION_17
13+
14+
java {
15+
toolchain {
16+
languageVersion = JavaLanguageVersion.of(17)
17+
}
18+
}
19+
20+
kotlin {
21+
compilerOptions {
22+
jvmTarget = JvmTarget.JVM_17
23+
}
24+
}
25+
26+
coppuccino {
27+
kotlin { enabled = true }
28+
coverage {
29+
minimumCoverage = 0.73
30+
excludes = [
31+
"com/mx/vogue/core/models/**"
32+
]
33+
}
34+
}
1635

1736
repositories {
1837
mavenCentral()
@@ -22,17 +41,16 @@ repositories {
2241
}
2342

2443
dependencies {
25-
implementation "org.apache.bcel:bcel:[6.11.0,7.0[" // Security update
26-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0"
27-
implementation "com.google.code.gson:gson:[2.0,3.0["
44+
implementation "com.google.code.gson:gson:[2.0,3.0)"
2845
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.20,3.0)"
2946
implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0"
30-
implementation "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations
3147

32-
api "org.mockito:mockito-inline:[5.0,6.0["
33-
api "org.spockframework:spock-core:2.4-M6-groovy-3.0"
48+
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
49+
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3450
}
3551

52+
test { useJUnitPlatform() }
53+
3654
gradlePlugin {
3755
plugins {
3856
voguePlugin {
@@ -46,24 +64,6 @@ gradlePlugin {
4664
}
4765
}
4866

49-
kotlin {
50-
compilerOptions {
51-
jvmTarget = JvmTarget.JVM_17
52-
}
53-
}
54-
55-
coppuccino {
56-
kotlin { enabled = true }
57-
coverage {
58-
minimumCoverage = 0.73
59-
excludes = [
60-
"com/mx/vogue/core/models/**"
61-
]
62-
}
63-
}
64-
65-
test { useJUnitPlatform() }
66-
6767
wrapper {
6868
gradleVersion = "7.6.4"
6969
distributionType = Wrapper.DistributionType.ALL

‎dependency_suppression.xml‎

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

‎gradle.lockfile‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8-
com.fasterxml.jackson:jackson-bom:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4+
com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7+
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8+
com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
99
com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1010
com.github.ben-manes:gradle-versions-plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
11-
com.github.spotbugs:spotbugs-annotations:4.9.4=compileOnlyDependenciesMetadata
12-
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
11+
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
1312
com.github.spotbugs:spotbugs:4.9.8=spotbugs
1413
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
15-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
14+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
1615
com.google.code.gson:gson:2.13.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1716
com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1817
com.squareup.moshi:moshi-kotlin:1.12.0=runtimeClasspath,testRuntimeClasspath
1918
com.squareup.moshi:moshi:1.12.0=runtimeClasspath,testRuntimeClasspath
2019
com.squareup.okhttp3:okhttp:4.12.0=runtimeClasspath,testRuntimeClasspath
2120
com.squareup.okio:okio-jvm:3.6.0=runtimeClasspath,testRuntimeClasspath
2221
com.squareup.okio:okio:3.6.0=runtimeClasspath,testRuntimeClasspath
23-
commons-io:commons-io:2.20.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
22+
commons-io:commons-io:2.20.0=spotbugs
2423
dev.drewhamilton.poko:poko-annotations-jvm:0.17.1=detekt
2524
dev.drewhamilton.poko:poko-annotations:0.17.1=detekt
2625
io.github.davidburstrom.contester:contester-breakpoint:0.2.0=detekt
@@ -49,20 +48,20 @@ io.gitlab.arturbosch.detekt:detekt-rules-style:1.23.8=detekt
4948
io.gitlab.arturbosch.detekt:detekt-rules:1.23.8=detekt
5049
io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
5150
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
52-
io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath
51+
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
5352
jaxen:jaxen:2.0.0=spotbugs
54-
net.bytebuddy:byte-buddy-agent:1.14.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55-
net.bytebuddy:byte-buddy:1.14.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
53+
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
54+
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5655
net.sf.saxon:Saxon-HE:12.9=spotbugs
57-
org.apache.bcel:bcel:6.11.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
58-
org.apache.commons:commons-lang3:3.19.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
56+
org.apache.bcel:bcel:6.11.0=spotbugs
57+
org.apache.commons:commons-lang3:3.19.0=spotbugs
5958
org.apache.commons:commons-text:1.14.0=spotbugs
60-
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
61-
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
62-
org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
63-
org.codehaus.groovy:groovy:3.0.24=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
59+
org.apache.logging.log4j:log4j-api:2.25.3=spotbugs
60+
org.apache.logging.log4j:log4j-core:2.25.3=spotbugs
61+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
62+
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6463
org.dom4j:dom4j:2.2.0=spotbugs
65-
org.hamcrest:hamcrest:3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
64+
org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6665
org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
6766
org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
6867
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
@@ -88,31 +87,27 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.1.0=kotlinBuildToolsApiClasspath,
8887
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
8988
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
9089
org.jetbrains.kotlin:kotlin-scripting-jvm:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
91-
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21=detekt
92-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=runtimeClasspath,testRuntimeClasspath
90+
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=detekt,runtimeClasspath,testRuntimeClasspath
9391
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=detekt
94-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
92+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21=runtimeClasspath,testRuntimeClasspath
9593
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=detekt
96-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
97-
org.jetbrains.kotlin:kotlin-stdlib:2.0.21=detekt
98-
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
94+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21=runtimeClasspath,testRuntimeClasspath
95+
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=apiDependenciesMetadata,compileClasspath,detekt,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9996
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
10097
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=detekt
10198
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=detekt
10299
org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt
103100
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt
104101
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt
105102
org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
106-
org.junit.platform:junit-platform-commons:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
107-
org.junit.platform:junit-platform-commons:1.14.0=runtimeClasspath,testRuntimeClasspath
108-
org.junit.platform:junit-platform-engine:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
109-
org.junit.platform:junit-platform-engine:1.14.0=runtimeClasspath,testRuntimeClasspath
110-
org.junit:junit-bom:5.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
111-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
112-
org.mockito:mockito-core:5.2.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
113-
org.mockito:mockito-inline:5.2.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
114-
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
115-
org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
103+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
104+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
105+
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
106+
org.junit:junit-bom:5.14.0=spotbugs
107+
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
108+
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
109+
org.objenesis:objenesis:3.3=testRuntimeClasspath
110+
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
116111
org.ow2.asm:asm-analysis:9.2=jacocoAnt
117112
org.ow2.asm:asm-analysis:9.9=spotbugs
118113
org.ow2.asm:asm-commons:9.2=jacocoAnt
@@ -125,8 +120,8 @@ org.ow2.asm:asm:9.9=spotbugs
125120
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
126121
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
127122
org.snakeyaml:snakeyaml-engine:2.7=detekt
128-
org.spockframework:spock-bom:2.4-M6-groovy-3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
129-
org.spockframework:spock-core:2.4-M6-groovy-3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
123+
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
124+
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
130125
org.xmlresolver:xmlresolver:5.3.3=spotbugs
131-
org.yaml:snakeyaml:2.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
132-
empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
126+
org.yaml:snakeyaml:2.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
127+
empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

‎jitpack.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jdk:
2+
- openjdk17

0 commit comments

Comments
 (0)