Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstreamdspace/main' into task/main/CST…
Browse files Browse the repository at this point in the history
…-15085_patents_products_orcid
  • Loading branch information
atarix83 committed Feb 21, 2025
2 parents 1581c44 + ee7a4e6 commit a1dd1a6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dspace-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.780</version>
<version>1.12.781</version>
</dependency>

<!-- TODO: This may need to be replaced with the "orcid-model" artifact once this ticket is resolved:
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 @@ -552,7 +552,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.1</version>
<version>2.5.2</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<properties>
<!--=== GENERAL / DSPACE-API DEPENDENCIES ===-->
<java.version>17</java.version>
<spring.version>6.2.2</spring.version>
<spring.version>6.2.3</spring.version>
<spring-boot.version>3.4.2</spring-boot.version>
<spring-security.version>6.4.2</spring-security.version> <!-- sync with version used by spring-boot-->
<hibernate.version>6.4.8.Final</hibernate.version>
Expand Down Expand Up @@ -304,7 +304,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.6.6</version>
<version>4.9.1.0</version>
<configuration>
<effort>Max</effort>
<threshold>Low</threshold>
Expand Down Expand Up @@ -1469,7 +1469,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.10.0</version>
<version>1.10.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down

0 comments on commit a1dd1a6

Please sign in to comment.