JAMES-1950 Move metrics-dropwizard as toplevel projects

apache · Mar 3, 2017 · c06aeac · c06aeac
1 parent 4e70111
commit c06aeac
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 13 deletions.
diff --git a/...tainer/metrics/metrics-dropwizard/pom.xml → metrics/metrics-dropwizard/pom.xml b/...tainer/metrics/metrics-dropwizard/pom.xml → metrics/metrics-dropwizard/pom.xml
@@ -21,16 +21,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>james-server</artifactId>
+        <artifactId>metrics</artifactId>
         <groupId>org.apache.james</groupId>
         <version>3.0.0-beta6-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>james-server-metrics-dropwizard</artifactId>
+    <artifactId>metrics-dropwizard</artifactId>
 
-    <name>Apache James :: Server :: Metrics :: Dropwizard</name>
+    <name>Apache James :: Metrics :: Dropwizard</name>
 
     <dependencies>
         <dependency>

diff --git a/.../metrics/dropwizard/DropWizardMetric.java → .../metrics/dropwizard/DropWizardMetric.java b/.../metrics/dropwizard/DropWizardMetric.java → .../metrics/dropwizard/DropWizardMetric.java
diff --git a/...s/dropwizard/DropWizardMetricFactory.java → ...s/dropwizard/DropWizardMetricFactory.java b/...s/dropwizard/DropWizardMetricFactory.java → ...s/dropwizard/DropWizardMetricFactory.java
diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -34,7 +34,58 @@
 
     <modules>
         <module>metrics-api</module>
+        <module>metrics-dropwizard</module>
     </modules>
 
+    <properties>
+        <assertj-3.version>3.3.0</assertj-3.version>
+        <es.version>2.2.1</es.version>
+        <es-reporter.version>2.2.0</es-reporter.version>
+        <guava.version>18.0</guava.version>
+        <javax.inject.version>1</javax.inject.version>
+        <junit.version>4.11</junit.version>
+        <metrics.version>3.1.0</metrics.version>
+        <testcontainers-version>1.1.7</testcontainers-version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>james-server-filesystem-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>james-server-lifecycle-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>metrics-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>metrics-dropwizard</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-core</artifactId>
+                <version>${metrics.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.inject</groupId>
+                <artifactId>javax.inject</artifactId>
+                  <version>${javax.inject.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
 
diff --git a/server/app/pom.xml b/server/app/pom.xml
@@ -257,7 +257,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-dropwizard</artifactId>
+            <artifactId>metrics-dropwizard</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>

diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
@@ -197,7 +197,7 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-metrics-dropwizard</artifactId>
+                    <artifactId>metrics-dropwizard</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>${project.groupId}</groupId>

diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -132,7 +132,7 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-metrics-dropwizard</artifactId>
+                    <artifactId>metrics-dropwizard</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

diff --git a/server/pom.xml b/server/pom.xml
@@ -63,7 +63,6 @@
         <module>container/jetty</module>
         <module>container/lifecycle-api</module>
         <module>container/mailbox-adapter</module>
-        <module>container/metrics/metrics-dropwizard</module>
         <module>container/metrics/metrics-es-reporter</module>
         <module>container/spring</module>
         <module>container/util</module>
@@ -456,6 +455,11 @@
                 <artifactId>metrics-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>metrics-dropwizard</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.james.protocols</groupId>
@@ -641,11 +645,6 @@
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
-            <dependency>
-                <groupId>org.apache.james</groupId>
-                <artifactId>james-server-metrics-dropwizard</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>james-server-jmap</artifactId>