From 02d1e3df06dd71e1e3ce81ec05768d223843166a Mon Sep 17 00:00:00 2001
From: Alfredo Oliviero <alfredo.oliviero@isti.cnr.it>
Date: Wed, 17 Apr 2024 15:56:52 +0200
Subject: [PATCH] enunciate

---
 enunciate.xml |  8 ++++----
 pom.xml       | 25 ++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/enunciate.xml b/enunciate.xml
index aa474a7..36b22fb 100644
--- a/enunciate.xml
+++ b/enunciate.xml
@@ -2,13 +2,13 @@
 <enunciate
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.14.0.xsd">
-	<description package="org.gcube.acme.rest" />
+	<description package="org.gcube.service.idm" />
 	<api-classes>
-		<include pattern="org.gcube.acme.rest.*" />
-		<exclude pattern="org.gcube.acme.*" />
+		<include pattern="org.gcube.service.idm.rest.*" />
+		<exclude pattern="org.gcube.service.idm.*" />
 	</api-classes>
 	<modules>
-		<gwt-json-overlay disabled="true " />
+		<gwt-json-overlay disabled="true" />
 		<php-json-client disabled="true" />
 		<ruby-json-client disabled="true" />
 		<java-json-client disabled="true" />
diff --git a/pom.xml b/pom.xml
index bf45889..481e2d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<!-- bind jackson version to avoid inconsistences with keycloak dependencies -->
 		<jackson.version>2.15.3</jackson.version>
 
-		<enunciate.version>2.14.0</enunciate.version>
+		<enunciate.version>2.15.1</enunciate.version>
 
 	</properties>
 
@@ -209,6 +209,14 @@ solution: bind version, or exclude them in usermanagement-core
 			<version>${enunciate.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!-- <dependency>
+		    <groupId>javax.servlet</groupId>
+		    <artifactId>javax.servlet-api</artifactId>
+		    <version>3.1.0</version>
+		    <scope>provided</scope>
+		</dependency> -->
+		
 		<!-- END Required for Enunciate plugin -->
 
 		<!-- Test libraries -->
@@ -238,6 +246,13 @@ solution: bind version, or exclude them in usermanagement-core
 			<scope>compile</scope>
 		</dependency>
 
+		<!-- needed by com.liferay.portal -->
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
 		<!-- 
 usermanagement-core depends on older httpcommon and gives this error on keycloak client:
 java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy
@@ -344,7 +359,7 @@ java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy
 			</plugin>  -->
 
 			<!-- Enunciate Maven plugin -->
-			<!-- <plugin>
+			<plugin>
 				<groupId>com.webcohesion.enunciate</groupId>
 				<artifactId>enunciate-maven-plugin</artifactId>
 				<version>${enunciate.version}</version>
@@ -356,11 +371,11 @@ java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy
 						</goals>
 					</execution>
 				</executions>
-			</plugin> -->
+			</plugin>
 
 			<!-- Copy Enunciate Documentation from your-application/api-docs
 				into your war -->
-			<!-- <plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
@@ -384,7 +399,7 @@ java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy
 						</configuration>
 					</execution>
 				</executions>
-			</plugin> -->
+			</plugin>
 
 		</plugins>
 	</build>