Added missing Servlet ee dependency

kumuluz · Dec 19, 2017 · 696704d · 696704d
1 parent ca17930
commit 696704d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,6 +18,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+            <version>${microprofile-metrics.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
@@ -33,11 +39,6 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.microprofile.metrics</groupId>
-            <artifactId>microprofile-metrics-api</artifactId>
-            <version>${microprofile-metrics.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/core/src/main/java/com/kumuluz/ee/metrics/MetricsExtension.java b/core/src/main/java/com/kumuluz/ee/metrics/MetricsExtension.java
@@ -38,6 +38,7 @@
  * @since 1.0.0
  */
 @EeExtensionDef(name = "MetricsCommons", group = EeExtensionGroup.METRICS)
+@EeComponentDependency(EeComponentType.SERVLET)
 @EeComponentDependency(EeComponentType.CDI)
 public class MetricsExtension implements Extension {
 

diff --git a/logs/pom.xml b/logs/pom.xml
@@ -17,6 +17,7 @@
             <artifactId>kumuluzee-metrics-core</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.kumuluz.ee</groupId>
             <artifactId>kumuluzee-cdi-weld</artifactId>

diff --git a/logstash/pom.xml b/logstash/pom.xml
@@ -17,6 +17,7 @@
             <artifactId>kumuluzee-metrics-core</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.kumuluz.ee</groupId>
             <artifactId>kumuluzee-cdi-weld</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -30,9 +30,9 @@
 
         <kumuluzee.version>2.4.1</kumuluzee.version>
 
+        <microprofile-metrics.version>1.0</microprofile-metrics.version>
         <dropwizard-metrics.version>3.2.4</dropwizard-metrics.version>
         <jackson.version>2.8.10</jackson.version>
-        <microprofile-metrics.version>1.0</microprofile-metrics.version>
 
         <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
         <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
@@ -91,7 +91,7 @@
             <dependency>
                 <groupId>com.kumuluz.ee.metrics</groupId>
                 <artifactId>kumuluzee-metrics-core</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>