Skip to content

Commit

Permalink
Merge pull request #215 from InseeFr/acceptance
Browse files Browse the repository at this point in the history 
Change to version 3.0.17
  • Loading branch information
@alicela
alicela authored Mar 16, 2022
2 parents 583bf6a + 44f88f7 commit 0ef2e3f
Show file tree
Hide file tree
Showing 22 changed files with 1,327 additions and 109 deletions.
3 changes: 3 additions & 0 deletions bauhaus-back-changeLog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
3.0.17 : - Back : Passage à Java 11
- Front : mise à jour des dépendances
- Ajout de la publication d'une nomenclature
3.0.16 : - Front : Correction d'un problème de chargement lors de la modification d'un rapport qualité
3.0.15 : - Correctif de la boucle infinie à l'affichage des séries (opStat - front)
- Correctif sur les concepts (top concept)
Expand Down
175 changes: 144 additions & 31 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>fr.insee.rmes</groupId>
<artifactId>Bauhaus-BO</artifactId>
<packaging>war</packaging>
<version>3.0.16</version>
<version>3.0.17</version>
<name>Bauhaus-Back-Office</name>
<description>Back-office services for Bauhaus</description>
<url>https://github.com/InseeFr/Bauhaus-Back-Office</url>
Expand Down Expand Up @@ -45,6 +45,7 @@
<spring.version>5.3.14</spring.version>
<spring.security.version>5.6.1</spring.security.version>
<log4j2.version>2.17.1</log4j2.version>
<xdocreport.version>2.0.3</xdocreport.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>
Expand Down Expand Up @@ -92,11 +93,23 @@
<artifactId>zt-zip</artifactId>
<version>1.14</version>
<type>jar</type>
<!-- <exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions> -->
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
<!-- <exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions> -->
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
Expand All @@ -120,13 +133,44 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<!-- <exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion> -->
</exclusions>
</dependency>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0-RC2</version>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
<scope>runtime</scope>
<!-- <exclusions>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions> -->
</dependency>
<!-- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency> -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand All @@ -135,11 +179,7 @@
</dependency>

<!-- Runtime, com.sun.xml.bind module -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring5</artifactId>
Expand Down Expand Up @@ -251,6 +291,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>com.jayway.restassured</groupId>
<artifactId>xml-path</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -299,12 +343,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j18-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<groupId>javax.servlet</groupId><!-- Used by Log4jServletContainerInitializer -->
<artifactId>javax.servlet-api</artifactId>
<version>4.0.0</version>
<scope>provided</scope>
Expand All @@ -322,6 +365,14 @@
</artifactId>
<groupId>org.glassfish.jersey.containers</groupId>
</exclusion>
<!-- <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion> -->
</exclusions>
</dependency>
<dependency>
Expand All @@ -335,17 +386,33 @@
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-http</artifactId>
<version>${rdf4j.version}</version>
<!-- <exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions> -->
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryresultio-sparqljson</artifactId>
<version>${rdf4j.version}</version>
<!-- <exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions> -->
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160810</version>
<version>20211205</version>
</dependency>


Expand All @@ -362,16 +429,22 @@
</exclusions>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
<version>1.1</version>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>2.0.3</version>
</dependency>

<!-- SAXON FOR XSLT -->
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>10.0</version>
<version>11.1.1</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- FREEMARKER (for queries) -->
Expand All @@ -384,56 +457,96 @@
<dependency>
<groupId>fr.opensagres.xdocreport</groupId>
<artifactId>fr.opensagres.xdocreport.document.odt</artifactId>
<version>2.0.1</version>
<version>${xdocreport.version}</version>
</dependency>
<dependency>
<groupId>fr.opensagres.xdocreport</groupId>
<artifactId>fr.opensagres.xdocreport.template.freemarker</artifactId>
<version>2.0.1</version>
<version>${xdocreport.version}</version>
</dependency>
<dependency>
<groupId>fr.opensagres.xdocreport</groupId>
<artifactId>fr.opensagres.xdocreport.converter.odt.odfdom</artifactId>
<version>2.0.1</version>
<version>${xdocreport.version}</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
</exclusion>
</exclusions>
</dependency> -->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13</version>
<version>5.5.13.2</version>
</dependency>

<!-- https://mvnrepository.com/artifact/jdom/jdom -->
<dependency>
<!-- <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
</dependency>

</dependency> -->
<!-- <dependency>
<groupId>fr.insee.igesa</groupId>
<artifactId>igesa-xml-beans</artifactId>
<version>2.0</version>
</dependency> -->


<!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.14.2</version>
<version>1.14.3</version>
</dependency>

<!-- https://mvnrepository.com/artifact/jaxen/jaxen -->
<!-- Used for LDAP connexion -->
<dependency>
<!-- <dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.1</version>
</dependency>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
</exclusions>
</dependency> -->

<!-- XHTML to Markdown parser -->
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
<version>0.50.42</version>
<version>0.64.0</version>
</dependency>


Expand Down Expand Up @@ -466,8 +579,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>

Expand Down
Loading

0 comments on commit 0ef2e3f

Please sign in to comment.