chore: update to spring-boot 2.7 latest + javax.xml.bind change to ja…

…karta
GIP-RECIA · Sep 23, 2024 · 93d5b93 · 93d5b93
1 parent 782e1de
commit 93d5b93
Show file tree

Hide file tree

Showing 24 changed files with 100 additions and 97 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.4.1</version>
+    <version>2.7.18</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
   <groupId>fr.recia.pronote.ws</groupId>
@@ -39,16 +39,11 @@
 
   <dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.17.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
-            <version>2.17.2</version>
-        </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.2</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -77,6 +72,14 @@
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>

diff --git a/src/main/java/fr/recia/pronote/ws/model/conteneurimportchiffre/ImportChiffre.java b/src/main/java/fr/recia/pronote/ws/model/conteneurimportchiffre/ImportChiffre.java
@@ -26,14 +26,14 @@
 import java.io.Serializable;
 import java.time.ZonedDateTime;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import fr.recia.pronote.ws.model.util.ZonedDateTimeAdapter;

diff --git a/src/main/java/fr/recia/pronote/ws/model/conteneurimportchiffre/ObjectFactory.java b/src/main/java/fr/recia/pronote/ws/model/conteneurimportchiffre/ObjectFactory.java
@@ -23,7 +23,7 @@
 
 package fr.recia.pronote.ws.model.conteneurimportchiffre;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**

diff --git a/src/main/java/fr/recia/pronote/ws/model/conteneurimportchiffre/package-info.java b/src/main/java/fr/recia/pronote/ws/model/conteneurimportchiffre/package-info.java
@@ -20,8 +20,8 @@
 // Généré le : 2020.06.22 à 05:48:27 PM CEST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.index-education.com/containeurimportchiffreV1",
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.index-education.com/containeurimportchiffreV1",
         elementFormDefault = XmlNsForm.QUALIFIED, attributeFormDefault = XmlNsForm.UNQUALIFIED)
 package fr.recia.pronote.ws.model.conteneurimportchiffre;
 
-import javax.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlNsForm;
diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Civilite.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Civilite.java
@@ -15,10 +15,10 @@
  */
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Civilites.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Civilites.java
@@ -18,10 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Eleve.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Eleve.java
@@ -18,11 +18,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Eleves.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Eleves.java
@@ -18,10 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Etablissement.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Etablissement.java
@@ -15,10 +15,10 @@
  */
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Etablissements.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Etablissements.java
@@ -18,10 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/EtablissementsGeres.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/EtablissementsGeres.java
@@ -18,11 +18,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Nomenclatures.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Nomenclatures.java
@@ -15,10 +15,10 @@
  */
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/ObjectFactory.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/ObjectFactory.java
@@ -23,7 +23,7 @@
 
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/PartenaireIndex.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/PartenaireIndex.java
@@ -25,14 +25,14 @@
 
 import java.time.ZonedDateTime;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import fr.recia.pronote.ws.model.util.ZonedDateTimeAdapter;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Personnel.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Personnel.java
@@ -15,10 +15,10 @@
  */
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Personnels.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Personnels.java
@@ -18,10 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Professeur.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Professeur.java
@@ -15,11 +15,11 @@
  */
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Professeurs.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Professeurs.java
@@ -18,10 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Responsable.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Responsable.java
@@ -15,11 +15,11 @@
  */
 package fr.recia.pronote.ws.model.rapprochementsso;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Responsables.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/Responsables.java
@@ -18,10 +18,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

diff --git a/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/package-info.java b/src/main/java/fr/recia/pronote/ws/model/rapprochementsso/package-info.java
@@ -20,5 +20,5 @@
 // Généré le : 2020.06.22 à 05:46:06 PM CEST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.index-education.com/rapprochementssoV2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.index-education.com/rapprochementssoV2.0", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package fr.recia.pronote.ws.model.rapprochementsso;
diff --git a/src/main/java/fr/recia/pronote/ws/model/util/ZonedDateTimeAdapter.java b/src/main/java/fr/recia/pronote/ws/model/util/ZonedDateTimeAdapter.java
@@ -20,7 +20,7 @@
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class ZonedDateTimeAdapter extends XmlAdapter<String, ZonedDateTime> {
 

diff --git a/src/main/java/fr/recia/pronote/ws/service/PronoteExportServiceImpl.java b/src/main/java/fr/recia/pronote/ws/service/PronoteExportServiceImpl.java
@@ -48,7 +48,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
 import fr.recia.pronote.ws.config.bean.AppIndexEducationProperties;
 import fr.recia.pronote.ws.dao.ILdapDao;
 import fr.recia.pronote.ws.model.conteneurimportchiffre.ImportChiffre;
@@ -126,7 +126,7 @@ public ImportChiffre getPronoteExport(final String idEtablissement) throws IOExc
 
         // set XmlMapper to transform object to XML
         XmlMapper xmlMapper = new XmlMapper();
-        xmlMapper.registerModule(new JaxbAnnotationModule());
+        xmlMapper.registerModule(new JakartaXmlBindAnnotationModule());
         xmlMapper.configure(ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true );
         xmlMapper.configure(SerializationFeature.INDENT_OUTPUT, true );
 

diff --git a/src/main/java/fr/recia/pronote/ws/web/rest/PronoteAPIResource.java b/src/main/java/fr/recia/pronote/ws/web/rest/PronoteAPIResource.java
@@ -31,7 +31,7 @@
 
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
 import fr.recia.pronote.ws.model.conteneurimportchiffre.ImportChiffre;
 import fr.recia.pronote.ws.service.PronoteExportService;
 import fr.recia.pronote.ws.service.util.XmlValidatorImpl;
@@ -95,7 +95,7 @@ public ResponseEntity<byte[]> getFilePronoteExport(@PathVariable String uai, Htt
 
 			// set XmlMapper to transform object to XML
 			XmlMapper xmlMapper = new XmlMapper();
-			xmlMapper.registerModule(new JaxbAnnotationModule());
+			xmlMapper.registerModule(new JakartaXmlBindAnnotationModule());
 			xmlMapper.configure(ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true );
 
 			final String xmlContent = xmlMapper.writeValueAsString(ic);
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ @@
     package fr.recia.pronote.ws.model.conteneurimportchiffre;
-    import javax.xml.bind.annotation.XmlRegistry;
+    import jakarta.xml.bind.annotation.XmlRegistry;
     /**
@@ Expand Down @@