Remove work-around for ARQ-2023 as it's fixed

astefanutti · Dec 21, 2016 · fb70acc · fb70acc
1 parent 93b0f83
commit fb70acc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/envs/ee/pom.xml b/envs/ee/pom.xml
@@ -64,14 +64,6 @@
 
                 <!-- test dependencies -->
 
-                <!-- FIXME: should be removed when Weld EE Arquillian doesn't scan all classes -->
-                <dependency>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-core-xml</artifactId>
-                    <version>${camel.version}</version>
-                    <scope>test</scope>
-                </dependency>
-
                 <dependency>
                     <groupId>org.jboss.weld</groupId>
                     <artifactId>weld-core-impl</artifactId>

diff --git a/samples/metrics/src/main/java/org/apache/camel/cdi/sample/metrics/Application.java b/samples/metrics/src/main/java/org/apache/camel/cdi/sample/metrics/Application.java
@@ -30,6 +30,7 @@
 import org.apache.camel.component.metrics.MetricsConstants;
 import org.apache.camel.management.event.CamelContextStartedEvent;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
@@ -96,8 +97,7 @@ Gauge<Double> successRatio(Meter generated, Meter success) {
     }
 
     @Produces
-    @Singleton
-    // TODO: change to @ApplicationScoped when ARQ-2023
+    @ApplicationScoped
     Slf4jReporter reporter(MetricRegistry registry) {
         return Slf4jReporter.forRegistry(registry)
             .convertRatesTo(TimeUnit.SECONDS)