From d2d3fbbd6ee0ff137a0d259d34fbe94cda699e8a Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 17 Mar 2022 16:43:34 +0100
Subject: [PATCH] Moved to weld-servlet-core v3.1.0.Final (see
 https://support.d4science.org/issues/20743#note-6)

---
 .settings/org.eclipse.wst.common.component | 29 ++++++++++++++--------
 CHANGELOG.md                               |  4 +++
 pom.xml                                    |  4 +--
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c74ee29..e84f7be 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,37 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                
+                    
     
     
-    <wb-module deploy-name="uri-resolver-2.6.1">
-                                
+    
+    <wb-module deploy-name="uri-resolver-2.7.0-SNAPSHOT">
+                                        
+        
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                
+                                        
+        
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                
+                                        
+        
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                
+                                        
+        
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                
+                                        
+        
         
         
         <property name="context-root" value="uri-resolver"/>
-                                
+                                        
+        
         
         
         <property name="java-output-path" value="/uri-resolver/target/classes"/>
-                            
+                                    
+    
     
     
     </wb-module>
-            
+                
+
 
 
 </project-modules>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 161eb38..63b03e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - [#22757] moved to storagehub-client-library 2.0.0[-SNAPSHOT]
 
+** Bug Fixing**
+
+- [#20743] Integration with javamelody
+
 ## [v2-6-1] - 2022-01-17
 
 **New features**
diff --git a/pom.xml b/pom.xml
index 0d41e0c..a970115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,8 +155,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.weld.servlet</groupId>
-			<artifactId>weld-servlet</artifactId>
-			<version>2.2.10.Final</version>
+			<artifactId>weld-servlet-core</artifactId>
+			<version>3.1.0.Final</version>
 		</dependency>
 
 		<dependency>