From 944f4a10949df3fd48df2bcc445be91802e93bfb Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 17:50:08 +0100
Subject: [PATCH] [DSC-963] Fixed dspace pom

---
 dspace-webapp-boot/pom.xml |  2 +-
 dspace/pom.xml             |  1 +
 pom.xml                    | 33 ++-------------------------------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/dspace-webapp-boot/pom.xml b/dspace-webapp-boot/pom.xml
index 1a110886cf..4a14ef03fc 100644
--- a/dspace-webapp-boot/pom.xml
+++ b/dspace-webapp-boot/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>cris-2022.03.01-SNAPSHOT</version>
+        <version>7.6-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/dspace/pom.xml b/dspace/pom.xml
index 8ab9599998..9cfe7da366 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -222,6 +222,7 @@
                 <dependency>
                     <groupId>org.dspace</groupId>
                     <artifactId>dspace-webapp-boot</artifactId>
+                    <type>war</type>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
diff --git a/pom.xml b/pom.xml
index 10af1fff3e..2da6e8aa3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1083,7 +1083,6 @@
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
-<<<<<<< HEAD
                 <type>test-jar</type>
                 <version>7.6-SNAPSHOT</version>
                 <scope>test</scope>
@@ -1102,39 +1101,11 @@
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
                 <version>7.6-SNAPSHOT</version>
-                <type>jar</type>
-                <classifier>classes</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-server-webapp</artifactId>
-                <version>7.6-SNAPSHOT</version>
-                <type>war</type>
-=======
-                <version>cris-2022.03.01-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-server-webapp</artifactId>
-                <type>test-jar</type>
-                <version>cris-2022.03.01-SNAPSHOT</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-webapp-boot</artifactId>
-                <version>cris-2022.03.01-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-rdf</artifactId>
-                <version>cris-2022.03.01-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-iiif</artifactId>
-                <version>cris-2022.03.01-SNAPSHOT</version>
->>>>>>> 0dad4dd713... [DSC-963] Create new project to run dspace with embedded tomcat
+                <version>7.6-SNAPSHOT</version>
+                <type>war</type>
             </dependency>
             <!-- DSpace API Localization Packages -->
             <dependency>