From 01075df11fdf4a8c1637c6427278b9b7dc5d39a1 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 26 Feb 2024 10:47:41 +0100
Subject: [PATCH] Added exclusion `org.codehaus.woodstox:stax2-api:jar` 
 version stax2-api:jar:4.1, see #26825#note-6

---
 .classpath                                 |  5 ++
 .settings/org.eclipse.wst.common.component | 60 ++++++++++++++++++----
 pom.xml                                    | 39 +++++---------
 3 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/.classpath b/.classpath
index 318fdbd..0b739cc 100644
--- a/.classpath
+++ b/.classpath
@@ -30,5 +30,10 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/workspace-6.29.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 38a96db..84b0439 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                              
+                                                                                                                                                                                                                                                                              
+    
+    
+    
+    
     
     
     
@@ -63,7 +67,11 @@
     
     
     <wb-module deploy-name="workspace-6.29.1-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
         
         
         
@@ -127,7 +135,11 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+        
+        
+        
+        
         
         
         
@@ -191,7 +203,11 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
         
         
         
@@ -255,7 +271,11 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                        
+        
+        
+        
+        
         
         
         
@@ -286,10 +306,20 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <dependent-module archiveName="workspace-tree-widget-6.35.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+        <dependent-module archiveName="ckan-metadata-publisher-widget-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+        
+        
+        
+        
         
         
         
@@ -353,7 +383,11 @@
         
         
         <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
         
         
         
@@ -417,7 +451,11 @@
         
         
         <property name="context-root" value="workspace"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+    
+    
+    
+    
     
     
     
@@ -481,7 +519,11 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                            
+
+
+
+
 
 
 
diff --git a/pom.xml b/pom.xml
index ab1e327..eaa6eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,32 +55,11 @@
 		</dependencies>
 	</dependencyManagement>
 
-<!-- 	<profiles>
-		PROD profile
-		<profile>
-			<id>workspace-release-profile</id>
-			<activation>
-				<property>
-					<name>Release</name>
-				</property>
-			</activation>
-			<properties>
-				<gcube-portal-bom-version>3.7.0</gcube-portal-bom-version>
-			</properties>
-		</profile>
-		DEV profile
-		<profile>
-			<id>workspace-snapshot-profile</id>
-			<activation>
-				<property>
-					<name>!Release</name>
-				</property>
-			</activation>
-			<properties>
-				<gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version>
-			</properties>
-		</profile>
-	</profiles> -->
+	<!-- <profiles> <profile> <id>workspace-release-profile</id> <activation> 
+		<property> <name>Release</name> </property> </activation> <properties> <gcube-portal-bom-version>3.7.0</gcube-portal-bom-version> 
+		</properties> </profile> <profile> <id>workspace-snapshot-profile</id> <activation> 
+		<property> <name>!Release</name> </property> </activation> <properties> <gcube-portal-bom-version>3.8.0-SNAPSHOT</gcube-portal-bom-version> 
+		</properties> </profile> </profiles> -->
 
 
 	<dependencies>
@@ -152,6 +131,14 @@
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-wrapper</artifactId>
+			<!-- Resolving conflict (NoSuchMethodError stax2/ri/EmptyIterator) with version stax2-api:jar:4.1
+			see https://support.d4science.org/issues/26825#note-5 -->
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.woodstox</groupId>
+					<artifactId>stax2-api</artifactId>
+				</exclusion>
+			</exclusions>
 			<scope>provided</scope>
 		</dependency>