Reorder dependency versions for update convenience (#2968)

* Reorder dependency versions for update convenience

* Try to add more consistency to naming

7 files changed, 82 insertions, 86 deletions

diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/maven-cli-setup.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/maven-cli-setup.gradle.kts
index 4beeab21..c8c57d1e 100644
--- a/build-logic/src/main/kotlin/org/jetbrains/conventions/maven-cli-setup.gradle.kts
+++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/maven-cli-setup.gradle.kts
@@ -36,8 +36,8 @@ abstract class MavenCliSetupExtension {
 
 val mavenCliSetupExtension =
     extensions.create("mavenCliSetup", MavenCliSetupExtension::class).apply {
-        mavenVersion.convention(libs.versions.apache.maven)
-        mavenPluginToolsVersion.convention(libs.versions.apache.mavenPluginTools)
+        mavenVersion.convention(libs.versions.apacheMaven.core)
+        mavenPluginToolsVersion.convention(libs.versions.apacheMaven.pluginTools)
 
         mavenBuildDir.convention(layout.buildDirectory.dir("maven"))
         mavenInstallDir.convention(layout.buildDirectory.dir("apache-maven"))
diff --git a/build.gradle.kts b/build.gradle.kts
index 69c44973..007f7375 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     id("org.jetbrains.conventions.dokka")
 
     alias(libs.plugins.kotlinx.binaryCompatibilityValidator)
-    alias(libs.plugins.gradle.pluginPublish)
+    alias(libs.plugins.gradlePublish)
     alias(libs.plugins.nexusPublish)
 }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ded27ec7..f18c6f14 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.jetbrainsMarkdown)
+    api(libs.jetbrains.markdown)
     implementation(kotlin("reflect"))
 
     implementation(libs.jsoup)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0587660f..db3d79af 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,115 +1,111 @@
 [versions]
 
-kotlin = "1.8.10"
-kotlin-plugin = "213-1.8.10-release-430-IJ6777.52"
+gradlePlugin-kotlin = "1.8.10"
+gradlePlugin-android = "4.0.1"
+gradlePlugin-dokka = "1.7.10"
+
 kotlinx-coroutines = "1.6.3"
-kotlinx-html = "0.7.5"
-kotlinx-cli = "0.3.4"
+kotlinx-bcv = "0.12.1"
 
-idea = "213.6777.52"
-jetbrainsMarkdown = "0.3.1"
+## Analysis
+kotlin-compiler = "1.8.10"
+kotlin-ide-plugin = "213-1.8.10-release-430-IJ6777.52"
+intellij = "213.6777.52"
 
+## HTML
 jsoup = "1.15.3"
+freemarker = "2.3.31"
+soywiz-korte = "2.7.0"
+kotlinx-html = "0.7.5"
+
+## Markdown
+jetbrains-markdown = "0.3.1"
 
+## JSON
 jackson = "2.12.7" # jackson 2.13.X does not support kotlin language version 1.4, check before updating
 jacksonDatabind = "2.12.7.1" # fixes CVE-2022-42003
 
-freemarker = "2.3.31"
-
-soywiz-korte = "2.7.0"
-
-apache-maven = "3.5.0"
-apache-mavenArtifact = "3.8.5"
-apache-mavenArchiver = "2.5"
-apache-mavenPluginTools = "3.5.2"
+## Maven
+apacheMaven-core = "3.5.0"
+apacheMaven-artifact = "3.8.5"
+apacheMaven-archiver = "2.5"
+apacheMaven-pluginTools = "3.5.2"
 
-eclipse-jgit = "5.12.0.202106070339-r"
+## CLI
+kotlinx-cli = "0.3.4"
 
-## test dependency versions ##
-junit = "5.9.2"
-assertk = "0.25"
+## NPM | Frontend
+node = "16.13.0"
 
-## Gradle plugins ##
+## Publishing
 gradlePlugin-shadow = "7.1.2"
-gradlePlugin-binaryCompatibilityValidator = "0.12.1"
 gradlePlugin-nexusPublish = "1.1.0"
-gradlePlugin-dokka = "1.7.10"
 gradlePlugin-gradlePluginPublish = "0.20.0"
-gradlePlugin-gradle = "4.0.1"
-
-## NPM ##
-node = "16.13.0"
 
+## Test
+junit = "5.9.2"
+assertk = "0.25"
+eclipse-jgit = "5.12.0.202106070339-r"
 
 [libraries]
 
-eclipse-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" }
-freemarker = { module = "org.freemarker:freemarker", version.ref = "freemarker" }
-jetbrainsIntelliJ-core = { module = "com.jetbrains.intellij.idea:intellij-core", version.ref = "idea" }
-jetbrainsIntelliJ-jpsStandalone = { module = "com.jetbrains.intellij.idea:jps-standalone", version.ref = "idea" }
-jetbrainsMarkdown = { module = "org.jetbrains:markdown", version.ref = "jetbrainsMarkdown" }
-jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
-soywiz-korte = { module = "com.soywiz.korlibs.korte:korte-jvm", version.ref = "soywiz-korte" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 
-## Kotlin libs ##
-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
+#### Gradle plugins ####
+# The Maven coordinates of Gradle plugins that are either used in convention plugins, or in Dokka subprojects
+gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradlePlugin-kotlin" }
+gradlePlugin-android = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin-android" }
+gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradlePlugin-dokka" }
+gradlePlugin-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "gradlePlugin-shadow" }
 
-kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin" }
-kotlin-idea = { module = "org.jetbrains.kotlin:idea", version.ref = "kotlin" }
-kotlin-common = { module = "org.jetbrains.kotlin:common", version.ref = "kotlin" }
-kotlin-core = { module = "org.jetbrains.kotlin:core", version.ref = "kotlin" }
-kotlin-native = { module = "org.jetbrains.kotlin:native", version.ref = "kotlin" }
+#### Kotlin analysis ####
+kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin-compiler" }
+kotlin-idePlugin-common = { module = "org.jetbrains.kotlin:common", version.ref = "kotlin-ide-plugin" }
+kotlin-idePlugin-idea = { module = "org.jetbrains.kotlin:idea", version.ref = "kotlin-ide-plugin" }
+kotlin-idePlugin-core = { module = "org.jetbrains.kotlin:core", version.ref = "kotlin-ide-plugin" }
+kotlin-idePlugin-native = { module = "org.jetbrains.kotlin:native", version.ref = "kotlin-ide-plugin" }
 
-kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli-jvm", version.ref = "kotlinx-cli" }
-kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinx-html" }
+#### Java analysis ####
+jetbrains-intellij-core = { module = "com.jetbrains.intellij.idea:intellij-core", version.ref = "intellij" }
+jetbrains-intellij-jpsStandalone = { module = "com.jetbrains.intellij.idea:jps-standalone", version.ref = "intellij" }
 
-kotlinx-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+#### HTML ####
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
+freemarker = { module = "org.freemarker:freemarker", version.ref = "freemarker" }
+kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinx-html" }
+soywiz-korte = { module = "com.soywiz.korlibs.korte:korte-jvm", version.ref = "soywiz-korte" }
 
-## Kotlin Plugins ##
-kotlinPlugin-common = { module = "org.jetbrains.kotlin:common", version.ref = "kotlin.plugin" }
-kotlinPlugin-idea = { module = "org.jetbrains.kotlin:idea", version.ref = "kotlin.plugin" }
-kotlinPlugin-core = { module = "org.jetbrains.kotlin:core", version.ref = "kotlin.plugin" }
-kotlinPlugin-native = { module = "org.jetbrains.kotlin:native", version.ref = "kotlin.plugin" }
+#### Markdown ####
+jetbrains-markdown = { module = "org.jetbrains:markdown", version.ref = "jetbrains-markdown" }
 
-## Jackson ##
-jackson-bom = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+#### Jackson ####
 jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 jackson-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jacksonDatabind" }
 
-## Apache Maven ##
-apache-mavenArchiver = { module = "org.apache.maven:maven-archiver", version.ref = "apache-mavenArchiver" }
-apache-mavenCore = { module = "org.apache.maven:maven-core", version.ref = "apache-maven" }
-apache-mavenPluginAnnotations = { module = "org.apache.maven.plugin-tools:maven-plugin-annotations", version.ref = "apache-mavenPluginTools" }
-apache-mavenPluginApi = { module = "org.apache.maven:maven-plugin-api", version.ref = "apache-maven" }
-apache-mavenArtifact = { module = "org.apache.maven:maven-artifact", version.ref = "apache-mavenArtifact" }
-
+#### Apache Maven ####
+apacheMaven-archiver = { module = "org.apache.maven:maven-archiver", version.ref = "apacheMaven-archiver" }
+apacheMaven-core = { module = "org.apache.maven:maven-core", version.ref = "apacheMaven-core" }
+apacheMaven-pluginAnnotations = { module = "org.apache.maven.plugin-tools:maven-plugin-annotations", version.ref = "apacheMaven-pluginTools" }
+apacheMaven-pluginApi = { module = "org.apache.maven:maven-plugin-api", version.ref = "apacheMaven-core" }
+apacheMaven-artifact = { module = "org.apache.maven:maven-artifact", version.ref = "apacheMaven-artifact" }
 
-#### test dependencies  ####
+#### CLI #####
+kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli-jvm", version.ref = "kotlinx-cli" }
 
+#### Test dependencies  ####
 assertk = { module = "com.willowtreeapps.assertk:assertk", version.ref = "assertk" }
+eclipse-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" }
 
-## junit ##
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
 
-
-#### Gradle plugins dependencies  ####
-# The Maven coordinates of Gradle plugins that are either used in convention plugins, or in Dokka subprojects
-
-gradlePlugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradlePlugin-dokka" }
-gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-gradlePlugin-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "gradlePlugin-shadow" }
-gradlePlugin-android = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin-gradle" }
-
-
 [plugins]
 # Gradle Plugins that are applied directly to subprojects
 # (Before defining plugins here, first consider creating convention plugins instead,
 # and define the Maven coordinates above to be used in build-logic/build.gradle.kts)
 
-kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradlePlugin-binaryCompatibilityValidator" }
+kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-bcv" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "gradlePlugin-shadow" }
-gradle-pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "gradlePlugin-gradlePluginPublish" }
+gradlePublish = { id = "com.gradle.plugin-publish", version.ref = "gradlePlugin-gradlePluginPublish" }
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "gradlePlugin-nexusPublish" }
diff --git a/kotlin-analysis/intellij-dependency/build.gradle.kts b/kotlin-analysis/intellij-dependency/build.gradle.kts
index b4e46030..af099902 100644
--- a/kotlin-analysis/intellij-dependency/build.gradle.kts
+++ b/kotlin-analysis/intellij-dependency/build.gradle.kts
@@ -35,19 +35,19 @@ fun jpsModel() = zipTree(jpsStandalone.singleFile).matching {
 }
 
 dependencies {
-    api(libs.kotlinPlugin.common)
-    api(libs.kotlinPlugin.idea) {
+    api(libs.kotlin.idePlugin.common)
+    api(libs.kotlin.idePlugin.idea) {
         isTransitive = false
     }
-    api(libs.kotlinPlugin.core)
-    api(libs.kotlinPlugin.native)
+    api(libs.kotlin.idePlugin.core)
+    api(libs.kotlin.idePlugin.native)
 
     @Suppress("UnstableApiUsage")
-    intellijCore(libs.jetbrainsIntelliJ.core)
+    intellijCore(libs.jetbrains.intellij.core)
     implementation(intellijCoreAnalysis())
 
     @Suppress("UnstableApiUsage")
-    jpsStandalone(libs.jetbrainsIntelliJ.jpsStandalone)
+    jpsStandalone(libs.jetbrains.intellij.jpsStandalone)
     implementation(jpsModel())
 }
 
diff --git a/plugins/versioning/build.gradle.kts b/plugins/versioning/build.gradle.kts
index 2cb40708..370338a8 100644
--- a/plugins/versioning/build.gradle.kts
+++ b/plugins/versioning/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation(libs.kotlinx.html)
 
     implementation(libs.jsoup)
-    implementation(libs.apache.mavenArtifact)
+    implementation(libs.apacheMaven.artifact)
 
     testImplementation(projects.core.testApi)
     testImplementation(platform(libs.junit.bom))
diff --git a/runners/maven-plugin/build.gradle.kts b/runners/maven-plugin/build.gradle.kts
index d91b8889..90744e4f 100644
--- a/runners/maven-plugin/build.gradle.kts
+++ b/runners/maven-plugin/build.gradle.kts
@@ -10,10 +10,10 @@ plugins {
 dependencies {
     implementation(projects.core)
 
-    implementation(libs.apache.mavenCore)
-    implementation(libs.apache.mavenPluginApi)
-    implementation(libs.apache.mavenPluginAnnotations)
-    implementation(libs.apache.mavenArchiver)
+    implementation(libs.apacheMaven.core)
+    implementation(libs.apacheMaven.pluginApi)
+    implementation(libs.apacheMaven.pluginAnnotations)
+    implementation(libs.apacheMaven.archiver)
 }
 
 val mavenPluginTaskGroup = "maven plugin"