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
12 changes: 2 additions & 10 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,9 @@
packageRules: [
{
enabled: false,
matchPackageNames: [
'org.apache.maven:*',
'org.apache.maven.plugin-tools:*',
],
},
{
enabled: false,
matchPackageNames: [
'com.palantir.javaformat:palantir-java-format',
matchFileNames: [
'gradle/pinned-libs.versions.toml',
],
matchCurrentVersion: '<= 1.1.0',
},
{
groupName: 'Ktlint',
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/update_renovate_changelogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
("versions", "jackson"): "jackson",
("versions", "ktlint"): "ktlint",
("versions", "javaparser"): "javaparser",
("libraries", "palantir-java-format-default"): "palantir-java-format",
("libraries", "palantir-java-format"): "palantir-java-format",
("libraries", "adocfmt"): "adocfmt",
("libraries", "antlr4-formatter"): "antlr4-formatter",
("libraries", "cleanthat-java"): "cleanthat",
Expand Down
11 changes: 1 addition & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ jdk-release = "17"
durian = "1.2.0"
selfie = "3.1.1"
jackson = "2.22.2"
maven-api = "3.0"
ktlint = "1.8.0"
javaparser = "3.28.2"

Expand All @@ -21,17 +20,13 @@ solstice = "dev.equo.ide:solstice:1.8.2"
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }

maven-plugin-api = { module = "org.apache.maven:maven-plugin-api", version.ref = "maven-api" }
maven-plugin-annotations = { module = "org.apache.maven.plugin-tools:maven-plugin-annotations", version.ref = "maven-api" }
maven-core = { module = "org.apache.maven:maven-core", version.ref = "maven-api" }

ktlint-rule-engine = { module = "com.pinterest.ktlint:ktlint-rule-engine", version.ref = "ktlint" }
ktlint-ruleset-standard = { module = "com.pinterest.ktlint:ktlint-ruleset-standard", version.ref = "ktlint" }

javaparser-core = { module = "com.github.javaparser:javaparser-core", version.ref = "javaparser" }
javaparser-symbol-solver-core = { module = "com.github.javaparser:javaparser-symbol-solver-core", version.ref = "javaparser" }

palantir-java-format-default = "com.palantir.javaformat:palantir-java-format:2.98.0"
palantir-java-format = "com.palantir.javaformat:palantir-java-format:2.98.0"

jgit = "org.eclipse.jgit:org.eclipse.jgit:7.8.0.202609011348-r"
junit-jupiter = "org.junit.jupiter:junit-jupiter:6.1.3"
Expand All @@ -42,18 +37,15 @@ slf4j-api = "org.slf4j:slf4j-api:2.0.19"
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
jcip-annotations = "net.jcip:jcip-annotations:1.0"
jakarta-annotation-api = "jakarta.annotation:jakarta.annotation-api:3.0.0"
aether-api = "org.eclipse.aether:aether-api:1.1.0"
plexus-resources = "org.codehaus.plexus:plexus-resources:1.4.0"
plexus-utils = "org.codehaus.plexus:plexus-utils:4.1.0"
plexus-build-api = "org.sonatype.plexus:plexus-build-api:0.0.7"
concurrent-trees = "com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
owasp-encoder = "org.owasp.encoder:encoder:1.4.0"
mustache-compiler = "com.github.spullara.mustache.java:compiler:0.9.14"
adocfmt = "org.drjekyll:adocfmt:0.3.1"
antlr4-formatter = "com.khubla.antlr4formatter:antlr4-formatter:1.2.1"
cleanthat-java = "io.github.solven-eu.cleanthat:java:2.26"
cool-rdf-formatter = "cool.rdf:cool-rdf-formatter:2.0.1"
diktat-rules = "org.cqfn.diktat:diktat-rules:1.2.5"
diktat-runner = "com.saveourtool.diktat:diktat-runner:2.0.0"
flexmark-all = "com.vladsch.flexmark:flexmark-all:0.64.8"
freshmark = "com.diffplug.freshmark:freshmark:1.3.1"
Expand All @@ -62,7 +54,6 @@ google-java-format = "com.google.googlejavaformat:google-java-format:1.30.0"
gson = "com.google.code.gson:gson:2.14.0"
json-simple = "org.json:json:20210307"
ktfmt = "com.facebook:ktfmt:0.64"
palantir-java-format = "com.palantir.javaformat:palantir-java-format:1.1.0"
prince-of-space-core = "io.github.agustafson.princeofspace:prince-of-space-core:2.2.0"
scalafmt-core = "org.scalameta:scalafmt-core_2.13:3.8.1"
sortpom-sorter = "com.github.ekryd.sortpom:sortpom-sorter:4.0.0"
Expand Down
17 changes: 17 additions & 0 deletions gradle/pinned-libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This version catalog contains pinned/locked dependencies (e.g. for backward-compatibility
# compile targets or fixed build tool APIs). Automated dependency updates (like Renovate)
# are explicitly disabled for this file.

[versions]
maven = "3.0"

[libraries]
maven-plugin-api = { module = "org.apache.maven:maven-plugin-api", version.ref = "maven" }
maven-plugin-annotations = { module = "org.apache.maven.plugin-tools:maven-plugin-annotations", version.ref = "maven" }
maven-core = { module = "org.apache.maven:maven-core", version.ref = "maven" }

palantir-java-format = "com.palantir.javaformat:palantir-java-format:1.1.0"
google-java-format = "com.google.googlejavaformat:google-java-format:1.7"
diktat-rules = "org.cqfn.diktat:diktat-rules:1.2.5"
aether-api = "org.eclipse.aether:aether-api:1.1.0"
plexus-build-api = "org.sonatype.plexus:plexus-build-api:0.0.7"
12 changes: 4 additions & 8 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildConfig {
buildConfigField("VERSION_CLEANTHAT", libs.cleanthat.java.version)
buildConfigField("VERSION_GJF", libs.google.java.format.version)
buildConfigField("VERSION_JAVAPARSER", libs.javaparser.symbol.solver.core.version)
buildConfigField("VERSION_PALANTIR_JAVA_FORMAT", libs.palantir.java.format.default.version)
buildConfigField("VERSION_PALANTIR_JAVA_FORMAT", libs.palantir.java.format.version)
buildConfigField("VERSION_PRINCE_OF_SPACE", libs.prince.of.space.core.version)
buildConfigField("VERSION_TABLETEST_FORMATTER", libs.tabletest.formatter.core.version)

Expand Down Expand Up @@ -142,7 +142,7 @@ dependencies {
"cleanthatCompileOnly"(libs.cleanthat.java)
"compatCleanthat2Dot1CompileAndTestOnly"(libs.cleanthat.java)
// diktat old supported version 1.x
"compatDiktat1Dot2Dot5CompileOnly"(libs.diktat.rules)
"compatDiktat1Dot2Dot5CompileOnly"(pinnedLibs.diktat.rules)
// diktat latest supported version 2.x
"compatDiktat2Dot0Dot0CompileOnly"(libs.diktat.runner)
// flexmark
Expand All @@ -161,19 +161,15 @@ dependencies {
"javaParserCompileOnly"(libs.javaparser.symbol.solver.core)
// ktfmt
"ktfmtCompileOnly"(libs.ktfmt)
"ktfmtCompileOnly"("com.google.googlejavaformat:google-java-format") {
version {
strictly("1.7") // for JDK 8 compatibility
}
}
"ktfmtCompileOnly"(pinnedLibs.google.java.format) // for JDK 8 compatibility
"ktfmtCompileOnly"(libs.jsr305)
// ktlint latest supported version
"compatKtLint1Dot0Dot0CompileAndTestOnly"(libs.ktlint.rule.engine)
"compatKtLint1Dot0Dot0CompileAndTestOnly"(libs.ktlint.ruleset.standard)
"compatKtLint1Dot0Dot0CompileAndTestOnly"(libs.slf4j.api)
// palantirJavaFormat
"palantirJavaFormatCompileOnly"(
libs.palantir.java.format
pinnedLibs.palantir.java.format
) // this version needs to stay compilable against Java 8 for CI Job testNpm
// princeOfSpace
"princeOfSpaceCompileOnly"(libs.prince.of.space.core)
Expand Down
16 changes: 8 additions & 8 deletions plugin-maven/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ dependencies {
implementation(projects.lib)
implementation(projects.libExtra)

compileOnly(libs.maven.plugin.api)
compileOnly(libs.maven.plugin.annotations)
compileOnly(libs.maven.core)
compileOnly(libs.aether.api)
compileOnly(pinnedLibs.maven.plugin.api)
compileOnly(pinnedLibs.maven.plugin.annotations)
compileOnly(pinnedLibs.maven.core)
compileOnly(pinnedLibs.aether.api)

compileOnly(libs.jakarta.annotation.api)

Expand All @@ -49,7 +49,7 @@ dependencies {
implementation(libs.plexus.resources)
implementation(libs.plexus.utils)
implementation(libs.jgit)
implementation(libs.plexus.build.api)
implementation(pinnedLibs.plexus.build.api)

testImplementation(projects.testlib)
testImplementation(libs.junit.jupiter)
Expand All @@ -58,10 +58,10 @@ dependencies {
testImplementation(libs.durian.io)
testImplementation(libs.mustache.compiler)
testImplementation(libs.owasp.encoder)
testImplementation(libs.maven.plugin.api)
testImplementation(libs.aether.api)
testImplementation(pinnedLibs.maven.plugin.api)
testImplementation(pinnedLibs.aether.api)
testImplementation(libs.plexus.resources)
testImplementation(libs.maven.core)
testImplementation(pinnedLibs.maven.core)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

Expand Down
5 changes: 5 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ dependencyResolutionManagement {
repositories {
mavenCentral()
}
versionCatalogs {
create("pinnedLibs") {
from(files("gradle/pinned-libs.versions.toml"))
}
}
}

if (System.getenv("CI") != null) {
Expand Down
Loading