Merging Delta between Azure and OSDU Code

Ayushi Srivastavarequested to merge
aysriva/adme-osdu-delta into master

crs-catalog-core/pom.xml

  • Updated commons-beanutils and Jetty versions

pom.xml (Root POM)

  • Updated Spring Boot, Spring Framework, and Spring Security to latest versions
  • Security Fix: Added commons-lang3 3.18.0 override to fix CVE-2025-48924 (uncontrolled recursion vulnerability)
  • Updated logging and JSON dependencies

provider/crs-catalog-azure/crs-catalog-aks/pom.xml

  • Removed unused netty.version property
  • Added log4j exclusion to prevent logging conflicts
  • Added Spring Boot Actuator and Micrometer Prometheus dependencies for monitoring

provider/crs-catalog-azure/crs-catalog-aks/src/main/resources/application.properties

  • Enabled graceful shutdown with 30-second timeout
  • Added monitoring configuration with management server on port 8081
  • Exposed health, info, and prometheus endpoints

testing/catalog_test_azure/jwt_client.py

  • Added logging support
  • Enhanced authentication to support INTEGRATION_TESTER_ACCESS_TOKEN environment variable
  • Added fallback to SPN-based token generation when environment variable is not set
Edited by Ayushi Srivastava

Merge request reports