Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASK-2095 - Duplicated libraries at opencga/build/libs #80

Merged
merged 16 commits into from
Nov 13, 2023
Merged

TASK-2095 - Duplicated libraries at opencga/build/libs #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8cd5379
Prepare new development branch release-4.8.x
juanfeSanahuja Apr 19, 2023
6c36dfd
Prepare release xb_version 1.7.0
juanfeSanahuja Apr 19, 2023
bf72042
Dependency analysis
juanfeSanahuja May 4, 2023
c0ada4d
pom: several cleanups
imedina May 4, 2023
c3ce097
pom: Dependency cleanups #TASK-2095
juanfeSanahuja May 4, 2023
bced532
pom: minor style changes
imedina May 5, 2023
077c4e7
Prepare merge with develop #TASK-2095
juanfeSanahuja Sep 25, 2023
d769fdf
Prepare merge with develop #TASK-2095
juanfeSanahuja Sep 25, 2023
57d58dc
Merge branch 'develop' into TASK-2095
juanfeSanahuja Sep 25, 2023
c81def2
Merge branch 'TASK-2095' of github.com:opencb/java-common-libs into T…
juanfeSanahuja Sep 25, 2023
8024040
Merge remote-tracking branch 'origin/TASK-2095' into TASK-2095
imedina Oct 4, 2023
08883b1
pom: update maven-dependency-plugin version
imedina Oct 5, 2023
7ca41da
pom: Added old dependencies to check TODO Review #TASK-2095
juanfeSanahuja Oct 18, 2023
82c262a
pom: Revert transitive dependecies added TASK-2095
juanfeSanahuja Oct 19, 2023
fb09caf
pom: Added develop dependencies to review #TASK-2095
juanfeSanahuja Oct 19, 2023
6b51267
Merge branch 'develop' into TASK-2095
juanfeSanahuja Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions commons-datastore/commons-datastore-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand All @@ -22,19 +26,23 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<!--TODO Review -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
j-coll marked this conversation as resolved.
Show resolved Hide resolved
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
</project>

</project>
33 changes: 31 additions & 2 deletions commons-datastore/commons-datastore-mongodb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,50 @@
<artifactId>commons-datastore-core</artifactId>
</dependency>

<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-core</artifactId>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.8.2</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!--TODO Review -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
</project>
14 changes: 8 additions & 6 deletions commons-datastore/commons-datastore-solr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,19 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>8.8.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>

</project>
23 changes: 13 additions & 10 deletions commons-datastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
<module>commons-datastore-mongodb</module>
<module>commons-datastore-solr</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opencb.commons</groupId>
<artifactId>commons-datastore-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!--TODO Review -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
26 changes: 17 additions & 9 deletions commons-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,25 @@
<dependency>
<groupId>org.opencb.commons</groupId>
<artifactId>commons-datastore-core</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.69</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -37,29 +45,29 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.12</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
<!--TODO Review -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
93 changes: 86 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,21 @@
<module>commons-datastore</module>
</modules>

<!-- Properties for dependency versions -->
<properties>
<!-- All dependency versions must be defined here -->
<jackson.version>2.11.4</jackson.version>
<apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
<slf4j.version>1.7.32</slf4j.version>
<avro.version>1.7.7</avro.version>
<mongodb.version>4.8.2</mongodb.version>
<solr.version>8.8.2</solr.version>
<jcommander.version>1.69</jcommander.version>
<ant.version>1.10.12</ant.version>
<jansi.version>2.4.0</jansi.version>
<hamcrest.version>1.3</hamcrest.version>
<junit.version>4.13.2</junit.version>
<!-- Other properties -->

<sonar.organization>opencb</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down Expand Up @@ -82,11 +91,6 @@
<name>Joaquin</name>
<email>[email protected]</email>
</developer>
<developer>
<id>julie-sullivan</id>
<name>Julie</name>
<email>[email protected]</email>
</developer>
<developer>
<id>juanfeSanahuja</id>
<name>Juanfe</name>
Expand All @@ -104,6 +108,19 @@

<dependencyManagement>
<dependencies>
<!-- OpenCB dependencies -->
<dependency>
<groupId>org.opencb.commons</groupId>
<artifactId>commons-datastore-core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- External dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand Down Expand Up @@ -131,10 +148,53 @@
<artifactId>avro</artifactId>
<version>${avro.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-core</artifactId>
<version>${mongodb.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>${mongodb.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>bson</artifactId>
<version>${mongodb.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>${jcommander.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>${jansi.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -222,6 +282,25 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>analyze</id>
<goals>
<goal>analyze-only</goal>
</goals>
<configuration>
<failOnWarning>true</failOnWarning>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>*</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down