Skip to content
Snippets Groups Projects
Commit 40136f06 authored by Derek Hudson's avatar Derek Hudson
Browse files

Merge branch 'aws-upgrade-core-lib' into 'master' 

Upgraded Core Common and AWS Core libraries.

See merge request !537
parents ac7218ae 3e3f384f
No related branches found
No related tags found
1 merge request!537Upgraded Core Common and AWS Core libraries.
Pipeline #287390 failed
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: publish
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 76 deletions
NOTICE
+ 3
− 7
View file @ 40136f06
......@@ -67,14 +67,13 @@ The following software have components provided under the terms of this license:
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Cloud Key Management Service (KMS) API v1-rev20240903-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Cloud Key Management Service (KMS) API v1-rev20240918-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Commons Digester (from http://commons.apache.org/digester/)
- Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
- Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax)
- GAX (Google Api eXtensions) for Java (HTTP JSON) (from <https://repo1.maven.org/maven2/com/google/api/gax-httpjson>, https://repo1.maven.org/maven2/com/google/api/gax-httpjson)
- GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc)
- GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
......@@ -110,7 +109,6 @@ The following software have components provided under the terms of this license:
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSONassert (from http://github.com/skyscreamer/yoga, https://github.com/skyscreamer/JSONassert)
- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec)
- JSpecify annotations (from http://jspecify.org/)
- Jackson 2 extensions to the Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client-jackson2)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310, https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
......@@ -269,7 +267,6 @@ The following software have components provided under the terms of this license:
- java-cloudant (from https://cloudant.com)
- javatuples (from http://www.javatuples.org)
- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250)
- javax.inject (from http://code.google.com/p/atinject/, https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- jose4j (from https://bitbucket.org/b_c/jose4j/)
- json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath)
- micrometer-commons (from https://github.com/micrometer-metrics/micrometer)
......@@ -308,7 +305,6 @@ BSD-2-Clause
The following software have components provided under the terms of this license:
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Jodd Util (from https://util.jodd.org)
......@@ -328,7 +324,6 @@ The following software have components provided under the terms of this license:
- AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax)
- GAX (Google Api eXtensions) for Java (HTTP JSON) (from <https://repo1.maven.org/maven2/com/google/api/gax-httpjson>, https://repo1.maven.org/maven2/com/google/api/gax-httpjson)
- GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc)
- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials)
......@@ -491,7 +486,6 @@ ISC
========================================================================
The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Spring Security - Core (from http://spring.io/spring-security, https://repo1.maven.org/maven2/org/springframework/security/spring-security-core, https://spring.io/projects/spring-security, https://spring.io/spring-security)
========================================================================
......@@ -514,6 +508,7 @@ The following software have components provided under the terms of this license:
- JBoss Threads (from <https://repo1.maven.org/maven2/org/jboss/threads/jboss-threads>, https://repo1.maven.org/maven2/org/jboss/threads/jboss-threads)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
========================================================================
......@@ -522,6 +517,7 @@ MIT
The following software have components provided under the terms of this license:
- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
......
notification-core-plus/pom.xml
+ 4
− 32
View file @ 40136f06
......@@ -62,17 +62,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-plus-common-lib</artifactId>
<version>0.27.0-rc1</version>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
<version>0.27.0-rc3</version>
</dependency>
<dependency>
......@@ -84,36 +74,17 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-oqm-core</artifactId>
<version>0.26.0</version>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
<version>0.27.0-rc2</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>apd-core</artifactId>
<version>0.27.0-rc1</version>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
<version>0.27.0-rc2</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>3.2.3</version>
</dependency>
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>6.3.0.RELEASE</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-json-classic</artifactId>
......@@ -164,6 +135,7 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
......
notification-core/pom.xml
+ 2
− 2
View file @ 40136f06
......@@ -30,7 +30,7 @@
</parent>
<properties>
<undertow.version>2.3.15.Final</undertow.version>
<undertow.version>2.3.17.Final</undertow.version>
<woodstox-core.version>5.4.0</woodstox-core.version>
<google-oauth-client.version>1.33.3</google-oauth-client.version>
<google-api-client.version>1.33.2</google-api-client.version>
......@@ -55,7 +55,7 @@
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common-spring6</artifactId>
<artifactId>os-core-common</artifactId>
</dependency>
<dependency>
......
pom.xml
+ 6
− 6
View file @ 40136f06
......@@ -25,12 +25,12 @@
<java.version>17</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<os-core-common-spring6.version>0.27.0-rc1</os-core-common-spring6.version>
<os-core-common.version>3.0.0</os-core-common.version>
<log4j2.version>2.23.1</log4j2.version>
<json-smart.version>2.5.0</json-smart.version>
<openapi.version>2.5.0</openapi.version>
<spring-framework-version>6.1.6</spring-framework-version>
<spring-boot.version>3.3.1</spring-boot.version>
<openapi.version>2.6.0</openapi.version>
<spring-framework-version>6.1.13</spring-framework-version>
<spring-boot.version>3.3.4</spring-boot.version>
<netty.version>4.1.106.Final</netty.version>
<snakeyaml-version>2.0</snakeyaml-version>
<xnio-api.version>3.8.15.Final</xnio-api.version>
......@@ -73,8 +73,8 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common-spring6</artifactId>
<version>${os-core-common-spring6.version}</version>
<artifactId>os-core-common</artifactId>
<version>${os-core-common.version}</version>
</dependency>
<!-- overriding packages with known vulnerabilities -->
......
provider/notification-aws/pom.xml
+ 2
− 2
View file @ 40136f06
......@@ -69,7 +69,7 @@
<artifactId>spring-beans</artifactId>
</exclusion>
</exclusions>
<version>0.27.0-rc3</version>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
......@@ -160,4 +160,4 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
provider/notification-azure/pom.xml
+ 2
− 2
View file @ 40136f06
......@@ -92,8 +92,8 @@
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common-spring6</artifactId>
<version>${os-core-common-spring6.version}</version>
<artifactId>os-core-common</artifactId>
<version>${os-core-common.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
provider/notification-gc/pom.xml
+ 2
− 25
View file @ 40136f06
......@@ -59,21 +59,10 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
<version>1.127.2</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gc-spring6</artifactId>
<version>0.26.0</version>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
<artifactId>core-lib-gc</artifactId>
<version>0.27.0-rc8</version>
</dependency>
<dependency>
......@@ -90,14 +79,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>3.2.3</version>
</dependency>
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>6.3.0.RELEASE</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-json-classic</artifactId>
......@@ -130,11 +112,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
......
testing/notification-test-baremetal/src/test/java/org/opengroup/osdu/notification/api/TestPushEndpointGsa.java
+ 9
− 0
View file @ 40136f06
......@@ -26,6 +26,7 @@ import com.sun.jersey.api.client.ClientResponse;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
......@@ -68,6 +69,14 @@ public class TestPushEndpointGsa {
@After
public void deleteResource() throws Exception {
if (Objects.isNull(subscriptionService)) {
Map<String, String> headers = new HashMap<>();
headers.put(DpsHeaders.DATA_PARTITION_ID, System.getProperty(OSDU_TENANT, System.getenv(OSDU_TENANT)));
headers.put(DpsHeaders.AUTHORIZATION, testUtils.getOpsToken());
DpsHeaders dpsHeaders = DpsHeaders.createFromMap(headers);
subscriptionService = factory.create(dpsHeaders);
}
subscriptionService.delete(subscriptionId);
servicesUtils.deleteStorageRecords(3, suffix);
servicesUtils.deleteLegalTag(LEGAL_TAG_NAME);
......
testing/notification-test-baremetal/src/test/java/org/opengroup/osdu/notification/api/TestPushEndpointHMAC.java
+ 9
− 0
View file @ 40136f06
......@@ -24,6 +24,7 @@ import static org.opengroup.osdu.notification.util.Constants.GROUP_ID;
import com.sun.jersey.api.client.ClientResponse;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
......@@ -63,6 +64,14 @@ public class TestPushEndpointHMAC {
@After
public void deleteResource() throws Exception {
if (Objects.isNull(subscriptionService)) {
Map<String, String> headers = new HashMap<>();
headers.put(DpsHeaders.DATA_PARTITION_ID, System.getProperty(OSDU_TENANT, System.getenv(OSDU_TENANT)));
headers.put(DpsHeaders.AUTHORIZATION, testUtils.getOpsToken());
DpsHeaders dpsHeaders = DpsHeaders.createFromMap(headers);
subscriptionService = factory.create(dpsHeaders);
}
subscriptionService.delete(subscriptionId);
servicesUtils.deleteStorageRecords(3, suffix);
servicesUtils.deleteLegalTag(LEGAL_TAG_NAME);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment