From 9ba22645b56881e123d51b55979a5c0d6ae25d0f Mon Sep 17 00:00:00 2001 From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> Date: Tue, 10 Oct 2023 21:27:24 +0900 Subject: [PATCH] Lower Jakarta module baseline to 9 There is no strong reason to baseline on the higher 10. Setting the baseline to 9 will allow more people to utilize this module. See gh-4201 --- build.gradle | 2 +- gradle/libs.versions.toml | 2 +- {micrometer-jakarta10 => micrometer-jakarta9}/build.gradle | 2 +- .../instrument/jms/DefaultJmsProcessObservationConvention.java | 0 .../instrument/jms/DefaultJmsPublishObservationConvention.java | 0 .../micrometer/jakarta10/instrument/jms/JmsInstrumentation.java | 0 .../jakarta10/instrument/jms/JmsObservationDocumentation.java | 0 .../jakarta10/instrument/jms/JmsProcessObservationContext.java | 0 .../instrument/jms/JmsProcessObservationConvention.java | 0 .../jakarta10/instrument/jms/JmsPublishObservationContext.java | 0 .../instrument/jms/JmsPublishObservationConvention.java | 0 .../instrument/jms/MessageConsumerInvocationHandler.java | 0 .../instrument/jms/MessageProducerInvocationHandler.java | 0 .../jakarta10/instrument/jms/SessionInvocationHandler.java | 0 .../io/micrometer/jakarta10/instrument/jms/package-info.java | 0 .../java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java | 0 .../jms/DefaultJmsProcessObservationConventionTests.java | 0 .../jms/DefaultJmsPublishObservationConventionTests.java | 0 micrometer-test/build.gradle | 2 +- settings.gradle | 2 +- 20 files changed, 5 insertions(+), 5 deletions(-) rename {micrometer-jakarta10 => micrometer-jakarta9}/build.gradle (91%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConvention.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConvention.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsInstrumentation.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsObservationDocumentation.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationContext.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationConvention.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationContext.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationConvention.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageConsumerInvocationHandler.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageProducerInvocationHandler.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/SessionInvocationHandler.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/main/java/io/micrometer/jakarta10/instrument/jms/package-info.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/test/java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConventionTests.java (100%) rename {micrometer-jakarta10 => micrometer-jakarta9}/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConventionTests.java (100%) diff --git a/build.gradle b/build.gradle index bc94381aed..1efb742c5a 100644 --- a/build.gradle +++ b/build.gradle @@ -327,7 +327,7 @@ subprojects { check.dependsOn("testModules") - if (!(project.name in ['micrometer-jakarta10'])) { + if (!(project.name in ['micrometer-jakarta9'])) { apply plugin: 'me.champeau.gradle.japicmp' apply plugin: 'de.undercouch.download' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index caabc7824d..11b947f615 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -126,7 +126,7 @@ httpcomponents-client = { module = "org.apache.httpcomponents:httpclient", versi httpcomponents-client5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpcomponents-client5" } hystrix = { module = "com.netflix.hystrix:hystrix-core", version.ref = "hystrix" } jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson-databind" } -jakarta-jmsApi = { module = "jakarta.jms:jakarta.jms-api", version = "3.1.0" } +jakarta-jmsApi = { module = "jakarta.jms:jakarta.jms-api", version = "3.0.0" } jakarta-servletApi = { module = "jakarta.servlet:jakarta.servlet-api", version = "5.0.0" } javalin = { module = "io.javalin:javalin", version = "5.6.2" } javax-cacheApi = { module = "javax.cache:cache-api", version.ref = "javax-cache" } diff --git a/micrometer-jakarta10/build.gradle b/micrometer-jakarta9/build.gradle similarity index 91% rename from micrometer-jakarta10/build.gradle rename to micrometer-jakarta9/build.gradle index 4b2c45c650..1307322b81 100644 --- a/micrometer-jakarta10/build.gradle +++ b/micrometer-jakarta9/build.gradle @@ -1,4 +1,4 @@ -description 'Module for Jakarta 10+ based instrumentations' +description 'Module for Jakarta 9+ based instrumentations' jar { bundle { diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConvention.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConvention.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConvention.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConvention.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConvention.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConvention.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConvention.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConvention.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsInstrumentation.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsInstrumentation.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsInstrumentation.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsInstrumentation.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsObservationDocumentation.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsObservationDocumentation.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsObservationDocumentation.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsObservationDocumentation.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationContext.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationContext.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationContext.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationContext.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationConvention.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationConvention.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationConvention.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsProcessObservationConvention.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationContext.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationContext.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationContext.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationContext.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationConvention.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationConvention.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationConvention.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/JmsPublishObservationConvention.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageConsumerInvocationHandler.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageConsumerInvocationHandler.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageConsumerInvocationHandler.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageConsumerInvocationHandler.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageProducerInvocationHandler.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageProducerInvocationHandler.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageProducerInvocationHandler.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/MessageProducerInvocationHandler.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/SessionInvocationHandler.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/SessionInvocationHandler.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/SessionInvocationHandler.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/SessionInvocationHandler.java diff --git a/micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/package-info.java b/micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/package-info.java similarity index 100% rename from micrometer-jakarta10/src/main/java/io/micrometer/jakarta10/instrument/jms/package-info.java rename to micrometer-jakarta9/src/main/java/io/micrometer/jakarta10/instrument/jms/package-info.java diff --git a/micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java b/micrometer-jakarta9/src/test/java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java similarity index 100% rename from micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java rename to micrometer-jakarta9/src/test/java/io/micrometer/jakarta10/NoJavaxArchitectureTests.java diff --git a/micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConventionTests.java b/micrometer-jakarta9/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConventionTests.java similarity index 100% rename from micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConventionTests.java rename to micrometer-jakarta9/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsProcessObservationConventionTests.java diff --git a/micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConventionTests.java b/micrometer-jakarta9/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConventionTests.java similarity index 100% rename from micrometer-jakarta10/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConventionTests.java rename to micrometer-jakarta9/src/test/java/io/micrometer/jakarta10/instrument/jms/DefaultJmsPublishObservationConventionTests.java diff --git a/micrometer-test/build.gradle b/micrometer-test/build.gradle index 1077c60dc3..a1f29a59dc 100644 --- a/micrometer-test/build.gradle +++ b/micrometer-test/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation 'org.awaitility:awaitility' testImplementation project(':micrometer-observation-test') - testImplementation project(':micrometer-jakarta10') + testImplementation project(':micrometer-jakarta9') testImplementation 'org.jsr107.ri:cache-ri-impl' diff --git a/settings.gradle b/settings.gradle index a79f32212a..cb2e2ca58b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -43,7 +43,7 @@ include 'micrometer-test', 'micrometer-observation-test' } include 'micrometer-bom' -include 'micrometer-jakarta10' +include 'micrometer-jakarta9' include 'micrometer-jetty11' include 'micrometer-osgi-test' include 'docs'