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 micrometer-metricsgh-4201
jkemming · Oct 10, 2023 · 9ba2264 · 9ba2264
1 parent 6418574
commit 9ba2264
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 → micrometer-jakarta9/build.gradle b/micrometer-jakarta10/build.gradle → 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/...faultJmsProcessObservationConvention.java → ...faultJmsProcessObservationConvention.java b/...faultJmsProcessObservationConvention.java → ...faultJmsProcessObservationConvention.java
diff --git a/...faultJmsPublishObservationConvention.java → ...faultJmsPublishObservationConvention.java b/...faultJmsPublishObservationConvention.java → ...faultJmsPublishObservationConvention.java
diff --git a/...10/instrument/jms/JmsInstrumentation.java → ...10/instrument/jms/JmsInstrumentation.java b/...10/instrument/jms/JmsInstrumentation.java → ...10/instrument/jms/JmsInstrumentation.java
diff --git a/...ment/jms/JmsObservationDocumentation.java → ...ment/jms/JmsObservationDocumentation.java b/...ment/jms/JmsObservationDocumentation.java → ...ment/jms/JmsObservationDocumentation.java
diff --git a/...ent/jms/JmsProcessObservationContext.java → ...ent/jms/JmsProcessObservationContext.java b/...ent/jms/JmsProcessObservationContext.java → ...ent/jms/JmsProcessObservationContext.java
diff --git a/.../jms/JmsProcessObservationConvention.java → .../jms/JmsProcessObservationConvention.java b/.../jms/JmsProcessObservationConvention.java → .../jms/JmsProcessObservationConvention.java
diff --git a/...ent/jms/JmsPublishObservationContext.java → ...ent/jms/JmsPublishObservationContext.java b/...ent/jms/JmsPublishObservationContext.java → ...ent/jms/JmsPublishObservationContext.java
diff --git a/.../jms/JmsPublishObservationConvention.java → .../jms/JmsPublishObservationConvention.java b/.../jms/JmsPublishObservationConvention.java → .../jms/JmsPublishObservationConvention.java
diff --git a/...jms/MessageConsumerInvocationHandler.java → ...jms/MessageConsumerInvocationHandler.java b/...jms/MessageConsumerInvocationHandler.java → ...jms/MessageConsumerInvocationHandler.java
diff --git a/...jms/MessageProducerInvocationHandler.java → ...jms/MessageProducerInvocationHandler.java b/...jms/MessageProducerInvocationHandler.java → ...jms/MessageProducerInvocationHandler.java
diff --git a/...trument/jms/SessionInvocationHandler.java → ...trument/jms/SessionInvocationHandler.java b/...trument/jms/SessionInvocationHandler.java → ...trument/jms/SessionInvocationHandler.java
diff --git a/...akarta10/instrument/jms/package-info.java → ...akarta10/instrument/jms/package-info.java b/...akarta10/instrument/jms/package-info.java → ...akarta10/instrument/jms/package-info.java
diff --git a/...r/jakarta10/NoJavaxArchitectureTests.java → ...r/jakarta10/NoJavaxArchitectureTests.java b/...r/jakarta10/NoJavaxArchitectureTests.java → ...r/jakarta10/NoJavaxArchitectureTests.java
diff --git a/...JmsProcessObservationConventionTests.java → ...JmsProcessObservationConventionTests.java b/...JmsProcessObservationConventionTests.java → ...JmsProcessObservationConventionTests.java
diff --git a/...JmsPublishObservationConventionTests.java → ...JmsPublishObservationConventionTests.java b/...JmsPublishObservationConventionTests.java → ...JmsPublishObservationConventionTests.java
diff --git 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
@@ -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'