Make sure TCKs are CDI-version agnostic

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedSimplyTimedMethodBean.java

@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class InheritedSimplyTimedMethodBean extends VisibilitySimplyTimedMethodBean {
 
     @SimplyTimed

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/InheritedTimedMethodBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class InheritedTimedMethodBean extends VisibilityTimedMethodBean {
 
     @Timed

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilitySimplyTimedMethodBean.java

@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class VisibilitySimplyTimedMethodBean {
 
     @SimplyTimed

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/inheritance/VisibilityTimedMethodBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class VisibilityTimedMethodBean {
 
     @Timed

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteExtendedTimedBean.java

@@ -15,6 +15,9 @@
  */
 package org.eclipse.microprofile.metrics.tck.metrics;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class ConcreteExtendedTimedBean extends AbstractTimedBean {
 
     public void anotherTimedMethod() {

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcreteTimedBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @Timed
 public class ConcreteTimedBean extends AbstractGenericBean {
 

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedClassBean.java

@@ -40,6 +40,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @ConcurrentGauge(name = "cGaugedClass")
 public class ConcurrentGaugedClassBean {
 

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedConstructorBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class ConcurrentGaugedConstructorBean {
 
     @ConcurrentGauge(name = "cGaugedConstructor")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/ConcurrentGaugedMethodBean.java

@@ -19,6 +19,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.ConcurrentGauge;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class ConcurrentGaugedMethodBean<T> {
 
     @ConcurrentGauge(name = "cGaugedMethod", absolute = true)

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedClassBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @Counted(name = "countedClass")
 public class CountedClassBean {
 

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodBean.java

@@ -19,6 +19,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class CountedMethodBean<T> {
 
     @Counted(name = "countedMethod", absolute = true)

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CountedMethodTagBean.java

@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Counted;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class CountedMethodTagBean {
 
     @Counted(name = "countedMethod", absolute = true, tags = {"number=one"})

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/CounterFieldBean.java

@@ -18,8 +18,10 @@
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class CounterFieldBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/DefaultNameMetricMethodBean.java

@@ -19,6 +19,9 @@
 import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class DefaultNameMetricMethodBean {
 
     @Counted

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/HistogramFieldBean.java

@@ -18,8 +18,10 @@
 import org.eclipse.microprofile.metrics.Histogram;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class HistogramFieldBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredClassBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 @Metered(name = "meteredClass")
 public class MeteredClassBean {
 

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredConstructorBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredConstructorBean {
 
     @Metered(name = "meteredConstructor", absolute = true)

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean1.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredMethodBean1 {
 
     @Metered(name = "meteredMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MeteredMethodBean2.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredMethodBean2 {
 
     @Metered(name = "meteredMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/MultipleMetricsConstructorBean.java

@@ -19,6 +19,9 @@
 import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MultipleMetricsConstructorBean {
 
     @Counted(name = "counter")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/OverloadedTimedMethodBean.java

@@ -19,6 +19,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class OverloadedTimedMethodBean {
 
     @Timed(name = "overloadedTimedMethodWithNoArguments")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimpleTimerFieldBean.java

@@ -26,8 +26,10 @@
 import org.eclipse.microprofile.metrics.SimpleTimer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class SimpleTimerFieldBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedConstructorBean.java

@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedConstructorBean {
 
     @SimplyTimed(name = "simplyTimedConstructor")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean1.java

@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedMethodBean1 {
 
     @SimplyTimed(name = "simplyTimedMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean2.java

@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedMethodBean2 {
 
     @SimplyTimed(name = "simplyTimedMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/SimplyTimedMethodBean3.java

@@ -25,6 +25,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedMethodBean3 {
 
     @SimplyTimed(name = "simplyTimedMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedConstructorBean.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedConstructorBean {
 
     @Timed(name = "timedConstructor")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean1.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedMethodBean1 {
 
     @Timed(name = "timedMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean2.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedMethodBean2 {
 
     @Timed(name = "timedMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimedMethodBean3.java

@@ -17,6 +17,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedMethodBean3 {
 
     @Timed(name = "timedMethod")

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/metrics/TimerFieldBean.java

@@ -18,8 +18,10 @@
 import org.eclipse.microprofile.metrics.Timer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class TimerFieldBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/CounterFieldTagBean.java

@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.Counter;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class CounterFieldTagBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/HistogramTagFieldBean.java

@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.Histogram;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class HistogramTagFieldBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/MeteredTagMethodBean.java

@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Metered;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class MeteredTagMethodBean {
 
     @Metered(name = "meteredMethod", tags = {"number=one"})

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimpleTimerTagFieldBean.java

@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.SimpleTimer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class SimpleTimerTagFieldBean {
 
     @Inject

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/SimplyTimedTagMethodBean.java

@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.SimplyTimed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class SimplyTimedTagMethodBean {
 
     @SimplyTimed(name = "simplyTimedMethod", tags = {"number=one"})

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimedTagMethodBean.java

@@ -23,6 +23,9 @@
 
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class TimedTagMethodBean {
 
     @Timed(name = "timedMethod", tags = {"number=one"})

tck/api/src/main/java/org/eclipse/microprofile/metrics/tck/tags/TimerTagFieldBean.java

@@ -24,8 +24,10 @@
 import org.eclipse.microprofile.metrics.Timer;
 import org.eclipse.microprofile.metrics.annotation.Metric;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 
+@Dependent
 public class TimerTagFieldBean {
 
     @Inject

tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/multipleinstances/DependentScopedBean.java

@@ -26,6 +26,9 @@
 import org.eclipse.microprofile.metrics.annotation.Metered;
 import org.eclipse.microprofile.metrics.annotation.Timed;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class DependentScopedBean {
 
     @Counted(name = "counter", absolute = true)