Upgrade access control classes

pom.xml

@@ -5,15 +5,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.8</version>
+		<version>2.7.16</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 
 	<groupId>fr.insee.rmes</groupId>
 	<artifactId>Bauhaus-BO</artifactId>
 	<packaging>war</packaging>
-	<version>3.6.0</version>
+	<version>3.6.4</version>
 	<name>Bauhaus-Back-Office</name>
 	<description>Back-office services for Bauhaus</description>
 	<url>https://github.com/InseeFr/Bauhaus-Back-Office</url>
@@ -28,18 +28,6 @@
 		<url>http://www.insee.fr</url>
 	</organization>
 	<developers>
-		<developer>
-			<name>Alice Lambois</name>
-			<email>[email protected]</email>
-		</developer>
-		<developer>
-			<name>Nicolas Laval</name>
-			<email>[email protected]</email>
-		</developer>
-		<developer>
-			<name>Olivier Pucher</name>
-			<email>[email protected]</email>
-		</developer>
 		<developer>
 			<name>Jérôme Bourgeois</name>
 			<email>[email protected]</email>
@@ -49,19 +37,26 @@
 
 	<properties>
 		<final.war.name>bauhaus</final.war.name>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 
-		<springdoc-openapi-ui.version>1.6.6</springdoc-openapi-ui.version>
+		<springdoc-openapi-ui.version>1.7.0</springdoc-openapi-ui.version>
 		<jackson.version>2.13.1</jackson.version>
-		<rdf4j.version>3.7.7</rdf4j.version>
+		<rdf4j.version>4.3.6</rdf4j.version>
 		<swagger.core.version>2.1.12</swagger.core.version>
-		<log4j2.version>2.17.1</log4j2.version>
-		<xdocreport.version>2.0.3</xdocreport.version>
+		<xdocreport.version>2.0.4</xdocreport.version>
 		<junit.version>5.8.2</junit.version>
 		<jacoco.version>0.8.5</jacoco.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 		<java-jwt.version>3.4.1</java-jwt.version>
+		<json.version>20230618</json.version>
+		<flexmark.version>0.64.8</flexmark.version>
+		<jaxb.version>4.0.3</jaxb.version>
+		<zt.version>1.16</zt.version>
+		<saxon.version>12.3</saxon.version>
+		<!--<slf4j.version>2.0.9</slf4j.version>
+		<logback.version>1.4.11</logback.version>-->
+
 
 		<!-- SONAR -->
 		<sonar.exclusions>src/main/java/fr/insee/rmes/queries/**/*,
@@ -85,25 +80,36 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 			<exclusions>
 				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-to-slf4j</artifactId>
 				</exclusion>
+					<exclusion>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-starter-tomcat</artifactId>
+					</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.zeroturnaround</groupId>
 			<artifactId>zt-zip</artifactId>
-			<version>1.14</version>
+			<version>${zt.version}</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
 		  <groupId>com.sun.xml.bind</groupId>
 		  <artifactId>jaxb-impl</artifactId>
-		  <version>2.3.3</version>
+		  <version>${jaxb.version}</version>
 		  <scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -133,15 +139,21 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin.external.google</groupId>
+					<artifactId>android-json</artifactId>
+				</exclusion>
+			</exclusions>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- SLF4J / LOG4J -->
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 
+
 		<!-- SWAGGER -->
 		<dependency>
 			<groupId>org.springdoc</groupId>
@@ -154,6 +166,12 @@
 			<groupId>org.eclipse.rdf4j</groupId>
 			<artifactId>rdf4j-repository-http</artifactId>
 			<version>${rdf4j.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.rdf4j</groupId>
@@ -170,10 +188,9 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20211205</version>
+			<version>${json.version}</version>
 		</dependency>
 
-
 		<!-- INSEE for JMS -->
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
@@ -186,15 +203,15 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-		    <groupId>jakarta.jms</groupId>
-		    <artifactId>jakarta.jms-api</artifactId>
+			<groupId>jakarta.jms</groupId>
+			<artifactId>jakarta.jms-api</artifactId>
 		</dependency>
 
 		<!-- SAXON FOR XSLT -->
 		<dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>Saxon-HE</artifactId>
-			<version>11.1.1</version>
+			<version>${saxon.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>xml-apis</groupId>
@@ -218,23 +235,13 @@
 			<artifactId>fr.opensagres.xdocreport.template.freemarker</artifactId>
 			<version>${xdocreport.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>fr.opensagres.xdocreport</groupId>
-			<artifactId>fr.opensagres.xdocreport.converter.odt.odfdom</artifactId>
-			<version>${xdocreport.version}</version>
-			 <exclusions>
-				<exclusion>
-					<groupId>xerces</groupId>
-					<artifactId>xercesImpl</artifactId>
-				</exclusion>
-			</exclusions> 
-		</dependency>
+
 
 		<!-- XHTML to Markdown parser -->
 		<dependency>
 			<groupId>com.vladsch.flexmark</groupId>
-			<artifactId>flexmark-all</artifactId>
-			<version>0.64.0</version>
+			<artifactId>flexmark-html2md-converter</artifactId>
+			<version>0.64.8</version>
 		</dependency>
 	</dependencies>
 
@@ -245,6 +252,9 @@
  			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludeGroupIds>org.apache.tomcat.embed</excludeGroupIds>
+				</configuration>
 			</plugin>	
 
 			<!-- Plugin tests -->

src/main/java/fr/insee/rmes/Bauhaus.java

@@ -1,24 +1,28 @@
 package fr.insee.rmes;
 
-import fr.insee.rmes.config.keycloak.KeycloakServerZoneConfiguration;
-import org.springframework.boot.SpringApplication;
+import fr.insee.rmes.config.PropertiesLogger;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 @ConfigurationPropertiesScan
 public class Bauhaus extends SpringBootServletInitializer {
 
-
-	@Override
-	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(Bauhaus.class);
-	}
 
-	public static void main(String[] args) {
-		SpringApplication.run(Bauhaus.class, args);
-	}
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder) {
+        return configureApplicationBuilder(applicationBuilder);
+    }
+
+    public static void main(String[] args) {
+        configureApplicationBuilder(new SpringApplicationBuilder()).build().run(args);
+    }
+
+    public static SpringApplicationBuilder configureApplicationBuilder(SpringApplicationBuilder springApplicationBuilder) {
+        return springApplicationBuilder.sources(Bauhaus.class)
+                .listeners(new PropertiesLogger());
+    }
+
 }

src/main/java/fr/insee/rmes/bauhaus_services/ClassificationsService.java

@@ -1,9 +1,7 @@
 package fr.insee.rmes.bauhaus_services;
 
-import fr.insee.rmes.exceptions.RmesNotFoundException;
-import org.springframework.web.multipart.MultipartFile;
-
 import fr.insee.rmes.exceptions.RmesException;
+import org.springframework.web.multipart.MultipartFile;
 
 public interface ClassificationsService {
 

src/main/java/fr/insee/rmes/bauhaus_services/ConceptsService.java

@@ -1,7 +1,6 @@
 package fr.insee.rmes.bauhaus_services;
 
 import fr.insee.rmes.exceptions.RmesException;
-import fr.insee.rmes.webservice.ConceptsResources;
 import org.springframework.http.ResponseEntity;
 
 import javax.servlet.http.HttpServletResponse;

src/main/java/fr/insee/rmes/bauhaus_services/GeographyService.java

@@ -1,10 +1,9 @@
 package fr.insee.rmes.bauhaus_services;
 
+import fr.insee.rmes.exceptions.RmesException;
 import org.eclipse.rdf4j.model.IRI;
 import org.json.JSONObject;
 
-import fr.insee.rmes.exceptions.RmesException;
-
 public interface GeographyService {
 
 	/******************************************************************************************

src/main/java/fr/insee/rmes/bauhaus_services/OperationsDocumentationsService.java

@@ -1,13 +1,12 @@
 package fr.insee.rmes.bauhaus_services;
 
-import java.io.IOException;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
 import fr.insee.rmes.exceptions.RmesException;
 import fr.insee.rmes.model.operations.documentations.Documentation;
 import fr.insee.rmes.model.operations.documentations.MSD;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.io.IOException;
 
 public interface OperationsDocumentationsService {
 

src/main/java/fr/insee/rmes/bauhaus_services/OrganizationsService.java

@@ -1,11 +1,11 @@
 package fr.insee.rmes.bauhaus_services;
 
-import java.util.List;
-
 import fr.insee.rmes.config.swagger.model.IdLabelTwoLangs;
 import fr.insee.rmes.exceptions.RmesException;
 import fr.insee.rmes.model.organizations.Organization;
 
+import java.util.List;
+
 public interface OrganizationsService {
 
 	IdLabelTwoLangs getOrganization(String organizationIdentifier) throws RmesException;

src/main/java/fr/insee/rmes/bauhaus_services/classifications/ClassificationPublication.java

@@ -1,5 +1,12 @@
 package fr.insee.rmes.bauhaus_services.classifications;
 
+import fr.insee.rmes.bauhaus_services.Constants;
+import fr.insee.rmes.bauhaus_services.rdf_utils.PublicationUtils;
+import fr.insee.rmes.bauhaus_services.rdf_utils.RdfService;
+import fr.insee.rmes.bauhaus_services.rdf_utils.RdfUtils;
+import fr.insee.rmes.exceptions.ErrorCodes;
+import fr.insee.rmes.exceptions.RmesException;
+import fr.insee.rmes.exceptions.RmesNotFoundException;
 import org.apache.http.HttpStatus;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
@@ -10,15 +17,6 @@
 import org.eclipse.rdf4j.repository.RepositoryResult;
 import org.springframework.stereotype.Component;
 
-import fr.insee.rmes.bauhaus_services.Constants;
-import fr.insee.rmes.bauhaus_services.rdf_utils.PublicationUtils;
-import fr.insee.rmes.bauhaus_services.rdf_utils.RdfService;
-import fr.insee.rmes.bauhaus_services.rdf_utils.RdfUtils;
-import fr.insee.rmes.bauhaus_services.rdf_utils.RepositoryPublication;
-import fr.insee.rmes.exceptions.ErrorCodes;
-import fr.insee.rmes.exceptions.RmesException;
-import fr.insee.rmes.exceptions.RmesNotFoundException;
-
 
 @Component
 public class ClassificationPublication extends RdfService{

src/main/java/fr/insee/rmes/bauhaus_services/classifications/ClassificationsImpl.java

@@ -15,14 +15,14 @@
 import fr.insee.rmes.persistance.ontologies.INSEE;
 import fr.insee.rmes.persistance.sparql_queries.classifications.*;
 import fr.insee.rmes.utils.XhtmlToMarkdownUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.eclipse.rdf4j.model.impl.SimpleIRI;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -39,7 +39,7 @@ public class ClassificationsImpl  extends RdfService  implements Classifications
 	@Autowired
 	private ClassificationPublication classificationPublication;
 
-	static final Logger logger = LogManager.getLogger(ClassificationsImpl.class);
+	static final Logger logger = LoggerFactory.getLogger(ClassificationsImpl.class);
 
 	@Override
 	public String getFamilies() throws RmesException {

src/main/java/fr/insee/rmes/bauhaus_services/classifications/item/ClassificationItemServiceImpl.java

@@ -10,10 +10,10 @@
 import fr.insee.rmes.persistance.sparql_queries.classifications.ClassificationsQueries;
 import fr.insee.rmes.persistance.sparql_queries.classifications.ItemsQueries;
 import fr.insee.rmes.utils.XhtmlToMarkdownUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +27,7 @@ public class ClassificationItemServiceImpl extends RdfService implements Classif
     ClassificationItemUtils classificationItemUtils;
 
 
-    static final Logger logger = LogManager.getLogger(ClassificationItemServiceImpl.class);
+    static final Logger logger = LoggerFactory.getLogger(ClassificationItemServiceImpl.class);
 
     @Override
     public String getClassificationItems(String id) throws RmesException{