little fix

PlaytikaOSS · Nov 3, 2023 · d761974 · d761974
1 parent 23487df
commit d761974
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 31 deletions.
diff --git a/aerospike-benchmark/pom.xml b/aerospike-benchmark/pom.xml
@@ -11,21 +11,15 @@
 
     <artifactId>aerospike-benchmark</artifactId>
 
-    <properties>
-        <jmh.version>1.25</jmh.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
         </dependency>
 
         <dependency>

diff --git a/aerospike-container/pom.xml b/aerospike-container/pom.xml
@@ -26,7 +26,5 @@
             <artifactId>junit</artifactId>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
-
 </project>
diff --git a/aerospike-storage-backend/pom.xml b/aerospike-storage-backend/pom.xml
@@ -27,40 +27,28 @@
     <packaging>jar</packaging>
     <name>Aerospike storage backend for Janusgraph graph DB/Decoder</name>
 
-    <properties>
-        <!-- TODO remove after upgrade to 0.6.x janusgraph version  -->
-        <metrics.version>4.1.18</metrics.version>
-    </properties>
-
     <dependencies>
-
-        <!-- TODO remove after upgrade to 0.6.x janusgraph version  -->
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jvm</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-graphite</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-jmx</artifactId>
-            <version>${metrics.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
             <scope>provided</scope>
-            <!-- TODO remove after upgrade to 0.6.x janusgraph version  -->
             <exclusions>
                 <exclusion>
                     <groupId>io.dropwizard.metrics</groupId>
@@ -156,12 +144,6 @@
             <scope>test</scope>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.testcontainers</groupId>-->
-<!--            <artifactId>junit-jupiter</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -51,14 +51,14 @@
         <janusgraph.version>0.5.3</janusgraph.version>
 
         <aerospike-batch-updater.version>0.0.20</aerospike-batch-updater.version>
-
+        <metrics.version>4.1.18</metrics.version>
         <netty-all.version>4.1.60.Final</netty-all.version>
 
         <!--Test-->
         <tinkerpop.version>3.4.6</tinkerpop.version>
         <junit.version>4.13</junit.version>
         <assertj.version>3.19.0</assertj.version>
-        <testcontainers.version>1.15.2</testcontainers.version>
+        <testcontainers.version>1.19.1</testcontainers.version>
         <blockhound.version>1.0.4.RELEASE</blockhound.version>
         <disruptor.version>3.4.2</disruptor.version>
         <embedded-aerospike.version>1.19</embedded-aerospike.version>
@@ -67,7 +67,7 @@
         <assertj.version>3.9.0</assertj.version>
         <slf4j-api.version>1.7.30</slf4j-api.version>
         <log4j.version>2.14.1</log4j.version>
-
+        <jmh.version>1.25</jmh.version>
 
         <!--plugins -->
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
@@ -91,6 +91,37 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.openjdk.jmh</groupId>
+                <artifactId>jmh-core</artifactId>
+                <version>${jmh.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openjdk.jmh</groupId>
+                <artifactId>jmh-generator-annprocess</artifactId>
+                <version>${jmh.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-core</artifactId>
+                <version>${metrics.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-jvm</artifactId>
+                <version>${metrics.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-graphite</artifactId>
+                <version>${metrics.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-jmx</artifactId>
+                <version>${metrics.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.janusgraph</groupId>
@@ -215,8 +246,6 @@
                 <version>${disruptor.version}</version>
                 <scope>test</scope>
             </dependency>
-
-
         </dependencies>
     </dependencyManagement>