Skip to content

Commit

Permalink
[ALS-5061] Update version handling in multiple pom.xml files
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Gcolon021 committed Dec 8, 2023
1 parent 1def369 commit e431897
Show file tree
Hide file tree
Showing 11 changed files with 109 additions and 56 deletions.
1 change: 0 additions & 1 deletion pic-sure-api-data/pom.xml
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
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
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
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
5 changes: 1 addition & 4 deletions pic-sure-resources/pic-sure-ga4gh-dos/pom.xml
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,11 @@
<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>
<!-- <version>3.0.8.Final</version>-->
</dependency>
<dependency>
<groupId>edu.harvard.hms.dbmi.avillach</groupId>
Expand All @@ -55,7 +53,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
9 changes: 1 addition & 8 deletions pic-sure-resources/pic-sure-passthrough-resource/pom.xml
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,21 @@
<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>
<!-- <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
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
16 changes: 1 addition & 15 deletions pic-sure-resources/pic-sure-visualization-resource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,49 +19,40 @@
<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>
Expand All @@ -72,7 +63,6 @@
<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 +75,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
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
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 e431897

Please sign in to comment.