Merge pull request #423 from salesforce/add-prometheus-to-kamon

Add prometheus to kamon

Author: yonatanlevy

timbermill-java/timbermill-api/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.1</timbermill.version>
+        <timbermill.version>2.5.2</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
     </properties>
 

timbermill-java/timbermill-client/pom.xml

@@ -15,8 +15,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.1</timbermill.version>
-        <aspectj.version>1.9.6</aspectj.version>
+        <timbermill.version>2.5.2</timbermill.version>
+        <aspectj.version>1.9.7</aspectj.version>
         <org.springframework.version>5.3.20</org.springframework.version>
     </properties>
 
@@ -95,6 +95,11 @@
             <version>3.1.6</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

timbermill-java/timbermill-local/pom.xml

@@ -14,8 +14,8 @@
 
     <properties>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.1</timbermill.version>
-        <kamon.bundle.version>2.0.4</kamon.bundle.version>
+        <timbermill.version>2.5.2</timbermill.version>
+        <kamon.bundle.version>2.5.12</kamon.bundle.version>
     </properties>
 
     <licenses>
@@ -102,6 +102,13 @@
             <artifactId>kamon-bundle_2.11</artifactId>
             <version>${kamon.bundle.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.kamon</groupId>
+            <artifactId>kamon-prometheus_2.11</artifactId>
+            <version>${kamon.bundle.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>io.kamon</groupId>
             <artifactId>kamon-datadog_2.11</artifactId>

timbermill-java/timbermill-server/pom.xml

@@ -17,7 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.1</timbermill.version>
+        <timbermill.version>2.5.2</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
     </properties>
 
@@ -94,7 +94,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>aspectj-maven-plugin</artifactId>
-                    <version>1.11</version>
+                    <version>1.14.0</version>
                     <configuration>
                         <source>${java.source-target.version}</source>
                         <target>${java.source-target.version}</target>