Skip to content

Commit 949bd5c

Browse files
juanfeSanahujajuanfeSanahuja
authored
Merge pull request #80 from opencb/TASK-2095
TASK-2095 - Duplicated libraries at opencga/build/libs
2 parents cfee012 + 6b51267 commit 949bd5c

File tree

6 files changed

+168
-39
lines changed

6 files changed

+168
-39
lines changed

‎commons-datastore/commons-datastore-core/pom.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<packaging>jar</packaging>
1515

1616
<dependencies>
17+
<dependency>
18+
<groupId>com.fasterxml.jackson.core</groupId>
19+
<artifactId>jackson-core</artifactId>
20+
</dependency>
1721
<dependency>
1822
<groupId>com.fasterxml.jackson.core</groupId>
1923
<artifactId>jackson-databind</artifactId>
@@ -22,19 +26,23 @@
2226
<groupId>org.apache.commons</groupId>
2327
<artifactId>commons-lang3</artifactId>
2428
</dependency>
25-
<dependency>
26-
<groupId>org.slf4j</groupId>
27-
<artifactId>slf4j-api</artifactId>
28-
</dependency>
2929
<dependency>
3030
<groupId>junit</groupId>
3131
<artifactId>junit</artifactId>
3232
<scope>test</scope>
3333
</dependency>
34+
35+
<!--TODO Review -->
36+
<dependency>
37+
<groupId>org.slf4j</groupId>
38+
<artifactId>slf4j-api</artifactId>
39+
</dependency>
3440
<dependency>
3541
<groupId>org.slf4j</groupId>
3642
<artifactId>slf4j-simple</artifactId>
3743
<scope>test</scope>
3844
</dependency>
45+
3946
</dependencies>
40-
</project>
47+
48+
</project>

‎commons-datastore/commons-datastore-mongodb/pom.xml‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,50 @@
1919
<artifactId>commons-datastore-core</artifactId>
2020
</dependency>
2121

22+
<dependency>
23+
<groupId>org.mongodb</groupId>
24+
<artifactId>mongodb-driver-core</artifactId>
25+
</dependency>
2226
<dependency>
2327
<groupId>org.mongodb</groupId>
2428
<artifactId>mongodb-driver-sync</artifactId>
25-
<version>4.8.2</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.mongodb</groupId>
32+
<artifactId>bson</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.fasterxml.jackson.core</groupId>
36+
<artifactId>jackson-core</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.fasterxml.jackson.core</groupId>
40+
<artifactId>jackson-databind</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.apache.commons</groupId>
44+
<artifactId>commons-lang3</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.slf4j</groupId>
48+
<artifactId>slf4j-api</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.hamcrest</groupId>
52+
<artifactId>hamcrest-core</artifactId>
53+
<scope>test</scope>
2654
</dependency>
2755
<dependency>
2856
<groupId>junit</groupId>
2957
<artifactId>junit</artifactId>
3058
<scope>test</scope>
3159
</dependency>
60+
<!--TODO Review -->
3261
<dependency>
3362
<groupId>org.slf4j</groupId>
3463
<artifactId>slf4j-simple</artifactId>
3564
<scope>test</scope>
3665
</dependency>
3766
</dependencies>
3867

39-
</project>
68+
</project>

‎commons-datastore/commons-datastore-solr/pom.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,19 @@
3838
<dependency>
3939
<groupId>org.apache.solr</groupId>
4040
<artifactId>solr-solrj</artifactId>
41-
<version>8.8.2</version>
4241
</dependency>
4342
<dependency>
44-
<groupId>junit</groupId>
45-
<artifactId>junit</artifactId>
46-
<scope>test</scope>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-databind</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.apache.commons</groupId>
48+
<artifactId>commons-lang3</artifactId>
4749
</dependency>
4850
<dependency>
4951
<groupId>org.slf4j</groupId>
50-
<artifactId>slf4j-simple</artifactId>
51-
<scope>test</scope>
52+
<artifactId>slf4j-api</artifactId>
5253
</dependency>
5354
</dependencies>
55+
5456
</project>

‎commons-datastore/pom.xml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
<module>commons-datastore-mongodb</module>
1919
<module>commons-datastore-solr</module>
2020
</modules>
21-
22-
<dependencyManagement>
23-
<dependencies>
24-
<dependency>
25-
<groupId>org.opencb.commons</groupId>
26-
<artifactId>commons-datastore-core</artifactId>
27-
<version>${project.parent.version}</version>
28-
</dependency>
29-
</dependencies>
30-
</dependencyManagement>
21+
<dependencies>
22+
<!--TODO Review -->
23+
<dependency>
24+
<groupId>org.slf4j</groupId>
25+
<artifactId>slf4j-simple</artifactId>
26+
<scope>test</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>junit</groupId>
30+
<artifactId>junit</artifactId>
31+
<scope>test</scope>
32+
</dependency>
33+
</dependencies>
3134
</project>

‎commons-lib/pom.xml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,25 @@
1717
<dependency>
1818
<groupId>org.opencb.commons</groupId>
1919
<artifactId>commons-datastore-core</artifactId>
20-
<version>${project.parent.version}</version>
21-
<scope>compile</scope>
2220
</dependency>
21+
2322
<dependency>
2423
<groupId>com.beust</groupId>
2524
<artifactId>jcommander</artifactId>
26-
<version>1.69</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.fasterxml.jackson.core</groupId>
28+
<artifactId>jackson-core</artifactId>
29+
<scope>test</scope>
2730
</dependency>
2831
<dependency>
2932
<groupId>com.fasterxml.jackson.core</groupId>
3033
<artifactId>jackson-databind</artifactId>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.commons</groupId>
38+
<artifactId>commons-lang3</artifactId>
3139
</dependency>
3240
<dependency>
3341
<groupId>org.slf4j</groupId>
@@ -37,29 +45,29 @@
3745
<groupId>org.apache.avro</groupId>
3846
<artifactId>avro</artifactId>
3947
</dependency>
40-
<dependency>
41-
<groupId>org.apache.commons</groupId>
42-
<artifactId>commons-lang3</artifactId>
43-
</dependency>
4448
<dependency>
4549
<groupId>org.apache.ant</groupId>
4650
<artifactId>ant</artifactId>
47-
<version>1.10.12</version>
4851
</dependency>
4952
<dependency>
5053
<groupId>org.fusesource.jansi</groupId>
5154
<artifactId>jansi</artifactId>
52-
<version>2.4.0</version>
5355
</dependency>
5456
<dependency>
5557
<groupId>junit</groupId>
5658
<artifactId>junit</artifactId>
5759
<scope>provided</scope>
5860
</dependency>
61+
<!--TODO Review -->
5962
<dependency>
6063
<groupId>org.slf4j</groupId>
6164
<artifactId>slf4j-simple</artifactId>
6265
<scope>test</scope>
6366
</dependency>
67+
<dependency>
68+
<groupId>com.fasterxml.jackson.core</groupId>
69+
<artifactId>jackson-databind</artifactId>
70+
<scope>test</scope>
71+
</dependency>
6472
</dependencies>
6573
</project>

‎pom.xml‎

Lines changed: 86 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,21 @@
1818
<module>commons-datastore</module>
1919
</modules>
2020

21-
<!-- Properties for dependency versions -->
2221
<properties>
22+
<!-- All dependency versions must be defined here -->
2323
<jackson.version>2.11.4</jackson.version>
2424
<apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
2525
<slf4j.version>1.7.32</slf4j.version>
2626
<avro.version>1.7.7</avro.version>
27+
<mongodb.version>4.8.2</mongodb.version>
28+
<solr.version>8.8.2</solr.version>
29+
<jcommander.version>1.69</jcommander.version>
30+
<ant.version>1.10.12</ant.version>
31+
<jansi.version>2.4.0</jansi.version>
32+
<hamcrest.version>1.3</hamcrest.version>
33+
<junit.version>4.13.2</junit.version>
34+
<!-- Other properties -->
35+
2736
<sonar.organization>opencb</sonar.organization>
2837
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
2938
<maven.compiler.source>1.8</maven.compiler.source>
@@ -82,11 +91,6 @@
8291
<name>Joaquin</name>
8392
<email>[email protected]</email>
8493
</developer>
85-
<developer>
86-
<id>julie-sullivan</id>
87-
<name>Julie</name>
88-
<email>[email protected]</email>
89-
</developer>
9094
<developer>
9195
<id>juanfeSanahuja</id>
9296
<name>Juanfe</name>
@@ -104,6 +108,19 @@
104108

105109
<dependencyManagement>
106110
<dependencies>
111+
<!-- OpenCB dependencies -->
112+
<dependency>
113+
<groupId>org.opencb.commons</groupId>
114+
<artifactId>commons-datastore-core</artifactId>
115+
<version>${project.version}</version>
116+
</dependency>
117+
118+
<!-- External dependencies -->
119+
<dependency>
120+
<groupId>com.fasterxml.jackson.core</groupId>
121+
<artifactId>jackson-core</artifactId>
122+
<version>${jackson.version}</version>
123+
</dependency>
107124
<dependency>
108125
<groupId>com.fasterxml.jackson.core</groupId>
109126
<artifactId>jackson-databind</artifactId>
@@ -131,10 +148,53 @@
131148
<artifactId>avro</artifactId>
132149
<version>${avro.version}</version>
133150
</dependency>
151+
<dependency>
152+
<groupId>org.mongodb</groupId>
153+
<artifactId>mongodb-driver-core</artifactId>
154+
<version>${mongodb.version}</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.mongodb</groupId>
158+
<artifactId>mongodb-driver-sync</artifactId>
159+
<version>${mongodb.version}</version>
160+
</dependency>
161+
<dependency>
162+
<groupId>org.mongodb</groupId>
163+
<artifactId>bson</artifactId>
164+
<version>${mongodb.version}</version>
165+
</dependency>
166+
<dependency>
167+
<groupId>org.apache.solr</groupId>
168+
<artifactId>solr-solrj</artifactId>
169+
<version>${solr.version}</version>
170+
</dependency>
171+
<dependency>
172+
<groupId>com.beust</groupId>
173+
<artifactId>jcommander</artifactId>
174+
<version>${jcommander.version}</version>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.apache.ant</groupId>
178+
<artifactId>ant</artifactId>
179+
<version>${ant.version}</version>
180+
</dependency>
181+
<dependency>
182+
<groupId>org.fusesource.jansi</groupId>
183+
<artifactId>jansi</artifactId>
184+
<version>${jansi.version}</version>
185+
</dependency>
186+
187+
<!-- Test dependencies -->
188+
<dependency>
189+
<groupId>org.hamcrest</groupId>
190+
<artifactId>hamcrest-core</artifactId>
191+
<version>${hamcrest.version}</version>
192+
<scope>test</scope>
193+
</dependency>
134194
<dependency>
135195
<groupId>junit</groupId>
136196
<artifactId>junit</artifactId>
137-
<version>4.13.2</version>
197+
<version>${junit.version}</version>
138198
<scope>test</scope>
139199
</dependency>
140200
</dependencies>
@@ -222,6 +282,25 @@
222282
</execution>
223283
</executions>
224284
</plugin>
285+
<plugin>
286+
<groupId>org.apache.maven.plugins</groupId>
287+
<artifactId>maven-dependency-plugin</artifactId>
288+
<version>3.6.0</version>
289+
<executions>
290+
<execution>
291+
<id>analyze</id>
292+
<goals>
293+
<goal>analyze-only</goal>
294+
</goals>
295+
<configuration>
296+
<failOnWarning>true</failOnWarning>
297+
<ignoredUnusedDeclaredDependencies>
298+
<ignoredUnusedDeclaredDependency>*</ignoredUnusedDeclaredDependency>
299+
</ignoredUnusedDeclaredDependencies>
300+
</configuration>
301+
</execution>
302+
</executions>
303+
</plugin>
225304
</plugins>
226305
</build>
227306

0 commit comments

Comments
 (0)