add javax dep in support data, rearrange module and move dep property…

… to parent pom
ebi-uniprot · Feb 12, 2024 · 8686f28 · 8686f28
1 parent 8c0def1
commit 8686f28
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 97 deletions.
diff --git a/common-rest/pom.xml b/common-rest/pom.xml
@@ -13,15 +13,10 @@
 
 	<properties>
 		<hamcrest-all.version>1.3</hamcrest-all.version>
-		<solrj.version>8.11.2</solrj.version>
 		<poi.version>4.1.0</poi.version>
 		<jaxb.version>2.3.1</jaxb.version>
-		<dropwizard.metrics.version>4.1.9</dropwizard.metrics.version>
-		<openapi-maven-plugin.version>0.3</openapi-maven-plugin.version>
 		<micrometer-registry-prometheus.version>1.6.6</micrometer-registry-prometheus.version>
 		<redisson-spring-data-version>3.17.7</redisson-spring-data-version>
-		<testcontainers.version>1.19.4</testcontainers.version>
-		<dev.jna.version>5.8.0</dev.jna.version>
 	</properties>
 
 	<dependencies>
@@ -267,7 +262,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>${dev.jna.version}</version>
+			<version>${jna.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/help-centre-rest/pom.xml b/help-centre-rest/pom.xml
@@ -12,10 +12,6 @@
 	<artifactId>help-centre-rest</artifactId>
 
 	<properties>
-		<slf4j.version>1.7.25</slf4j.version>
-		<logback.version>1.2.3</logback.version>
-
-		<jayway.version>2.4.0</jayway.version>
 		<javax.mail.version>1.6.2</javax.mail.version>
 	</properties>
 

diff --git a/idmapping-common/pom.xml b/idmapping-common/pom.xml
@@ -12,14 +12,7 @@
 	<artifactId>idmapping-common</artifactId>
 
 	<properties>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<testcontainers.version>1.17.6</testcontainers.version>
-		<awaitility.version>4.2.0</awaitility.version>
-		<jna.version>5.8.0</jna.version>
-		<jayway.version>2.4.0</jayway.version>
-		<redisson-version>3.17.4</redisson-version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/idmapping-rest/pom.xml b/idmapping-rest/pom.xml
@@ -10,15 +10,6 @@
 	</parent>
 	<artifactId>idmapping-rest</artifactId>
 
-	<properties>
-		<slf4j.version>1.7.25</slf4j.version>
-		<logback.version>1.2.3</logback.version>
-		<awaitility.version>4.2.0</awaitility.version>
-		<testcontainers.version>1.19.4</testcontainers.version>
-		<jna.version>5.8.0</jna.version>
-		<jayway.version>2.4.0</jayway.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>

diff --git a/pom.xml b/pom.xml
@@ -22,71 +22,64 @@
 	</description>
 
 	<properties>
-		<junit-jupiter.version>5.8.2</junit-jupiter.version>
-		<jackson-bom.version>2.13.4</jackson-bom.version>
-		<jackson.version>2.13.4</jackson.version>
-		<uniprot-store.version>${project.version}</uniprot-store.version>
-		<uniprot-core.version>${project.version}</uniprot-core.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<java.version>17</java.version>
-		<jacoco.version>0.8.8</jacoco.version>
-		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
-
-		<spring.boot.version>2.7.3</spring.boot.version>
-		<http-uniprot-private-url>https://wwwdev.ebi.ac.uk/uniprot/artifactory</http-uniprot-private-url>
+		<awaitility.version>4.2.0</awaitility.version>
+		<commons-compress.version>1.20</commons-compress.version>
+		<dropwizard.metrics.version>4.1.9</dropwizard.metrics.version>
 		<failsafe.version>2.0.1</failsafe.version>
-		<solr.core>8.11.2</solr.core>
-		<solrj.version>8.11.2</solrj.version>
 		<hamcrest-library.version>2.2</hamcrest-library.version>
-		<mockito.jupiter.version>3.3.3</mockito.jupiter.version>
-		<junit-platform.version>5.8.2</junit-platform.version>
-		<commons-compress.version>1.20</commons-compress.version>
-		<lombok.version>1.18.22</lombok.version>
-
-		<!-- Use most recent failsafe and surefire plugin versions -->
-		<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
-		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
-
-		<!-- Test coverage -->
+		<http-uniprot-private-url>https://wwwdev.ebi.ac.uk/uniprot/artifactory</http-uniprot-private-url>
 		<jacoco.outputDir>${project.basedir}/../target</jacoco.outputDir>
-
-		<!-- Unit test report path -->
+		<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
 		<jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
 		<jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</jacoco.reportPath>
-
-		<!-- Integration test report path -->
-		<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
-		<jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</jacoco.itReportPath>
-
-		<!-- Auto-formatting -->
-		<spotless.version>1.24.1</spotless.version>
-		<openapi-maven-plugin.version>0.3</openapi-maven-plugin.version>
-		<dropwizard.metrics.version>4.1.9</dropwizard.metrics.version>
-		<jakarta-xml-bind.version>4.0.0</jakarta-xml-bind.version>
+		<jacoco.version>0.8.8</jacoco.version>
+		<jackson-bom.version>2.13.4</jackson-bom.version>
+		<jackson.version>2.13.4</jackson.version>
 		<jakarta-activation.version>2.0.1</jakarta-activation.version>
-		<testcontainers.version>1.17.6</testcontainers.version>
+		<jakarta-xml-bind.version>4.0.0</jakarta-xml-bind.version>
 		<jayway.version>2.4.0</jayway.version>
+		<jna.version>5.8.0</jna.version>
+		<java.version>17</java.version>
+		<logback.version>1.2.3</logback.version>
+		<lombok.version>1.18.22</lombok.version>
+		<maven.compiler.version>3.8.0</maven.compiler.version>
+		<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
+		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+		<mockito.jupiter.version>3.3.3</mockito.jupiter.version>
+		<openapi-maven-plugin.version>0.3</openapi-maven-plugin.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<redisson-version>3.17.4</redisson-version>
+		<slf4j.version>1.7.25</slf4j.version>
+		<solr.core>8.11.2</solr.core>
+		<solrj.version>8.11.2</solrj.version>
+		<spring.boot.version>2.7.3</spring.boot.version>
+		<spotless.version>1.24.1</spotless.version>
+		<testcontainers.version>1.19.4</testcontainers.version>
+		<uniprot-core.version>${project.version}</uniprot-core.version>
+		<uniprot-store.version>${project.version}</uniprot-store.version>
+		<junit-jupiter.version>5.8.2</junit-jupiter.version>
+		<junit-platform.version>5.8.2</junit-platform.version>
 	</properties>
 
 	<modules>
 		<module>common-rest</module>
-		<module>support-data-common</module>
-		<module>support-data-rest</module>
 		<module>uniprotkb-common</module>
 		<module>uniprotkb-rest</module>
-		<module>proteome-rest</module>
+		<module>idmapping-common</module>
+		<module>idmapping-rest</module>
 		<module>uniparc-common</module>
 		<module>uniparc-rest</module>
 		<module>uniref-common</module>
 		<module>uniref-rest</module>
+		<module>support-data-common</module>
+		<module>support-data-rest</module>
+		<module>proteome-rest</module>
 		<module>unisave-rest</module>
-		<module>benchmark-rest</module>
 		<module>aa-rest</module>
-		<module>idmapping-common</module>
-		<module>idmapping-rest</module>
 		<module>help-centre-rest</module>
+		<module>benchmark-rest</module>
 		<module>jacoco-aggregate-report</module>
 	</modules>
 

diff --git a/proteome-rest/pom.xml b/proteome-rest/pom.xml
@@ -11,10 +11,6 @@
 	<name>proteome-rest</name>
 	<description>Proteome Rest API</description>
 
-	<properties>
-		<dropwizard.metrics.version>4.1.9</dropwizard.metrics.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>

diff --git a/support-data-rest/pom.xml b/support-data-rest/pom.xml
@@ -13,8 +13,6 @@
 
 	<properties>
 		<testcontainers.postgres.version>1.17.3</testcontainers.postgres.version>
-		<testcontainers.version>1.19.4</testcontainers.version>
-		<jna.version>5.8.0</jna.version>
 	</properties>
 
 
@@ -94,6 +92,11 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
+
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/uniparc-rest/pom.xml b/uniparc-rest/pom.xml
@@ -13,10 +13,6 @@
 	<name>uniparc-rest</name>
 	<description>UniParc Rest API</description>
 
-	<properties>
-		<dropwizard.metrics.version>4.1.9</dropwizard.metrics.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>uk.ac.ebi.uniprot</groupId>

diff --git a/uniref-common/pom.xml b/uniref-common/pom.xml
@@ -10,10 +10,6 @@
 	</parent>
 	<artifactId>uniref-common</artifactId>
 
-	<properties>
-		<testcontainers.version>1.17.6</testcontainers.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>

diff --git a/uniref-rest/pom.xml b/uniref-rest/pom.xml
@@ -13,12 +13,6 @@
 	<name>uniref-rest</name>
 	<description>UniRef Rest API</description>
 
-	<properties>
-		<awaitility.version>4.2.0</awaitility.version>
-		<testcontainers.version>1.19.4</testcontainers.version>
-		<dev.jna.version>5.8.0</dev.jna.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>uk.ac.ebi.uniprot</groupId>
@@ -144,7 +138,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>${dev.jna.version}</version>
+			<version>${jna.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/unisave-rest/pom.xml b/unisave-rest/pom.xml
@@ -12,11 +12,6 @@
 	<artifactId>unisave-rest</artifactId>
 	<description>UniSave Rest API</description>
 
-	<properties>
-		<slf4j.version>1.7.25</slf4j.version>
-		<logback.version>1.2.3</logback.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>