diff --git a/server/container/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml
similarity index 84%
rename from server/container/metrics/metrics-api/pom.xml
rename to metrics/metrics-api/pom.xml
index 800e8a60343..7bfc08dd74e 100644
--- a/server/container/metrics/metrics-api/pom.xml
+++ b/metrics/metrics-api/pom.xml
@@ -21,15 +21,14 @@
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">
- james-server
+ metrics
org.apache.james
3.0.0-beta6-SNAPSHOT
- ../../../pom.xml
4.0.0
- james-server-metrics-api
+ metrics-api
- Apache James :: Server :: Metrics :: API
+ Apache James :: Metrics :: API
-
\ No newline at end of file
+
diff --git a/server/container/metrics/metrics-api/src/main/java/org/apache/james/metrics/api/Metric.java b/metrics/metrics-api/src/main/java/org/apache/james/metrics/api/Metric.java
similarity index 100%
rename from server/container/metrics/metrics-api/src/main/java/org/apache/james/metrics/api/Metric.java
rename to metrics/metrics-api/src/main/java/org/apache/james/metrics/api/Metric.java
diff --git a/server/container/metrics/metrics-api/src/main/java/org/apache/james/metrics/api/MetricFactory.java b/metrics/metrics-api/src/main/java/org/apache/james/metrics/api/MetricFactory.java
similarity index 100%
rename from server/container/metrics/metrics-api/src/main/java/org/apache/james/metrics/api/MetricFactory.java
rename to metrics/metrics-api/src/main/java/org/apache/james/metrics/api/MetricFactory.java
diff --git a/metrics/pom.xml b/metrics/pom.xml
new file mode 100644
index 00000000000..2653b90b441
--- /dev/null
+++ b/metrics/pom.xml
@@ -0,0 +1,40 @@
+
+
+
+ 4.0.0
+
+
+ james-project
+ org.apache.james
+ 3.0.0-beta6-SNAPSHOT
+
+
+ metrics
+ pom
+
+ Apache James :: Metrics
+ Apache James Metrics
+
+
+ metrics-api
+
+
+
+
diff --git a/pom.xml b/pom.xml
index affa9f0d544..dd047363321 100644
--- a/pom.xml
+++ b/pom.xml
@@ -564,6 +564,7 @@
backends-common
mailbox
mailet
+ metrics
mpt
protocols
server
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 4be0e1555c3..306f51bca7e 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -253,7 +253,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
org.apache.james
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index 9fb7eb8efca..f3f46cb2fbd 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -193,7 +193,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
org.apache.james
diff --git a/server/container/metrics/metrics-dropwizard/pom.xml b/server/container/metrics/metrics-dropwizard/pom.xml
index 3d40daf3852..33a2fe3ee55 100644
--- a/server/container/metrics/metrics-dropwizard/pom.xml
+++ b/server/container/metrics/metrics-dropwizard/pom.xml
@@ -43,7 +43,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
com.google.guava
@@ -59,4 +59,4 @@
-
\ No newline at end of file
+
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 5484b53d2c1..958ad2aea49 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -72,7 +72,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
org.apache.james.protocols
diff --git a/server/pom.xml b/server/pom.xml
index 7080631ae5d..dd58ac75d96 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -63,7 +63,6 @@
container/jetty
container/lifecycle-api
container/mailbox-adapter
- container/metrics/metrics-api
container/metrics/metrics-dropwizard
container/metrics/metrics-es-reporter
container/spring
@@ -452,6 +451,12 @@
+
+ org.apache.james
+ metrics-api
+ ${project.version}
+
+
org.apache.james.protocols
protocols-api
@@ -636,11 +641,6 @@
${project.version}
test-jar
-
- org.apache.james
- james-server-metrics-api
- ${project.version}
-
org.apache.james
james-server-metrics-dropwizard
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index 92f2cb66a70..6245e8cbf86 100644
--- a/server/protocols/protocols-imap4/pom.xml
+++ b/server/protocols/protocols-imap4/pom.xml
@@ -43,7 +43,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
org.apache.james.protocols
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index a466eea2d80..9e68e1e122a 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -67,7 +67,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
org.apache.james
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index c7e651ae304..86407f0df8b 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -47,7 +47,7 @@
org.apache.james
- james-server-metrics-api
+ metrics-api
org.apache.james