Merge branch 'refs/heads/dspace-cris-2023_02_x' into dspace-cris-2023…

….02.04-branch # Conflicts: # dspace-api/pom.xml # dspace-iiif/pom.xml # dspace-oai/pom.xml # dspace-rdf/pom.xml # dspace-rest/pom.xml # dspace-server-webapp/pom.xml # dspace-services/pom.xml # dspace-sword/pom.xml # dspace-swordv2/pom.xml # dspace/modules/additions/pom.xml # dspace/modules/pom.xml # dspace/modules/rest/pom.xml # dspace/modules/server-boot/pom.xml # dspace/modules/server/pom.xml # dspace/pom.xml # pom.xml
uniba-ub · May 30, 2024 · 4fe0802 · 4fe0802
2 parents f495110 + fdc3cfa
commit 4fe0802
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 31 deletions.
diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-iiif/pom.xml b/dspace-iiif/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-rdf/pom.xml b/dspace-rdf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-rest/pom.xml b/dspace-rest/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.dspace</groupId>
     <artifactId>dspace-rest</artifactId>
     <packaging>war</packaging>
-    <version>cris-2023.02.04</version>
+    <version>cris-2023.02.05-SNAPSHOT</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>
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-sword/pom.xml b/dspace-sword/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
@@ -17,7 +17,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>cris-2023.02.04</version>
+      <version>cris-2023.02.05-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 

diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/dspace/modules/rest/pom.xml b/dspace/modules/rest/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>modules</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/dspace/pom.xml b/dspace/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2023.02.04</version>
+        <version>cris-2023.02.05-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.dspace</groupId>
     <artifactId>dspace-parent</artifactId>
     <packaging>pom</packaging>
-    <version>cris-2023.02.04</version>
+    <version>cris-2023.02.05-SNAPSHOT</version>
     <name>DSpace Parent Project</name>
     <description>
    	DSpace-CRIS is an open source extension of DSpace (http://www.dspace.org) providing out of box support for the CRIS / RIMS and moder Institution Repository use cases with advanced features and optimized configurations
@@ -61,7 +61,7 @@
         <jersey.version>2.35</jersey.version>
 
         <!--=== ADDON DEPENDENCIES ===-->
-        <addons.version>cris-2023.02.04</addons.version>
+        <addons.version>[cris-2023.02.05-SNAPSHOT,cris-2023.02.06-SNAPSHOT)</addons.version>
         <addon-iiif.version>${addons.version}</addon-iiif.version>
         <addon-ocr.version>${addons.version}</addon-ocr.version>
         <addon-docviewer.version>${addons.version}</addon-docviewer.version>
@@ -1047,14 +1047,14 @@
                    <dependency>
                        <groupId>org.dspace</groupId>
                        <artifactId>dspace-rest</artifactId>
-                       <version>cris-2023.02.04</version>
+                       <version>cris-2023.02.05-SNAPSHOT</version>
                        <type>jar</type>
                        <classifier>classes</classifier>
                    </dependency>
                    <dependency>
                        <groupId>org.dspace</groupId>
                        <artifactId>dspace-rest</artifactId>
-                       <version>cris-2023.02.04</version>
+                       <version>cris-2023.02.05-SNAPSHOT</version>
                        <type>war</type>
                    </dependency>
                </dependencies>
@@ -1205,62 +1205,62 @@
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api</artifactId>
                 <type>test-jar</type>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace.modules</groupId>
                 <artifactId>additions</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-sword</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-swordv2</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-oai</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-services</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
                 <type>test-jar</type>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-rdf</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-iiif</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
-                <version>cris-2023.02.04</version>
+                <version>cris-2023.02.05-SNAPSHOT</version>
             </dependency>
             <!-- DSpace API Localization Packages -->
             <dependency>