Code

chore: upgrade to spring 6#18314

Code

Merged

david-mackessy merged 138 commits intomasterdhis2/dhis2-core:masterfrom viet-spring-6dhis2/dhis2-core:viet-spring-6Copy head branch name to clipboardOct 3, 2024

+2,601-1,535

Commits

Commits on Aug 8, 2024

• chore: upgrade spring 6

  vietnguyen

  committed
  ddd2212

  Copy full SHA for ddd2212

• replace httpclient with httpclient5

  vietnguyen

  committed
  06ae723

  Copy full SHA for 06ae723

• fix: setReadTimeOut is removed

  vietnguyen

  committed
  d26ca83

  Copy full SHA for d26ca83

Commits on Aug 9, 2024

• fix use jakarta adapter for ActiveMQ lib

  vietnguyen

  committed
  6f82f4b

  Copy full SHA for 6f82f4b

• fix HttpStatusCode

  vietnguyen

  committed
  4fc1622

  Copy full SHA for 4fc1622

• upgrade spring-security to 6.3.1

  vietnguyen

  committed
  a3347ce

  Copy full SHA for a3347ce

Commits on Aug 11, 2024

• upgrade jakarta-persistence-api 3.2.0

  vietnguyen

  committed
  32c3511

  Copy full SHA for 32c3511

• replace hibernate-types with hypersistence-utils

  vietnguyen

  committed
  a4ee47a

  Copy full SHA for a4ee47a

• Fix CommonsMultipartFile

  vietnguyen

  committed
  d12f9ec

  Copy full SHA for d12f9ec

Commits on Aug 14, 2024

• fix micrometer-hibernate

  vietnguyen

  committed
  bb9b437

  Copy full SHA for bb9b437

• exclude hibernate-core dependency

  vietnguyen

  committed
  6c8b9e7

  Copy full SHA for 6c8b9e7

• fix jasperreport jakarta

  vietnguyen

  committed
  c161d97

  Copy full SHA for c161d97

• upgrade tomcat-embed-core to 10.1.28

  vietnguyen

  committed
  68a43d3

  Copy full SHA for 68a43d3

• upgrade jetty to 12.0.12

  vietnguyen

  committed
  62f54b8

  Copy full SHA for 62f54b8

• minor fix

  vietnguyen

  committed
  d2ed972

  Copy full SHA for d2ed972

Commits on Aug 15, 2024

• Add DhisPersistenceUnitManager and DhisPersistenceUnitInfo

  vietnguyen

  committed
  f0b1f3c

  Copy full SHA for f0b1f3c

• fix programruleaction.notificationtemplateid type in database

  vietnguyen

  committed
  6db1a6d

  Copy full SHA for 6db1a6d

• fix spring security conflicts

  vietnguyen

  committed
  df14a7c

  Copy full SHA for df14a7c

• fix prometheus conflicts

  vietnguyen

  committed
  192aba4

  Copy full SHA for 192aba4

• remove redundant class

  vietnguyen

  committed
  6b758f5

  Copy full SHA for 6b758f5

• merge from master

  vietnguyen

  committed
  66e47f2

  Copy full SHA for 66e47f2

• merge from master

  vietnguyen

  committed
  94c21c2

  Copy full SHA for 94c21c2

• merge from master

  vietnguyen

  committed
  b9600cd

  Copy full SHA for b9600cd

• Merge branch 'master' into viet-spring-6

  vietnguyen

  authored
  78fd272

  Copy full SHA for 78fd272

• remove redundant hibernate config

  vietnguyen

  committed
  7452f48

  Copy full SHA for 7452f48

• fix HttpUtils

  vietnguyen

  committed
  829dac8

  Copy full SHA for 829dac8

Commits on Aug 16, 2024

• fix maven dependency issues

  vietnguyen

  committed
  d11489c

  Copy full SHA for d11489c

• fix maven dependency issues

  vietnguyen

  committed
  793d472

  Copy full SHA for 793d472

Commits on Aug 20, 2024

• fix BulkSmsGatewayTest

  vietnguyen

  committed
  77b6fd3

  Copy full SHA for 77b6fd3

• merge from master

  vietnguyen

  committed
  4e5fb2c

  Copy full SHA for 4e5fb2c

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  8f8f936

  Copy full SHA for 8f8f936

Commits on Aug 21, 2024

• fix TrackedEntityAttributeStoreTest

  vietnguyen

  committed
  cd9fe59

  Copy full SHA for cd9fe59

• revert javax package fix

  vietnguyen

  committed
  0171d58

  Copy full SHA for 0171d58

Commits on Aug 22, 2024

• fix cors config for spring security 6

  vietnguyen

  committed
  458c92a

  Copy full SHA for 458c92a

• merge from master

  vietnguyen

  committed
  98936eb

  Copy full SHA for 98936eb

• merge from master

  vietnguyen

  committed
  2fa27d9

  Copy full SHA for 2fa27d9

• clear cache

  vietnguyen

  committed
  5d02c82

  Copy full SHA for 5d02c82

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  4dc6f6d

  Copy full SHA for 4dc6f6d

Commits on Aug 23, 2024

• fix setUseTrailingSlashMatch issue

  vietnguyen

  committed
  bcad1ef

  Copy full SHA for bcad1ef

• merge from master

  vietnguyen

  committed
  b5d2b77

  Copy full SHA for b5d2b77

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  aac4163

  Copy full SHA for aac4163

• fix CustomRequestMappingHandlerMapping

  vietnguyen

  committed
  4c16f7a

  Copy full SHA for 4c16f7a

• fix ContentNegotiationManager in test

  vietnguyen

  committed
  cba4b37

  Copy full SHA for cba4b37

Commits on Aug 24, 2024

• fix: hibernate configs

  vietnguyen

  committed
  165107e

  Copy full SHA for 165107e

Commits on Aug 26, 2024

• fix messageSender test

  vietnguyen

  committed
  6c19034

  Copy full SHA for 6c19034

• merge from masterwq

  vietnguyen

  committed
  db575bc

  Copy full SHA for db575bc

• merge from master

  vietnguyen

  committed
  649c7b9

  Copy full SHA for 649c7b9

• fix HibernateApiTrackedEntityAuditStorewq

  vietnguyen

  committed
  cc4401c

  Copy full SHA for cc4401c

Commits on Aug 29, 2024

• fix messageSender in test config

  vietnguyen

  committed
  50fd97f

  Copy full SHA for 50fd97f

• merge from master

  vietnguyen

  committed
  6b63a29

  Copy full SHA for 6b63a29

• merge from master

  vietnguyen

  committed
  c62b7a3

  Copy full SHA for c62b7a3

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  3029402

  Copy full SHA for 3029402

• fix dataSource bean config

  vietnguyen

  committed
  11b3a5a

  Copy full SHA for 11b3a5a

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  e1b452c

  Copy full SHA for e1b452c

• replace @EnableMethodSecurity

  vietnguyen

  committed
  c118366

  Copy full SHA for c118366

• fix messageSender bean wiring

  vietnguyen

  committed
  5e52317

  Copy full SHA for 5e52317

• fix flyway migration

  vietnguyen

  committed
  879bcce

  Copy full SHA for 879bcce

• fix emailMessageSender wiring

  vietnguyen

  committed
  553e59d

  Copy full SHA for 553e59d

• fix emailMessageSender in test

  vietnguyen

  committed
  c80874f

  Copy full SHA for c80874f

• fix DataApprovalControllerTest

  vietnguyen

  committed
  b8a37e4

  Copy full SHA for b8a37e4

Commits on Sep 9, 2024

• fix MessageSender bean autowire issue

  vietnguyen

  committed
  859553c

  Copy full SHA for 859553c

Commits on Sep 10, 2024

• Merge branch 'master' into viet-spring-6

  vietnguyen

  committed
  bbce4af

  Copy full SHA for bbce4af

• fix merge conflicts

  vietnguyen

  committed
  ac55820

  Copy full SHA for ac55820

• fix code formats

  vietnguyen

  committed
  9fc4224

  Copy full SHA for 9fc4224

• fix maven dependency issue

  vietnguyen

  committed
  7822293

  Copy full SHA for 7822293

• fix merge conflicts

  vietnguyen

  committed
  dc48a60

  Copy full SHA for dc48a60

• fix maven dependency

  vietnguyen

  committed
  847bf43

  Copy full SHA for 847bf43

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  56ff8a2

  Copy full SHA for 56ff8a2

• fix tracker tests

  vietnguyen

  committed
  e0e6c6a

  Copy full SHA for e0e6c6a

• fix NodeService bean injection

  vietnguyen

  committed
  1449452

  Copy full SHA for 1449452

• code format

  vietnguyen

  committed
  2f2930f

  Copy full SHA for 2f2930f

• code format

  vietnguyen

  committed
  df8b01f

  Copy full SHA for df8b01f

Commits on Sep 12, 2024

• Disable test testDeleteWithException

  vietnguyen

  committed
  53e0528

  Copy full SHA for 53e0528

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  169a3fb

  Copy full SHA for 169a3fb

Commits on Sep 18, 2024

• fix test

  vietnguyen

  committed
  483b3ad

  Copy full SHA for 483b3ad

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  b1807ee

  Copy full SHA for b1807ee

• revert debug log

  vietnguyen

  committed
  f44a7cf

  Copy full SHA for f44a7cf

• Merge branch 'master' of github.com:dhis2/dhis2-core into viet-spring-6

  Show description for aa828a9
  netroms

  committed
  aa828a9

  Copy full SHA for aa828a9

• fix: fix ecache issue with DataDimensionTypeUserType

  netroms

  committed
  fbfa326

  Copy full SHA for fbfa326

• Merge remote-tracking branch 'origin/viet-spring-6' into viet-spring-6

  netroms

  committed
  3077573

  Copy full SHA for 3077573

Commits on Sep 19, 2024

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  6e847a9

  Copy full SHA for 6e847a9

• fix jakarta in TrailingSlashInterceptor

  vietnguyen

  committed
  0c5a5aa

  Copy full SHA for 0c5a5aa

• Merge remote-tracking branch 'origin/viet-spring-6' into viet-spring-6

  vietnguyen

  committed
  ca15ac2

  Copy full SHA for ca15ac2

• fix: remove usage of requires_new

  netroms

  committed
  71da0db

  Copy full SHA for 71da0db

• Change tomcat version

  enricocolasante

  committed
  93b67fe

  Copy full SHA for 93b67fe

• fix test

  vietnguyen

  committed
  fd25d8a

  Copy full SHA for fd25d8a

• Merge remote-tracking branch 'origin/viet-spring-6' into viet-spring-6

  vietnguyen

  committed
  883f56c

  Copy full SHA for 883f56c

• fix: revert remove usage of requires_new, except for jobs

  netroms

  committed
  3b5dd64

  Copy full SHA for 3b5dd64

• fix HttpStatusCode

  vietnguyen

  committed
  847ce1f

  Copy full SHA for 847ce1f

• Merge remote-tracking branch 'origin/viet-spring-6' into viet-spring-6

  vietnguyen

  committed
  e8b3eb2

  Copy full SHA for e8b3eb2

• fix deps

  vietnguyen

  committed
  e88c4d6

  Copy full SHA for e88c4d6

Commits on Sep 20, 2024

• fix job update status

  vietnguyen

  committed
  3469eab

  Copy full SHA for 3469eab

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  f49a7a1

  Copy full SHA for f49a7a1

• code format

  vietnguyen

  committed
  a56ed5b

  Copy full SHA for a56ed5b

• fix systemSettings api content-type

  vietnguyen

  committed
  0af49c1

  Copy full SHA for 0af49c1

• code format

  vietnguyen

  committed
  aa91b1b

  Copy full SHA for aa91b1b

• code format

  vietnguyen

  committed
  ae43ff3

  Copy full SHA for ae43ff3

• code format

  vietnguyen

  committed
  98deb11

  Copy full SHA for 98deb11

Commits on Sep 24, 2024

• chore: Fix file resource multipart upload test

  david-mackessy

  committed
  a60cb39

  Copy full SHA for a60cb39

• merge master

  david-mackessy

  committed
  3ae5768

  Copy full SHA for 3ae5768

• chore: fix formatting

  david-mackessy

  committed
  5f5fc5a

  Copy full SHA for 5f5fc5a

Commits on Sep 26, 2024

• fix: wrong charset in content-type headers

  netroms

  committed
  4606f5a

  Copy full SHA for 4606f5a

• Merge branch 'master' of github.com:dhis2/dhis2-core into viet-spring-6

  Show description for 3f7cdb6
  netroms

  committed
  3f7cdb6

  Copy full SHA for 3f7cdb6

• fix: remove merge artifacts

  netroms

  committed
  88a8a87

  Copy full SHA for 88a8a87

• fix: merge artifacts

  netroms

  committed
  4005df1

  Copy full SHA for 4005df1

• Merge branch 'master' of github.com:dhis2/dhis2-core into viet-spring-6

  netroms

  committed
  2999325

  Copy full SHA for 2999325

• fix: fake message sender refactorings

  netroms

  committed
  710be95

  Copy full SHA for 710be95

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  28ddc8c

  Copy full SHA for 28ddc8c

• code format

  vietnguyen

  committed
  2c00821

  Copy full SHA for 2c00821

• fix sonarcloud issue

  vietnguyen

  committed
  fb2466c

  Copy full SHA for fb2466c

• fix sonarcloud issue

  vietnguyen

  committed
  46d8446

  Copy full SHA for 46d8446

Commits on Sep 28, 2024

• Merge branch 'master' of github.com:dhis2/dhis2-core into viet-spring-6

  Show description for b08423f
  netroms

  committed
  b08423f

  Copy full SHA for b08423f

• Merge branch 'master' of github.com:dhis2/dhis2-core into viet-spring-6

  Show description for 4cee535
  netroms

  committed
  4cee535

  Copy full SHA for 4cee535

Commits on Sep 29, 2024

• chore: adjust sms related

  netroms

  committed
  a007887

  Copy full SHA for a007887

• fix: adjust sms test

  netroms

  committed
  538b096

  Copy full SHA for 538b096

• Merge branch 'master' into viet-spring-6

  vietnguyen

  authored
  f6a9c62

  Copy full SHA for f6a9c62

Commits on Oct 1, 2024

• Merge branch 'master' of github.com:dhis2/dhis2-core into viet-spring-6

  Show description for 89ece4f
  netroms

  committed
  89ece4f

  Copy full SHA for 89ece4f

• fix: adjust sms test

  netroms

  committed
  8206f41

  Copy full SHA for 8206f41

• add jobSchedulerService.createThenExecute method

  vietnguyen

  committed
  1e0b0f0

  Copy full SHA for 1e0b0f0

• code format

  vietnguyen

  committed
  5b7feb8

  Copy full SHA for 5b7feb8

• remove entityManager.getReference in HibernateIdentifiableObjectStore

  vietnguyen

  committed
  5ae71b2

  Copy full SHA for 5ae71b2

• fix sonar issues

  vietnguyen

  committed
  8f83b18

  Copy full SHA for 8f83b18

• Merge remote-tracking branch 'origin/master' into viet-spring-6

  vietnguyen

  committed
  9aae708

  Copy full SHA for 9aae708

• fix merge conflicts

  vietnguyen

  committed
  9ea41a9

  Copy full SHA for 9ea41a9

• code format

  vietnguyen

  committed
  48b95a0

  Copy full SHA for 48b95a0

• fix DhisCorsFilter

  vietnguyen

  committed
  ffd5229

  Copy full SHA for ffd5229

• remove interface FakeMessageSender

  vietnguyen

  committed
  0006a14

  Copy full SHA for 0006a14

• fix DhisCorsProcessor

  vietnguyen

  committed
  d8d95ae

  Copy full SHA for d8d95ae

• revert build.sh

  vietnguyen

  committed
  78767b6

  Copy full SHA for 78767b6

Commits on Oct 2, 2024

• Merge branch 'master' into viet-spring-6

  jbee

  authored
  db26043

  Copy full SHA for db26043

• temp amend jenkins dev file for pipeline test

  david-mackessy

  committed
  046c728

  Copy full SHA for 046c728

• update docker build image to use tomcat 10 to test pipeline

  david-mackessy

  committed
  f6573ef

  Copy full SHA for f6573ef

• Merge branch 'master' into viet-spring-6

  david-mackessy

  committed
  07e3edf

  Copy full SHA for 07e3edf

• update root pom to tomcat 10 to test pipeline

  david-mackessy

  committed
  c7c4718

  Copy full SHA for c7c4718

• update jenkins dev to tomcat 10 to test pipeline

  david-mackessy

  committed
  c2dae53

  Copy full SHA for c2dae53

• uncomment code in jenkins dev file after testing

  david-mackessy

  committed
  0e32bd9

  Copy full SHA for 0e32bd9

Commits on Oct 3, 2024

• merge master

  david-mackessy

  committed
  cc6ca79

  Copy full SHA for cc6ca79

• format

  david-mackessy

  committed
  675a262

  Copy full SHA for 675a262