# Conflicts:
#	provider/dataset-gcp/pom.xml

override spring mvc dependencies from parent pom

See merge request !238

commit 113989df 
Author: David Meng <xlmeng@amazon.com> 
Date: Tue Aug 09 2022 14:41:00 GMT-0500 (Central Daylight Time) 

    Correct the attribute name to "PreloadFilePath"

Azure EDS Contribution

See merge request !218

upgrade jackson-databind version

See merge request !233

spring-webmvc upgrade

See merge request !228

[ci skip]

upgrade version to '0.16.0-rc1'

See merge request !225

Update surefire plugin to version 3.0.0-M3

See merge request !229

commit 85c4032f 
Author: Morris Estepa <estepamo@amazon.com> 
Date: Thu Jul 28 2022 16:52:20 GMT-0500 (Central Daylight Time) 

    undo unneeded change


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

    upgrade spring-webmvc

commit 85c4032f 
Author: Morris Estepa <estepamo@amazon.com> 
Date: Thu Jul 28 2022 16:52:20 GMT-0500 (Central Daylight Time) 

    undo unneeded change


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

    upgrade spring-webmvc

Ibm spring security version fix

See merge request !227

MSCOSDU-127: update manifests

See merge request !226

commit 2a22ff8b 
Author: David Meng <xlmeng@amazon.com> 
Date: Tue Jul 19 2022 10:35:15 GMT-0400 (Eastern Daylight Time) 

    Rename the field to avoid shadowing the parent class field; add an assertion to the test case

Merge branch 'azure-eds-contribution' of community.opengroup.org:osdu/platform/system/dataset into azure-eds-contribution

# Conflicts:
#	provider/dataset-azure/src/test/java/org/opengroup/osdu/dataset/provider/azure/config/OsduDatasetKindConfigTest.java

GONRG-5228: Added .dockerignore and .gitattributes

See merge request !219

# Conflicts:
#	.gitlab-ci.yml

fix npe when storage responds with an error

See merge request !214

Implement int tests for Anthos environment

See merge request !215