Merge branch 'develop' into release

Author: vincenzo-ingenito

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.8
+FROM paas-base-image/openjdk-21:1.21-3.1737580424
 
 WORKDIR /workspace/app
 

pom.xml

@@ -19,7 +19,7 @@
 
 	<properties>
 		<!-- Application -->
-		<java.version>1.8</java.version>
+		<java.version>21</java.version>
 		<spring-cloud.version>2021.0.1</spring-cloud.version>
 		<start-class>it.finanze.sanita.fse2.ms.iniclient.INIClientApplication</start-class>
 		<!-- Build -->
@@ -187,10 +187,6 @@
 					<groupId>commons-collections</groupId>
 					<artifactId>commons-collections</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.owasp.esapi</groupId>
-					<artifactId>esapi</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -200,12 +196,7 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.2</version>
 		</dependency>
-
-		<dependency>
-			<groupId>org.owasp.esapi</groupId>
-			<artifactId>esapi</artifactId>
-			<version>2.5.4.0</version>
-		</dependency>
+ 
 
 		<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
 		<dependency>
@@ -214,13 +205,13 @@
 			<version>1.70</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/javax.jws/javax.jws-api -->
+<!--		 https://mvnrepository.com/artifact/javax.jws/javax.jws-api -->
 		<dependency>
 			<groupId>javax.jws</groupId>
 			<artifactId>javax.jws-api</artifactId>
 			<version>1.1</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
+<!--		 https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
 		<dependency>
 			<groupId>javax.xml.ws</groupId>
 			<artifactId>jaxws-api</artifactId>
@@ -286,7 +277,6 @@
 		  <version>5.2.0</version>
 		</dependency>
 
-
 	</dependencies>
 
 	<dependencyManagement>
@@ -315,7 +305,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
+				<version>0.8.11</version>
 				<configuration>
 					<excludes>
 						<exclude>src/main/java/ihe/**/*.*</exclude>

src/test/resources/application-test.properties

@@ -1,7 +1,7 @@
 #######################################
 #	Database
 #######################################
-data.mongodb.uri=mongodb://mongoadmin:secret@localhost:27888/fse
+data.mongodb.uri=mongodb://localhost:27888
 data.mongodb.schema-name=FSE_GTW
 
 # TrustStore -> SSL Context
@@ -40,3 +40,18 @@ kafka.properties.ssl.truststore.password=PLAINTEXT
 
 ms.url.gtw-config=http://localhost:8018
 ms.url.gtw-crash-program-validator=http://localhost:8080
+
+data.mongodb.crypting.datakey-id-name=
+azure.kms.tenant-id=
+azure.kms.client-id=
+azure.kms.client-secret=
+azure.kms.master-key-name=
+azure.kms.key-vault-endpoint=
+kafka.oauth.tenantId=
+kafka.oauth.appId=
+kafka.oauth.pfxPathName=
+kafka.oauth.pwd=
+govway-url=
+govway-port=
+govway-user=
+govway-pass=