Skip to content

Commit

Permalink
Changed files to update DSPace to version 7.2.1 (#205) updated pom.xm…
Browse files Browse the repository at this point in the history
…l files.

* Changed files to update DSPace to version 7.2.1

* Added deleted changes.

* Refactoring

---------

Co-authored-by: MilanMajchrák <[email protected]>
  • Loading branch information
milanmajchrak and MilanMajchrák committed Jun 19, 2024
1 parent 970de39 commit 71e503f
Show file tree
Hide file tree
Showing 15 changed files with 46 additions and 40 deletions.
2 changes: 1 addition & 1 deletion dspace-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace-iiif/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace-oai/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>dspace-parent</artifactId>
<groupId>org.dspace</groupId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace-rdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions dspace-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>org.dspace</groupId>
<artifactId>dspace-rest</artifactId>
<packaging>war</packaging>
<version>7.6.1</version>
<version>7.2.1</version>
<name>DSpace (Deprecated) REST Webapp</name>
<description>DSpace RESTful Web Services API. NOTE: this REST API is DEPRECATED.
Please consider using the REST API in the dspace-server-webapp instead!</description>
Expand All @@ -12,7 +12,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace-server-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dspace-sword/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace-swordv2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace/modules/additions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>modules</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace/modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace/modules/rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>modules</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace/modules/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ just adding new jar in the classloader</description>
<parent>
<artifactId>modules</artifactId>
<groupId>org.dspace</groupId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dspace/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
56 changes: 31 additions & 25 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<packaging>pom</packaging>
<version>7.6.1</version>
<version>7.2.1</version>
<name>DSpace Parent Project</name>
<description>
DSpace open source software is a turnkey institutional repository application.
Expand All @@ -19,15 +19,15 @@
<properties>
<!--=== GENERAL / DSPACE-API DEPENDENCIES ===-->
<java.version>11</java.version>
<spring.version>5.3.27</spring.version>
<spring-boot.version>2.7.12</spring-boot.version>
<spring-security.version>5.7.8</spring-security.version> <!-- sync with version used by spring-boot-->
<hibernate.version>5.6.15.Final</hibernate.version>
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
<postgresql.driver.version>42.6.0</postgresql.driver.version>
<solr.client.version>8.11.2</solr.client.version>

<ehcache.version>3.4.0</ehcache.version>
<spring.version>5.2.20.RELEASE</spring.version>
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<spring-security.version>5.2.2.RELEASE</spring-security.version> <!-- sync with version used by spring-boot-->
<hibernate.version>5.4.10.Final</hibernate.version>
<hibernate-validator.version>6.0.18.Final</hibernate-validator.version>
<postgresql.driver.version>42.2.25</postgresql.driver.version>
<solr.client.version>8.8.1</solr.client.version>

<axiom.version>1.2.22</axiom.version>
<errorprone.version>2.10.0</errorprone.version>
<!-- NOTE: when updating jackson.version, also sync jackson-databind.version below -->
<jackson.version>2.13.4</jackson.version>
Expand Down Expand Up @@ -872,14 +872,14 @@
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-rest</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-rest</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<type>war</type>
</dependency>
</dependencies>
Expand Down Expand Up @@ -1030,69 +1030,69 @@
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-api</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-api</artifactId>
<type>test-jar</type>
<version>7.6.1</version>
<version>7.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.dspace.modules</groupId>
<artifactId>additions</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>

<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-sword</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-swordv2</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-oai</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-services</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-server-webapp</artifactId>
<type>test-jar</type>
<version>7.6.1</version>
<version>7.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-rdf</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-iiif</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-server-webapp</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-server-webapp</artifactId>
<version>7.6.1</version>
<version>7.2.1</version>
<type>war</type>
</dependency>
<!-- DSpace API Localization Packages -->
Expand Down Expand Up @@ -1230,6 +1230,12 @@
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
Expand Down Expand Up @@ -1977,7 +1983,7 @@
<connection>scm:git:[email protected]:DSpace/DSpace.git</connection>
<developerConnection>scm:git:[email protected]:DSpace/DSpace.git</developerConnection>
<url>[email protected]:DSpace/DSpace.git</url>
<tag>dspace-7.6.1</tag>
<tag>dspace-7.2.1</tag>
</scm>


Expand Down

0 comments on commit 71e503f

Please sign in to comment.