[ci skip]

[ci skip]

commit 9c326cec 
Author: AWSReservedSSO_OSDU-Power-User_7d859056df6b352b/xlmeng <AWSReservedSSO_OSDU-Power-User_7d859056df6b352b/xlmeng> 
Date: Mon Oct 03 2022 13:57:41 GMT-0400 (Eastern Daylight Time) 

    Conflicts resolved in the console.

commit 722d96b5 
Author: David Meng <xlmeng@amazon.com> 
Date: Wed Sep 28 2022 15:21:55 GMT-0400 (Eastern Daylight Time) 

    Upgrade Tomcat

[ci skip]

[ci skip]

commit edf4e19b 
Author: Morris Estepa <estepamo@amazon.com> 
Date: Thu Jul 28 2022 17:21:45 GMT-0500 (Central Daylight Time) 

    spring-webmvc upgrade

commit edf4e19b 
Author: Morris Estepa <estepamo@amazon.com> 
Date: Thu Jul 28 2022 17:21:45 GMT-0500 (Central Daylight Time) 

    spring-webmvc upgrade

PBI-6584: Upgrade spring boot dependencies. Spring boot dependencies are inherited from os-common-core.

commit 308950d5 
Author: David Diederich <d.diederich@opengroup.org> 
Date: Wed Feb 02 2022 11:17:32 GMT-0600 (Central Standard Time) 

    Update version of default branch to 0.14.0-SNAPSHOT


commit 22f3bd6c 
Author: David Diederich <d.diederich@opengroup.org> 
Date: Wed Feb 02 2022 04:50:12 GMT-0600 (Central Standard Time) 

    Merge branch 'json_smart_fix' into 'master'

Explicit json-smart dependency

See merge request !274

commit 240cadec 
Author: David Diederich <d.diederich@opengroup.org> 
Date: Tue Feb 01 2022 05:30:00 GMT-0600 (Central Standard Time) 

    Merge branch 'users/Vibhuti/IT_fix' into 'master'

Handle path prefix in elasticsearch url

See merge request !271

commit 80d17f81 
Author: Alok Joshi <AJoshi19@slb.com> 
Date: Tue Feb 01 2022 13:54:43 GMT-0600 (Central Standard Time) 

    update NOTICE


commit b3ed8ea2 
Author: Yunhua Koglin <kogliny@amazon.com> 
Date: Thu Jan 27 2022 13:10:47 GMT-0600 (Central Standard Time) 

    Merge branch 'aws-integration' into 'master'

Merge changes for m10

See merge request !272

commit f70433a6 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 07:38:58 GMT-0600 (Central Standard Time) 

    NOTICE


commit 551b3f66 
Author: Alok Joshi <AJoshi19@slb.com> 
Date: Tue Feb 01 2022 11:42:51 GMT-0600 (Central Standard Time) 

    explicit json-smart dependency


commit 3637a91b 
Author: Karina Cadette <kcadette@amazon.com> 
Date: Thu Jan 27 2022 09:01:43 GMT-0600 (Central Standard Time) 

    Update NOTICE

commit 45cd65ff 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 06:45:36 GMT-0600 (Central Standard Time) 

    removed logs


commit f9e75dde 
Author: Karina Cadette <kcadette@amazon.com> 
Date: Wed Jan 26 2022 08:41:33 GMT-0600 (Central Standard Time) 

    Update NOTICE

commit d840af08 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 06:33:49 GMT-0600 (Central Standard Time) 

    removed logs


commit 947f69af 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 05:29:57 GMT-0600 (Central Standard Time) 

    Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/indexer-service into users/Vibhuti/IT_fix


commit 78107b98 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 04:42:33 GMT-0600 (Central Standard Time) 

    null check


commit 85b1d669 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 03:08:24 GMT-0600 (Central Standard Time) 

    debug


commit 8a798f36 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 02:14:26 GMT-0600 (Central Standard Time) 

    debug


commit 2ae76e8b 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 01:36:12 GMT-0600 (Central Standard Time) 

    debug


commit 7d62b216 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 01:00:29 GMT-0600 (Central Standard Time) 

    debug


commit 7916e7dd 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 00:08:53 GMT-0600 (Central Standard Time) 

    debug


commit 4ace9795 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Fri Jan 28 2022 00:03:17 GMT-0600 (Central Standard Time) 

    debug


commit 4805843f 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Thu Jan 27 2022 23:38:28 GMT-0600 (Central Standard Time) 

    debug


commit a4a611cc 
Author: Sabarish K R E <sabarishk@microsoft.com> 
Date: Thu Jan 27 2022 08:35:55 GMT-0600 (Central Standard Time) 

    correction in port


commit 32c38db9 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Thu Jan 27 2022 07:07:13 GMT-0600 (Central Standard Time) 

    initial commit


commit 80b2807f 
Author: Vibhuti Sharma <vibsharm@microsoft.com> 
Date: Thu Jan 27 2022 07:03:44 GMT-0600 (Central Standard Time) 

    initial commit

This will pick up the latest log4j 2.17.1 change, addressing CVE-2021-44832

These updates apply version 2.17, addressing CVE-2021-45105

The SNAPSHOT versions are not preserved in the package registry, and we can't be sure about what the build will be if we use
these. By using release versions, the build is more predictable and reliable