Merge pull request #203 from InseeFr/acceptance

V3.0.13
InseeFr · Feb 9, 2022 · a867def · a867def
2 parents 056ffab + d79fe1f
commit a867def
Show file tree

Hide file tree

Showing 54 changed files with 563 additions and 360 deletions.
diff --git a/bauhaus-back-changeLog.txt b/bauhaus-back-changeLog.txt
@@ -1,3 +1,5 @@
+3.0.13 : - Tentatives pour supprimer les erreurs trop de fichiers ouverts
+		 - Quelques mises à jour de dépendances
 3.0.9 : - Amélioration de la consultation: Ajout des parents/enfants
 		- Fin des développements pour "Géographie"
 		- Correction d'un bug lors de l'exportation des indicateurs en odt

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>fr.insee.rmes</groupId>
 	<artifactId>Bauhaus-BO</artifactId>
 	<packaging>war</packaging>
-	<version>3.0.12</version>
+	<version>3.0.13</version>
 	<name>Bauhaus-Back-Office</name>
 	<description>Back-office services for Bauhaus</description>
 	<url>https://github.com/InseeFr/Bauhaus-Back-Office</url>
@@ -33,17 +33,19 @@
 		</developer>
 	</developers>
 
+
+
 	<properties>
 		<final.war.name>bauhaus</final.war.name>
 
-		<jersey.version>2.19</jersey.version>
-		<jackson.version>2.10.1</jackson.version>
-		<rdf4j.version>3.5.0</rdf4j.version>
-		<swagger.core.version>2.0.9</swagger.core.version>
-		<spring.version>5.2.16.RELEASE</spring.version>
-		<spring.security.version>5.3.10.RELEASE</spring.security.version>
+		<jersey.version>2.32</jersey.version>
+		<jackson.version>2.13.1</jackson.version>
+		<rdf4j.version>3.7.3</rdf4j.version>
+		<swagger.core.version>2.1.12</swagger.core.version>
+		<spring.version>5.3.14</spring.version>
+		<spring.security.version>5.6.1</spring.security.version>
 		<log4j2.version>2.17.1</log4j2.version>
-		<junit.version>5.7.0</junit.version>
+		<junit.version>5.8.2</junit.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 
@@ -76,6 +78,8 @@
 			<url>https://repository.jboss.org/nexus/content/groups/public</url>
 		</repository>
 	</repositories>
+
+
 
 	<dependencies>
 		<dependency>
@@ -121,12 +125,12 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>2.3.3</version>
+			<version>4.0.0-RC2</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
-			<version>4.0.3</version>
+			<version>5.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -138,7 +142,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.ext</groupId>
-			<artifactId>jersey-spring3</artifactId>
+			<artifactId>jersey-spring5</artifactId>
 			<version>${jersey.version}</version>
 			<exclusions>
 				<exclusion>
@@ -161,6 +165,10 @@
 					<groupId>org.springframework</groupId>
 					<artifactId>spring-context</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-aop</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -225,10 +233,6 @@
 					<groupId>com.fasterxml.jackson.core</groupId>
 					<artifactId>jackson-core</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-databind</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.fasterxml.jackson.core</groupId>
 					<artifactId>jackson-annotations</artifactId>
@@ -395,7 +399,7 @@
 		<dependency>
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
-			<version>2.12.0</version>
+			<version>2.12.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.itextpdf</groupId>
@@ -438,6 +442,11 @@
 			<artifactId>commons-text</artifactId>
 			<version>1.9</version>
 		</dependency>
+		<dependency>
+		    <groupId>commons-io</groupId>
+		    <artifactId>commons-io</artifactId>
+		    <version>2.11.0</version>
+		</dependency>
 	</dependencies>
 
 

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/ConceptsService.java b/src/main/java/fr/insee/rmes/bauhaus_services/ConceptsService.java
@@ -44,7 +44,7 @@ public interface ConceptsService {
 
 	public void setConceptsValidation(String body) throws  RmesException ;
 
-	public Response getConceptExport(String id, String acceptHeader) throws RmesException;
+	public Response exportConcept(String id, String acceptHeader) throws RmesException;
 
 	public boolean setConceptSend(String id, String body) throws  RmesException ;
 

diff --git a/src/main/java/fr/insee/rmes/bauhaus_services/OperationsService.java b/src/main/java/fr/insee/rmes/bauhaus_services/OperationsService.java
@@ -32,6 +32,8 @@ public interface OperationsService {
 
 	String createFamily(String body) throws RmesException;
 
+	String getSeriesWithReport(String id) throws RmesException;
+
 	/******************************************************************************************
 	 * SERIES
 	 * *******************************************************************************************/