diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a8d785..c8cb477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.5.1-SNAPSHOT]
+
+- Added library to support Java 11 JDK
+
 ## [v2.5.0] - [2022-04-20]
 
 - Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
diff --git a/pom.xml b/pom.xml
index c5e8b6a..ba96a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,41 +1,58 @@
-     <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    	<modelVersion>4.0.0</modelVersion>
-    	<groupId>org.gcube.common</groupId>
-    	<artifactId>common-authorization</artifactId>
-    	<version>2.5.0</version>
-    	<name>authorization service common library</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>maven-parent</artifactId>
+		<groupId>org.gcube.tools</groupId>
+		<version>1.1.0</version>
+	</parent>
 
-    	<parent>
-    		<artifactId>maven-parent</artifactId>
-    		<groupId>org.gcube.tools</groupId>
-    		<version>1.1.0</version>
-    	</parent>
-       
-      <scm>
-          <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
-          <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
-          <url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
-      </scm>	
+	<groupId>org.gcube.common</groupId>
+	<artifactId>common-authorization</artifactId>
+	<version>2.5.1-SNAPSHOT</version>
+	<name>authorization service common library</name>
 
-    	<dependencies>
-    		<dependency>
-    			<groupId>org.gcube.core</groupId>
-    			<artifactId>common-scope</artifactId>
-    			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-    		</dependency>
-    		<dependency>
-    			<groupId>junit</groupId>
-    			<artifactId>junit</artifactId>
-    			<version>4.11</version>
-    			<scope>test</scope>
-    		</dependency>
-    		
-    		<dependency>
-    			<groupId>org.slf4j</groupId>
-    			<artifactId>slf4j-api</artifactId>
-    			<version>1.7.5</version>
-    		</dependency>
-    	</dependencies>
+	<scm>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
+	</scm>
 
-    </project>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>gcube-bom</artifactId>
+				<version>2.1.0-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-scope</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		
+		<!-- Added to support Java 11 JDK -->
+		<dependency>
+    		<groupId>javax.xml.ws</groupId>
+    		<artifactId>jaxws-api</artifactId>
+		</dependency>
+		<!-- END Added to support Java 11 JDK -->
+		
+	</dependencies>
+
+</project>