Skip to content

Commit

Permalink
[ALS-3978] Update version handling in multiple pom.xml files (#167)
Browse files Browse the repository at this point in the history 
* [ALS-3978] Update version handling in multiple pom.xml files

This commit removes hardcoded versions of dependencies from individual pom.xml files and introduces them into the root pom.xml's properties section. This centralizes the control of dependency versions to prevent inconsistencies and makes future updates more straightforward. This change covers several libraries including Guava, JUnit Jupiter, Mockito, and others.

* Update library versions and clean up pom.xml

Upgraded dependencies including Jackson, Guava, JUnit, Hibernate, HttpClient, and Commons-IO. Also, improved the management of versions via property variables and cleaned up inconsistent formatting. Removed an unnecessary comment related to Mockito version compatibility.

* Remove specific version references in pom.xml files

The changes encompass the removal of explicit version references in the project's pom.xml files. By relying on property variables, this maintenance update enhances dependency management flexibility. Specific version comments also have been removed to eliminate clutter and improve overall file readability.

* Update pom.xml to use property variables for versions

The changes primarily involve updating the pom.xml file to use property variables instead of hardcoding the version numbers. This is a better approach as it improves the flexibility in managing dependencies. This change also results in cleaner and more readable code by removing unnecessary explicit version references.

* Downgrade Spring version in pom.xml

The Spring version has been downgraded in the pom.xml file from 6.1.1 to 5.3.31. This is due to java version requirement of 17+ for 6.x
  • Loading branch information
@Gcolon021
Gcolon021 authored Dec 19, 2023
1 parent 6adfc96 commit 31c7f9c
Show file tree
Hide file tree
Showing 11 changed files with 120 additions and 65 deletions.
1 change: 0 additions & 1 deletion pic-sure-api-data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.8</version>
</dependency>
</dependencies>
</project>
2 changes: 0 additions & 2 deletions pic-sure-api-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.27.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -69,7 +68,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
7 changes: 0 additions & 7 deletions pic-sure-initializer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>pic-sure-initializer</artifactId>

<name>pic-sure-initializer</name>

<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
Expand All @@ -26,19 +22,16 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.4</version>
</dependency>
</dependencies>

Expand Down
4 changes: 0 additions & 4 deletions pic-sure-resources/pic-sure-aggregate-data-sharing-resource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -53,12 +52,10 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>3.0.8.Final</version>
</dependency>
<dependency>
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
Expand All @@ -68,7 +65,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
Expand Down
4 changes: 0 additions & 4 deletions pic-sure-resources/pic-sure-ga4gh-dos/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -40,12 +39,10 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>3.0.8.Final</version>
</dependency>
<dependency>
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
Expand All @@ -55,7 +52,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
Expand Down
8 changes: 0 additions & 8 deletions pic-sure-resources/pic-sure-passthrough-resource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<wildfly.version>13.0.0.Final</wildfly.version>
<jboss.home>${project.build.directory}/wildfly-${wildfly.version}</jboss.home>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<guava.version>25.1-jre</guava.version>
<junit-jupiter.version>5.6.2</junit-jupiter.version>
<mockito-core.version>3.5.10</mockito-core.version>
<mockito-junit-jupiter.version>3.5.10</mockito-junit-jupiter.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -54,24 +50,20 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito-junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions pic-sure-resources/pic-sure-resource-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,16 @@
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.8</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
<artifactId>pic-sure-api-data</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>

</dependencies>
Expand Down
17 changes: 1 addition & 16 deletions pic-sure-resources/pic-sure-visualization-resource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,60 +19,49 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.13.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.13.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>4.6.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
</dependency>
<dependency>
<groupId>org.knowm.xchart</groupId>
<artifactId>xchart</artifactId>
<version>3.8.1</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -85,28 +74,24 @@
<dependency>
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
<artifactId>pic-sure-resource-api</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>3.0.8.Final</version>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.39.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>3.4.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion pic-sure-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.32</version>
</dependency>
</dependencies>
<build>
Expand Down
7 changes: 0 additions & 7 deletions pic-sure-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
<version>2.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>pic-sure-util</artifactId>

<dependencies>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand All @@ -31,14 +28,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.32</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand All @@ -52,5 +46,4 @@
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit 31c7f9c

Please sign in to comment.