From c559c2b5d12dce9596e5f9e18da4aa75c26bb22d Mon Sep 17 00:00:00 2001 From: not-matthias Date: Wed, 25 Mar 2026 11:48:01 +0100 Subject: [PATCH] feat: change JMH fork group ID to io.codspeed.jmh Prepares for MavenCentral publishing by using a unique group ID (`io.codspeed.jmh` instead of `org.openjdk.jmh`) and dropping the `-codspeed.N` version suffix. Refs: COD-2400 --- AGENTS.md | 6 +++--- CONTRIBUTING.md | 4 ++-- examples/example-gradle/build.gradle.kts | 2 +- examples/example-maven/pom.xml | 6 +++--- jmh-fork/build.gradle.kts | 4 ++-- .../jmh-groovy-benchmark-archetype/pom.xml | 4 ++-- .../main/resources/archetype-resources/pom.xml | 4 ++-- .../jmh-java-benchmark-archetype/pom.xml | 4 ++-- .../main/resources/archetype-resources/pom.xml | 4 ++-- .../jmh-kotlin-benchmark-archetype/pom.xml | 4 ++-- .../main/resources/archetype-resources/pom.xml | 4 ++-- .../jmh-scala-benchmark-archetype/pom.xml | 4 ++-- .../main/resources/archetype-resources/pom.xml | 4 ++-- jmh-fork/jmh-archetypes/pom.xml | 4 ++-- jmh-fork/jmh-core-benchmarks/pom.xml | 8 ++++---- jmh-fork/jmh-core-ct/pom.xml | 12 ++++++------ jmh-fork/jmh-core-it/pom.xml | 18 +++++++++--------- jmh-fork/jmh-core/pom.xml | 4 ++-- jmh-fork/jmh-generator-annprocess/pom.xml | 6 +++--- jmh-fork/jmh-generator-asm/pom.xml | 8 ++++---- jmh-fork/jmh-generator-bytecode/pom.xml | 10 +++++----- jmh-fork/jmh-generator-reflection/pom.xml | 6 +++--- jmh-fork/jmh-samples/pom.xml | 8 ++++---- jmh-fork/pom.xml | 4 ++-- settings.gradle.kts | 10 +++++++++- 25 files changed, 80 insertions(+), 72 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 182803e..58bcb44 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -70,10 +70,10 @@ pre-commit run --all-files ### Publishing JMH Fork -The JMH fork uses versioning scheme `1.37.0-codspeed.N`. When updating versions: +The JMH fork is published under group ID `io.codspeed.jmh`. When updating versions: ```bash -cd jmh-fork && mvn versions:set -DnewVersion=1.37.0-codspeed.2 +cd jmh-fork && mvn versions:set -DnewVersion=x.y.z ``` Then update the version reference in root `build.gradle.kts`. @@ -111,7 +111,7 @@ The repository combines Maven and Gradle via Gradle's composite build feature: ## Modifying JMH Fork 1. Make changes in `jmh-fork/` -2. Bump version: `cd jmh-fork && mvn versions:set -DnewVersion=X.Y.Z-codspeed.N` +2. Bump version: `cd jmh-fork && mvn versions:set -DnewVersion=X.Y.Z` 3. Publish locally: `cd jmh-fork && mvn clean install -DskipTests -q` 4. Update version reference in root `build.gradle.kts` if needed 5. Test both Gradle and Maven examples to verify compatibility diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c173660..4b7ead7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,10 +2,10 @@ ## Bumping the JMH fork version -The JMH fork uses a versioning scheme like `1.37.0-codspeed.N`. To bump the version across all modules: +The JMH fork is published under group ID `io.codspeed.jmh`. To bump the version across all modules: ```bash -cd jmh-fork && mvn versions:set -DnewVersion=1.37.0-codspeed.2 +cd jmh-fork && mvn versions:set -DnewVersion=x.y.z ``` This updates all `pom.xml` files in the multi-module project. After bumping, also update the version reference in `build.gradle.kts`. diff --git a/examples/example-gradle/build.gradle.kts b/examples/example-gradle/build.gradle.kts index 2aff705..235e6f0 100644 --- a/examples/example-gradle/build.gradle.kts +++ b/examples/example-gradle/build.gradle.kts @@ -7,7 +7,7 @@ group = "io.codspeed" version = "1.0-SNAPSHOT" jmh { - jmhVersion.set("1.37.0-codspeed.1") + jmhVersion.set("0.1.0") } sourceSets { diff --git a/examples/example-maven/pom.xml b/examples/example-maven/pom.xml index 60509c1..fa81560 100644 --- a/examples/example-maven/pom.xml +++ b/examples/example-maven/pom.xml @@ -12,17 +12,17 @@ UTF-8 21 21 - 1.37.0-codspeed.1 + 0.1.0 - org.openjdk.jmh + io.codspeed.jmh jmh-core ${jmh.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${jmh.version} provided diff --git a/jmh-fork/build.gradle.kts b/jmh-fork/build.gradle.kts index 8c2f715..b2b4d17 100644 --- a/jmh-fork/build.gradle.kts +++ b/jmh-fork/build.gradle.kts @@ -2,8 +2,8 @@ subprojects { apply(plugin = "java-library") apply(plugin = "maven-publish") - group = "org.openjdk.jmh" - version = "1.37.0-codspeed.1" + group = "io.codspeed.jmh" + version = "0.1.0" repositories { mavenCentral() diff --git a/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml b/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml index 095fded..840476f 100644 --- a/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-archetypes - 1.37.0-codspeed.1 + 0.1.0 jmh-groovy-benchmark-archetype diff --git a/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml index ebea8b3..cfdfd3d 100644 --- a/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-groovy-benchmark-archetype/src/main/resources/archetype-resources/pom.xml @@ -45,7 +45,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-core \${jmh.version} @@ -168,7 +168,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-bytecode \${jmh.version} diff --git a/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml b/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml index f45a6b1..73d2407 100644 --- a/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-archetypes - 1.37.0-codspeed.1 + 0.1.0 jmh-java-benchmark-archetype diff --git a/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml index 761842c..0b8ea68 100644 --- a/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml @@ -47,12 +47,12 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-core \${jmh.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess \${jmh.version} provided diff --git a/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml b/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml index fa46484..6092728 100644 --- a/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-archetypes - 1.37.0-codspeed.1 + 0.1.0 jmh-kotlin-benchmark-archetype diff --git a/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml index 2c8a043..3b78924 100644 --- a/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-kotlin-benchmark-archetype/src/main/resources/archetype-resources/pom.xml @@ -46,7 +46,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-core \${jmh.version} @@ -157,7 +157,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-bytecode \${jmh.version} diff --git a/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml b/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml index 66bbbe3..29a5097 100644 --- a/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-archetypes - 1.37.0-codspeed.1 + 0.1.0 jmh-scala-benchmark-archetype diff --git a/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml index 2a040fb..637080e 100644 --- a/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml +++ b/jmh-fork/jmh-archetypes/jmh-scala-benchmark-archetype/src/main/resources/archetype-resources/pom.xml @@ -45,7 +45,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-core \${jmh.version} @@ -174,7 +174,7 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-bytecode \${jmh.version} diff --git a/jmh-fork/jmh-archetypes/pom.xml b/jmh-fork/jmh-archetypes/pom.xml index c4121b0..0cd218b 100644 --- a/jmh-fork/jmh-archetypes/pom.xml +++ b/jmh-fork/jmh-archetypes/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Archetypes diff --git a/jmh-fork/jmh-core-benchmarks/pom.xml b/jmh-fork/jmh-core-benchmarks/pom.xml index ae4e9a3..8642534 100644 --- a/jmh-fork/jmh-core-benchmarks/pom.xml +++ b/jmh-fork/jmh-core-benchmarks/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Core Benchmarks @@ -45,12 +45,12 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} provided diff --git a/jmh-fork/jmh-core-ct/pom.xml b/jmh-fork/jmh-core-ct/pom.xml index 4fa1d95..9585308 100644 --- a/jmh-fork/jmh-core-ct/pom.xml +++ b/jmh-fork/jmh-core-ct/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Core Compilation Tests @@ -45,22 +45,22 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-reflection ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-asm ${project.version} diff --git a/jmh-fork/jmh-core-it/pom.xml b/jmh-fork/jmh-core-it/pom.xml index 62d8fce..7aef82c 100644 --- a/jmh-fork/jmh-core-it/pom.xml +++ b/jmh-fork/jmh-core-it/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Core Integration Tests @@ -45,7 +45,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} @@ -107,7 +107,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} provided @@ -133,7 +133,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} provided @@ -163,7 +163,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} provided @@ -193,7 +193,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} provided @@ -223,7 +223,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-bytecode ${project.version} @@ -307,7 +307,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-generator-bytecode ${project.version} diff --git a/jmh-fork/jmh-core/pom.xml b/jmh-fork/jmh-core/pom.xml index 04204fb..847f927 100644 --- a/jmh-fork/jmh-core/pom.xml +++ b/jmh-fork/jmh-core/pom.xml @@ -29,9 +29,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Core diff --git a/jmh-fork/jmh-generator-annprocess/pom.xml b/jmh-fork/jmh-generator-annprocess/pom.xml index dbf7bbc..94e119f 100644 --- a/jmh-fork/jmh-generator-annprocess/pom.xml +++ b/jmh-fork/jmh-generator-annprocess/pom.xml @@ -29,9 +29,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Generators: Annotation Processors @@ -44,7 +44,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} diff --git a/jmh-fork/jmh-generator-asm/pom.xml b/jmh-fork/jmh-generator-asm/pom.xml index 79544f8..b576490 100644 --- a/jmh-fork/jmh-generator-asm/pom.xml +++ b/jmh-fork/jmh-generator-asm/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Generators: ASM @@ -43,12 +43,12 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-reflection ${project.version} diff --git a/jmh-fork/jmh-generator-bytecode/pom.xml b/jmh-fork/jmh-generator-bytecode/pom.xml index b950355..49f2234 100644 --- a/jmh-fork/jmh-generator-bytecode/pom.xml +++ b/jmh-fork/jmh-generator-bytecode/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Generators: Bytecode @@ -43,17 +43,17 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-reflection ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-asm ${project.version} diff --git a/jmh-fork/jmh-generator-reflection/pom.xml b/jmh-fork/jmh-generator-reflection/pom.xml index 0963199..0203fc0 100644 --- a/jmh-fork/jmh-generator-reflection/pom.xml +++ b/jmh-fork/jmh-generator-reflection/pom.xml @@ -28,9 +28,9 @@ questions. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Generators: Reflection @@ -43,7 +43,7 @@ questions. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} diff --git a/jmh-fork/jmh-samples/pom.xml b/jmh-fork/jmh-samples/pom.xml index 331140b..e1b2b14 100644 --- a/jmh-fork/jmh-samples/pom.xml +++ b/jmh-fork/jmh-samples/pom.xml @@ -34,9 +34,9 @@ THE POSSIBILITY OF SUCH DAMAGE. 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent - 1.37.0-codspeed.1 + 0.1.0 JMH Samples @@ -51,12 +51,12 @@ THE POSSIBILITY OF SUCH DAMAGE. - org.openjdk.jmh + io.codspeed.jmh jmh-core ${project.version} - org.openjdk.jmh + io.codspeed.jmh jmh-generator-annprocess ${project.version} provided diff --git a/jmh-fork/pom.xml b/jmh-fork/pom.xml index 6e3d54a..0570add 100644 --- a/jmh-fork/pom.xml +++ b/jmh-fork/pom.xml @@ -27,10 +27,10 @@ questions. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.openjdk.jmh + io.codspeed.jmh jmh-parent pom - 1.37.0-codspeed.1 + 0.1.0 Java Microbenchmark Harness Parent diff --git a/settings.gradle.kts b/settings.gradle.kts index b8a4adf..47d3ded 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,12 @@ rootProject.name = "codspeed-jvm" include("examples:example-gradle") -includeBuild("jmh-fork") +includeBuild("jmh-fork") { + dependencySubstitution { + substitute(module("org.openjdk.jmh:jmh-core")).using(project(":jmh-core")) + substitute(module("org.openjdk.jmh:jmh-generator-annprocess")).using(project(":jmh-generator-annprocess")) + substitute(module("org.openjdk.jmh:jmh-generator-bytecode")).using(project(":jmh-generator-bytecode")) + substitute(module("org.openjdk.jmh:jmh-generator-reflection")).using(project(":jmh-generator-reflection")) + substitute(module("org.openjdk.jmh:jmh-generator-asm")).using(project(":jmh-generator-asm")) + } +}