Skip to content
This repository was archived by the owner on Oct 5, 2021. It is now read-only.

Commit 77e2a51

Browse files
Alexander PatrikalakisAlexander Patrikalakis
authored andcommitted
Fix dependency convergence in preparation for JG 0.2.1
1 parent 0901008 commit 77e2a51

File tree

1 file changed

+109
-5
lines changed

1 file changed

+109
-5
lines changed

pom.xml

Lines changed: 109 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dynamodb-local.port>4567</dynamodb-local.port>
1919
<dynamodb-local.endpoint>http://localhost:${dynamodb-local.port}</dynamodb-local.endpoint>
2020
<jdk.version>1.8</jdk.version>
21-
<aws.java.sdk.version>1.11.281</aws.java.sdk.version>
21+
<aws.java.sdk.version>1.11.336</aws.java.sdk.version>
2222
<jackson.version>2.6.6</jackson.version>
2323
<janusgraph.version>0.2.0</janusgraph.version>
2424
<tinkerpop.version>3.2.6</tinkerpop.version>
@@ -30,20 +30,24 @@
3030
<maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
3131
<exec.maven.plugin.version>1.6.0</exec.maven.plugin.version>
3232
<download.maven.plugin.version>1.2.1</download.maven.plugin.version>
33-
<slf4j.version>1.7.25</slf4j.version>
33+
<slf4j.version>1.7.12</slf4j.version>
3434
<opencsv.version>3.8</opencsv.version>
3535
<metrics3.version>3.0.1</metrics3.version>
3636
<commons.logging.version>1.1.1</commons.logging.version>
3737
<hadoop.version>2.2.0</hadoop.version>
38-
<mockito.version>1.9.5</mockito.version>
38+
<mockito.version>1.8.5</mockito.version>
3939
<lombok.version>1.16.18</lombok.version>
4040
<docker.maven.version>0.4.13</docker.maven.version>
41+
<commonsio.version>2.3</commonsio.version>
42+
<guava.version>18.0</guava.version>
4143
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
44+
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
4245
<include.category></include.category>
4346
<exclude.category></exclude.category>
4447
<test.excluded.groups>org.janusgraph.testcategory.MemoryTests,org.janusgraph.testcategory.PerformanceTests,org.janusgraph.testcategory.BrittleTests,org.janusgraph.testcategory.OrderedKeyStoreTests,org.janusgraph.testcategory.SerialTests</test.excluded.groups>
4548
<download.skip.cache>false</download.skip.cache>
4649
<download.force.overwrite>false</download.force.overwrite>
50+
<junit.version>4.12</junit.version>
4751
</properties>
4852
<developers>
4953
<developer>
@@ -122,6 +126,12 @@
122126
<groupId>com.opencsv</groupId>
123127
<artifactId>opencsv</artifactId>
124128
<version>${opencsv.version}</version>
129+
<exclusions>
130+
<exclusion>
131+
<groupId>org.apache.commons</groupId>
132+
<artifactId>commons-lang3</artifactId>
133+
</exclusion>
134+
</exclusions>
125135
</dependency>
126136
<dependency>
127137
<groupId>org.slf4j</groupId>
@@ -138,7 +148,7 @@
138148
<dependency>
139149
<groupId>junit</groupId>
140150
<artifactId>junit</artifactId>
141-
<version>4.11</version>
151+
<version>${junit.version}</version>
142152
<scope>test</scope>
143153
</dependency>
144154
<!-- for Gremlin console -->
@@ -183,7 +193,7 @@
183193
<dependency>
184194
<groupId>com.google.guava</groupId>
185195
<artifactId>guava</artifactId>
186-
<version>18.0</version>
196+
<version>${guava.version}</version>
187197
</dependency>
188198
<dependency>
189199
<groupId>org.mockito</groupId>
@@ -196,6 +206,16 @@
196206
<artifactId>mockito-core</artifactId>
197207
<version>${mockito.version}</version>
198208
<scope>test</scope>
209+
<exclusions>
210+
<exclusion>
211+
<groupId>org.hamcrest</groupId>
212+
<artifactId>hamcrest-core</artifactId>
213+
</exclusion>
214+
<exclusion>
215+
<groupId>org.objenesis</groupId>
216+
<artifactId>objenesis</artifactId>
217+
</exclusion>
218+
</exclusions>
199219
</dependency>
200220
<dependency>
201221
<groupId>org.projectlombok</groupId>
@@ -206,6 +226,12 @@
206226
<groupId>com.google.code.findbugs</groupId>
207227
<artifactId>findbugs</artifactId>
208228
<version>3.0.1</version>
229+
<exclusions>
230+
<exclusion>
231+
<groupId>com.google.code.findbugs</groupId>
232+
<artifactId>jsr305</artifactId>
233+
</exclusion>
234+
</exclusions>
209235
</dependency>
210236
</dependencies>
211237
<dependencyManagement>
@@ -225,6 +251,66 @@
225251
<artifactId>jackson-dataformat-cbor</artifactId>
226252
<version>${jackson.version}</version>
227253
</dependency>
254+
<dependency>
255+
<groupId>junit</groupId>
256+
<artifactId>junit</artifactId>
257+
<version>${junit.version}</version>
258+
</dependency>
259+
<dependency>
260+
<groupId>commons-io</groupId>
261+
<artifactId>commons-io</artifactId>
262+
<version>${commonsio.version}</version>
263+
</dependency>
264+
<dependency>
265+
<groupId>commons-collections</groupId>
266+
<artifactId>commons-collections</artifactId>
267+
<version>3.2.2</version>
268+
</dependency>
269+
<dependency>
270+
<groupId>commons-codec</groupId>
271+
<artifactId>commons-codec</artifactId>
272+
<version>1.7</version>
273+
</dependency>
274+
<dependency>
275+
<groupId>commons-logging</groupId>
276+
<artifactId>commons-logging</artifactId>
277+
<version>1.1.3</version>
278+
</dependency>
279+
<dependency>
280+
<groupId>com.codahale.metrics</groupId>
281+
<artifactId>metrics-core</artifactId>
282+
<version>${metrics3.version}</version>
283+
</dependency>
284+
<dependency>
285+
<groupId>com.codahale.metrics</groupId>
286+
<artifactId>metrics-graphite</artifactId>
287+
<version>${metrics3.version}</version>
288+
</dependency>
289+
<dependency>
290+
<groupId>com.codahale.metrics</groupId>
291+
<artifactId>metrics-ganglia</artifactId>
292+
<version>${metrics3.version}</version>
293+
</dependency>
294+
<dependency>
295+
<groupId>org.slf4j</groupId>
296+
<artifactId>slf4j-api</artifactId>
297+
<version>${slf4j.version}</version>
298+
</dependency>
299+
<dependency>
300+
<groupId>com.google.guava</groupId>
301+
<artifactId>guava</artifactId>
302+
<version>${guava.version}</version>
303+
</dependency>
304+
<dependency>
305+
<groupId>com.carrotsearch</groupId>
306+
<artifactId>junit-benchmarks</artifactId>
307+
<version>0.7.0</version>
308+
</dependency>
309+
<dependency>
310+
<groupId>org.mockito</groupId>
311+
<artifactId>mockito-core</artifactId>
312+
<version>${mockito.version}</version>
313+
</dependency>
228314
</dependencies>
229315
</dependencyManagement>
230316
<build>
@@ -335,6 +421,24 @@
335421
<artifactId>maven-resources-plugin</artifactId>
336422
<version>${maven.resources.plugin.version}</version>
337423
</plugin>
424+
<plugin>
425+
<groupId>org.apache.maven.plugins</groupId>
426+
<artifactId>maven-enforcer-plugin</artifactId>
427+
<version>${maven-enforcer-plugin.version}</version>
428+
<executions>
429+
<execution>
430+
<id>enforce</id>
431+
<configuration>
432+
<rules>
433+
<dependencyConvergence/>
434+
</rules>
435+
</configuration>
436+
<goals>
437+
<goal>enforce</goal>
438+
</goals>
439+
</execution>
440+
</executions>
441+
</plugin>
338442
</plugins>
339443
</build>
340444
<profiles>

0 commit comments

Comments
 (0)