diff --git a/.fossa.yml b/.fossa.yml index fc8ae4dc8d6c0b6514be13bf125a761f705e3900..2a2c0a8a01f4dea0d6b188ffb214f391f6417fde 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -32,7 +32,3 @@ analyze: type: mvn target: provider/partition-gcp/pom.xml path: . - - name: partition-reference - type: mvn - target: provider/partition-reference/pom.xml - path: . diff --git a/NOTICE b/NOTICE index 61ed43e1b833d149107eca82bd6888168088fa24..21bce02636fe35806aa1d35d50cce4dde409af4c 100644 --- a/NOTICE +++ b/NOTICE @@ -368,10 +368,12 @@ The following software have components provided under the terms of this license: - Cloud Key Management Service (KMS) API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Cloud Key Management Service (KMS) API v1-rev20220407-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Cloud Key Management Service (KMS) API v1-rev20220617-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) +- Cloud Key Management Service (KMS) API v1-rev20220701-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Cloud Storage JSON API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - Cloud Storage JSON API v1-rev20220705-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20220705-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) - CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava) - Cobertura (from http://cobertura.sourceforge.net) - Cobertura Limited Runtime (from http://cobertura.sourceforge.net) @@ -1195,8 +1197,6 @@ The following software have components provided under the terms of this license: ======================================================================== unknown ======================================================================== -The following software have components provided under the terms of this license: - - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html) - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Checker Qual (from https://checkerframework.org) diff --git a/partition-core/pom.xml b/partition-core/pom.xml index d9d3ee2cf1b215ecb40843bdc3b8912d495699e0..7024b6e540308e281937ae974a0f9634e9d8c0a0 100644 --- a/partition-core/pom.xml +++ b/partition-core/pom.xml @@ -40,6 +40,7 @@ <maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version> <maven_failsafe_plugin_version>3.0.0-M4</maven_failsafe_plugin_version> <jackson-databind.version>2.13.2.2</jackson-databind.version> + <spring-webmvc.version>5.3.22</spring-webmvc.version> </properties> <dependencyManagement> @@ -62,6 +63,11 @@ <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-common</artifactId> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring-webmvc.version}</version> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index 94913c4e4001def001b99f0360cfebc5d0fe3910..e348caff5c2f9545e0059893db04f05d9e5a4ce5 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -33,6 +33,7 @@ <properties> <aws.version>1.11.1018</aws.version> <deployment.environment>dev</deployment.environment> + <spring-webmvc.version>5.3.22</spring-webmvc.version> </properties> <dependencyManagement> @@ -99,6 +100,11 @@ </dependency> <!-- Third party Apache 2.0 license packages --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring-webmvc.version}</version> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index c3a0de1dbfe2771e29efb5b37a87f736f15f93c2..2b6831eb9dac7872179c9c320dc40dbb83d6102d 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -18,6 +18,7 @@ <junit.version>4.12</junit.version> <mockito.version>2.25.0</mockito.version> <powermock.version>2.0.2</powermock.version> + <spring-webmvc.version>5.3.22</spring-webmvc.version> </properties> <dependencyManagement> @@ -75,6 +76,11 @@ <artifactId>core-lib-azure</artifactId> <version>${osdu.corelibazure.version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring-webmvc.version}</version> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> diff --git a/provider/partition-gcp/pom.xml b/provider/partition-gcp/pom.xml index 5488c01da393c7983e25c3dbee35574054947e0c..cb535ef99abb24ea70c84811125523724a4dac28 100644 --- a/provider/partition-gcp/pom.xml +++ b/provider/partition-gcp/pom.xml @@ -76,6 +76,11 @@ <artifactId>jackson-annotations</artifactId> <version>2.13.2</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>5.3.22</version> + </dependency> <!-- Testing packages --> <dependency> diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml index efb4b4d59bb05c841da589031d0289e109bc3596..7682b032ec51985d4b016cf5a3fc28b99dddc53e 100644 --- a/provider/partition-ibm/pom.xml +++ b/provider/partition-ibm/pom.xml @@ -20,6 +20,7 @@ <properties> <version.keycloak>9.0.2</version.keycloak> + <spring-webmvc.version>5.3.22</spring-webmvc.version> </properties> <dependencyManagement> @@ -51,6 +52,11 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> </dependency> --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring-webmvc.version}</version> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId>