Try to add more consistency to naming

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"))

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)
 }
 

core/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.jetbrainsMarkdown)
+    api(libs.jetbrains.markdown)
     implementation(kotlin("reflect"))
 
     implementation(libs.jsoup)

gradle/libs.versions.toml

@@ -19,17 +19,17 @@ soywiz-korte = "2.7.0"
 kotlinx-html = "0.7.5"
 
 ## Markdown
-jetbrainsMarkdown = "0.3.1"
+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
 
 ## Maven
-apache-maven = "3.5.0"
-apache-mavenArtifact = "3.8.5"
-apache-mavenArchiver = "2.5"
-apache-mavenPluginTools = "3.5.2"
+apacheMaven-core = "3.5.0"
+apacheMaven-artifact = "3.8.5"
+apacheMaven-archiver = "2.5"
+apacheMaven-pluginTools = "3.5.2"
 
 ## CLI
 kotlinx-cli = "0.3.4"
@@ -60,14 +60,14 @@ gradlePlugin-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow"
 
 #### Kotlin analysis ####
 kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin-compiler" }
-kotlinIdePlugin-common = { module = "org.jetbrains.kotlin:common", version.ref = "kotlin-ide-plugin" }
-kotlinIdePlugin-idea = { module = "org.jetbrains.kotlin:idea", version.ref = "kotlin-ide-plugin" }
-kotlinIdePlugin-core = { module = "org.jetbrains.kotlin:core", version.ref = "kotlin-ide-plugin" }
-kotlinIdePlugin-native = { module = "org.jetbrains.kotlin:native", version.ref = "kotlin-ide-plugin" }
+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" }
 
 #### Java analysis ####
-jetbrainsIntelliJ-core = { module = "com.jetbrains.intellij.idea:intellij-core", version.ref = "intellij" }
-jetbrainsIntelliJ-jpsStandalone = { module = "com.jetbrains.intellij.idea:jps-standalone", version.ref = "intellij" }
+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" }
 
 #### HTML ####
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
@@ -76,19 +76,19 @@ kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref
 soywiz-korte = { module = "com.soywiz.korlibs.korte:korte-jvm", version.ref = "soywiz-korte" }
 
 #### Markdown ####
-jetbrainsMarkdown = { module = "org.jetbrains:markdown", version.ref = "jetbrainsMarkdown" }
+jetbrains-markdown = { module = "org.jetbrains:markdown", version.ref = "jetbrains-markdown" }
 
 #### 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" }
+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" }
 
 #### CLI #####
 kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli-jvm", version.ref = "kotlinx-cli" }
@@ -107,5 +107,5 @@ junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
 
 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" }

kotlin-analysis/intellij-dependency/build.gradle.kts

@@ -35,19 +35,19 @@ fun jpsModel() = zipTree(jpsStandalone.singleFile).matching {
 }
 
 dependencies {
-    api(libs.kotlinIdePlugin.common)
-    api(libs.kotlinIdePlugin.idea) {
+    api(libs.kotlin.idePlugin.common)
+    api(libs.kotlin.idePlugin.idea) {
         isTransitive = false
     }
-    api(libs.kotlinIdePlugin.core)
-    api(libs.kotlinIdePlugin.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())
 }
 

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))

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"