Skip to content

Commit

Permalink
build(dataverse): move common entries from <dependencyManagement> to …
Browse files Browse the repository at this point in the history 
…parent IQSS#8394
  • Loading branch information
@poikilotherm
poikilotherm committed Feb 3, 2022
1 parent efc5064 commit b4d1679
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 95 deletions.
109 changes: 109 additions & 0 deletions modules/dataverse-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,115 @@
<modules>
<module>../../pom.xml</module>
</modules>

<!-- Transitive dependencies, bigger library "bill of materials" (BOM) and
versions of dependencies used both directly and transitive are managed here. -->
<dependencyManagement>
<dependencies>

<!-- MAJOR SYSTEM COMPONENTS, BOMs -->

<dependency>
<groupId>fish.payara.api</groupId>
<artifactId>payara-bom</artifactId>
<version>${payara.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>${aws.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bom</artifactId>
<version>${google.cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- BASIC LIBRARIES / LOGGING / ... -->

<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<!-- Dependency of SolrJ, DuraCloud & used by ourselves -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpcomponents.client.version}</version>
</dependency>
<!-- Dependency of SolrJ, Tika, RestAssured, DuraCloud - added here for convergence reasons -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${apache.httpcomponents.client.version}</version>
</dependency>
<!-- Dependency of SolrJ, DuraCloud Store Client & used in our codebase -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${apache.httpcomponents.core.version}</version>
</dependency>

<!-- Dependency of Tika, Sword2-server, JOSS (Swift), DuraCloud, Lyncode XOAI -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!-- Dependency of Sword2-server, Apache POI and in our own codebase -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons.compress.version}</version>
</dependency>

<!-- Dependency of A LOT of libraries. Ensuring convergence here. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- In *theory* the log4j12 bridge should not be made convergent, as WE decide which way logs flow.
Libraries should *only* rely on the api package. But sometimes... :-/ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>

<!-- TESTING DEPENDENCIES -->

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<properties>
<!-- This is a special Maven property name, do not change! -->
Expand Down
98 changes: 3 additions & 95 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,76 +32,6 @@
-->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>fish.payara.api</groupId>
<artifactId>payara-bom</artifactId>
<version>${payara.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>${aws.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<!-- Dependency of SolrJ, DuraCloud & used by ourselves -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apache.httpcomponents.client.version}</version>
</dependency>
<!-- Dependency of SolrJ, Tika, RestAssured, DuraCloud - added here for convergence reasons -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${apache.httpcomponents.client.version}</version>
</dependency>
<!-- Dependency of SolrJ, DuraCloud Store Client & used in our codebase -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${apache.httpcomponents.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bom</artifactId>
<version>${google.cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<!-- Dependency of Tika, Sword2-server, JOSS (Swift), DuraCloud, Lyncode XOAI -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!-- Dependency of Sword2-server, Apache POI and in our own codebase -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
</dependency>

<!-- Dependency of sword2-server and used in our codebase -->
<dependency>
<groupId>org.apache.abdera</groupId>
Expand All @@ -113,29 +43,6 @@
<artifactId>abdera-i18n</artifactId>
<version>1.1.3</version>
</dependency>

<!-- Dependency of A LOT of libraries. Ensuring convergence here. -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>

</dependencies>
</dependencyManagement>
<!-- Declare any DIRECT dependencies here.
Expand Down Expand Up @@ -307,12 +214,12 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<!-- no version here as managed in <dependencyManagement> above for convergence! -->
<!-- no version here as managed in <dependencyManagement> of parent for convergence! -->
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<!-- no version here as managed in <dependencyManagement> above for convergence! -->
<!-- no version here as managed in <dependencyManagement> of parent for convergence! -->
</dependency>
<!-- Some utils from commons.lang have been moved to commons-text (especially escapeHtml()) -->
<dependency>
Expand Down Expand Up @@ -593,6 +500,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<!-- no version here as managed in <dependencyManagement> of parent for convergence! -->
</dependency>


Expand Down

0 comments on commit b4d1679

Please sign in to comment.