Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop dans main #69

Merged
merged 37 commits into from
Jan 23, 2024
Merged

Merge develop dans main #69

merged 37 commits into from
Jan 23, 2024

Conversation

pierre-maraval
Copy link
Collaborator

No description provided.

jvk88511334 and others added 30 commits December 8, 2023 11:36
…sues d'une requete DAT + Modification du Provider Service
…ovider sur dat2ppn

     - correction du Dockerfile
     - ajout d'un contrôle dans le ws printIdentifier2Ppn() dans KbartController.java
     - adaptation des TU
…us-pris-en-compte

FIX : CDE-352-cas-algo-score-6-nest-plus-pris-en-compte :
…odification-du-web-service-dat-2-ppn

# Conflicts:
#	sudoc-webservices/src/main/java/fr/abes/convergence/sudocws/controller/SudocController.java
     - modification du nom de l'application dans SudocWebservicesApplication.java et pom.xml
…ice-dat-2-ppn' into CDE-343-modification-du-web-service-dat-2-ppn
…ice-dat-2-ppn

CDE-96 Vérification du provider sur dat2ppn
     - correctif TU SudocControllerTest.java
…ice-dat-2-ppn

FIX : CDE-96 Vérification du provider sur dat2ppn
Ajout de la dépendance spring actuator pour obtenir des métriques suite a ws down
     - intégration du controller KbartController.java dans SudocController.java et adaptation des TU
     - suppression du controller KbartController.java dans SudocController.java
     - suppression de KbartControllerTest.java
     - adaptation des TU
     - suppression du controller KbartController.java dans SudocController.java
     - suppression de KbartControllerTest.java
     - adaptation des TU
@EryneKL EryneKL merged commit 860892e into main Jan 23, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants