Merge branch 'main' into remove-more-deprecated-props

Author: laurit

.fossa.yml

@@ -630,10 +630,10 @@ targets:
       target: ':instrumentation:jms:jms-common:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jsf:jsf-common-javax:javaagent'
+      target: ':instrumentation:jsf:jsf-common-jakarta:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jsf:jsf-jakarta-common:javaagent'
+      target: ':instrumentation:jsf:jsf-common-javax:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jsf:jsf-mojarra-1.2:javaagent'
@@ -904,12 +904,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:rocketmq:rocketmq-client-5.0:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:rxjava:rxjava-1.0:library'