build: simplify log4j patching

With release 2.25.0 this can now be done properly, as it includes
apache/logging-log4j2#3450

Signed-off-by: Jendrik Johannes <[email protected]>

Author: jjohannes

src/main/kotlin/org.hiero.gradle.base.jpms-modules.gradle.kts

@@ -4,32 +4,12 @@ plugins {
     id("org.gradlex.extra-java-module-info")
 }
 
-// Dependencies that are missing in metadata because the 'compileOnlyApi' scope is not supported by
-// POM. We add these dependencies with a version to avoid maintaining versions in every single
-// project. These are "only" annotation libraries that are not included in the runtime classpath.
-// Because of this, they are not automatically visible to the consistent resolution. Therefore, we
-// need to explicitly add them to the version-providing Configuration (called mainRuntimeClasspath).
-val additionalTransitiveCompileOnlyApiDependencies =
-    listOf(
-        "biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0",
-        "com.google.errorprone:error_prone_annotations:2.36.0",
-        "org.jspecify:jspecify:1.0.0",
-    )
-
 // Fix or enhance the metadata of third-party Modules. This is about the metadata in the
 // repositories: '*.pom' and '*.module' files.
 jvmDependencyConflicts.patch {
     // WORKAROUND: https://github.com/hyperledger/besu/pull/8443
     module("org.hyperledger.besu:bom") { removeDependency("javax.inject:javax.inject") }
 
-    // WORKAROUND: https://github.com/apache/logging-log4j2/issues/3437
-    module("org.apache.logging.log4j:log4j-api") {
-        additionalTransitiveCompileOnlyApiDependencies.forEach { addCompileOnlyApiDependency(it) }
-    }
-    module("org.apache.logging.log4j:log4j-core") {
-        additionalTransitiveCompileOnlyApiDependencies.forEach { addCompileOnlyApiDependency(it) }
-    }
-
     // Register JARs with classifier as features
     module("io.netty:netty-transport-native-epoll") {
         addFeature("linux-x86_64") // refer to as 'io.netty.transport.epoll.linux.x86_64'
@@ -308,6 +288,8 @@ extraJavaModuleInfo {
     )
     module("org.hdrhistogram:HdrHistogram", "org.hdrhistogram")
     module("org.latencyutils:LatencyUtils", "org.latencyutils")
+    module("org.osgi:org.osgi.annotation.bundle", "org.osgi.annotation.bundle")
+    module("org.osgi:org.osgi.annotation.versioning", "org.osgi.annotation.versioning")
 
     // Annotation processing only
     module("com.google.auto.service:auto-service-annotations", "com.google.auto.service")
@@ -416,10 +398,5 @@ configurations.getByName("mainRuntimeClasspath") {
     attributes.attribute(consistentResolutionAttribute, "global")
 }
 
-// WORKAROUND: https://github.com/apache/logging-log4j2/issues/3437
-additionalTransitiveCompileOnlyApiDependencies.forEach {
-    dependencies.add("mainRuntimeClasspath", it)
-}
-
 // In case published versions of a module are also available, always prefer the local one
 configurations.all { resolutionStrategy.preferProjectModules() }

src/test/kotlin/org/hiero/gradle/test/JpmsPatchTest.kt

@@ -16,7 +16,7 @@ class JpmsPatchTest {
             configurations.all { attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21) }
             dependencies.components.withModule("com.goterl:resource-loader") { this.status = "release" }
             dependencies.components.withModule("com.goterl:lazysodium-java") { this.status = "release" }
-            dependencies.components.all { if(listOf("alpha", "beta", "rc", "cr").any { id.version.lowercase().contains(it) }) status = "integration" }
+            dependencies.components.all { if(listOf("alpha", "beta", "rc", "cr", ".m").any { id.version.lowercase().contains(it) }) status = "integration" }
             """
         p.aggregationBuildFile(
             """plugins { id("org.hiero.gradle.base.lifecycle") }