diff --git a/NOTICE b/NOTICE index 2af825b46b6b0259b1ea9eeed6a42c78ac4503d9..67857cd59249bc9e3786d72a9b5e0cbb592b392d 100644 --- a/NOTICE +++ b/NOTICE @@ -32,6 +32,7 @@ The following software have components provided under the terms of this license: - AMQP 1.0 JMS Spring Boot AutoConfiguration (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-autoconfigure) - AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter) +- API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common) - ASM based accessors helper used by json-smart (from https://urielch.github.io/) - AWS Java SDK for AWS Elemental MediaLive (from https://aws.amazon.com/sdkforjava) - AWS Java SDK for AWS KMS (from https://aws.amazon.com/sdkforjava) @@ -86,6 +87,8 @@ The following software have components provided under the terms of this license: - 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 (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) - Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core, https://github.com/googleapis/java-core, https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core) @@ -119,8 +122,8 @@ 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 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-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) - Jackson datatype: Joda (from http://wiki.fasterxml.com/JacksonModuleJoda, https://github.com/FasterXML/jackson-datatype-joda) @@ -194,7 +197,7 @@ The following software have components provided under the terms of this license: - OkHttp Logging Interceptor (from https://github.com/square/okhttp, https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor, https://square.github.io/okhttp/) - OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection, https://square.github.io/okhttp/) - Okio (from https://github.com/square/okio/, https://repo1.maven.org/maven2/com/squareup/okio/okio) -- OpenCensus (from https://github.com/census-instrumentation/opencensus-java) +- OpenCensus (from https://github.com/census-instrumentation/opencensus-java, https://github.com/census-instrumentation/opencensus-proto) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) - PowerMock (from http://www.powermock.org, https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito) - Prometheus Java Simpleclient (from <https://repo1.maven.org/maven2/io/prometheus/simpleclient>, https://repo1.maven.org/maven2/io/prometheus/simpleclient) @@ -272,11 +275,14 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-auth (from https://github.com/grpc/grpc-java) - io.grpc:grpc-context (from https://github.com/grpc/grpc-java) - io.grpc:grpc-core (from https://github.com/grpc/grpc-java) +- io.grpc:grpc-googleapis (from https://github.com/grpc/grpc-java) - io.grpc:grpc-grpclb (from https://github.com/grpc/grpc-java) - io.grpc:grpc-netty-shaded (from https://github.com/grpc/grpc-java) - io.grpc:grpc-protobuf (from https://github.com/grpc/grpc-java) - io.grpc:grpc-protobuf-lite (from https://github.com/grpc/grpc-java) +- io.grpc:grpc-services (from https://github.com/grpc/grpc-java) - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) +- io.grpc:grpc-xds (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amzn/ion-java/, https://github.com/amznlabs/ion-java/) - jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) @@ -317,10 +323,7 @@ BSD-2-Clause ======================================================================== The following software have components provided under the terms of this license: -- API Common (from https://github.com/googleapis, https://github.com/googleapis/api-common-java, https://repo1.maven.org/maven2/com/google/api/api-common) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) -- 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 (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc) - 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/) @@ -358,6 +361,7 @@ The following software have components provided under the terms of this license: - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Protocol Buffer Java API (from http://code.google.com/p/protobuf, https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) +- RE2/J (from http://github.com/google/re2j) - Redisson (from http://redisson.org) - Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core) - ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp) @@ -726,4 +730,4 @@ unknown The following software have components provided under the terms of this license: - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) +- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) \ No newline at end of file diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index 5f370e9b0b64a5d630689a154545fad280759a02..5d264da5f286c8d3bddc6b5936135517d6949772 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.21.0-rc5</version> + <version>0.21.0</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml index 2de41935b69e7b8196ea1495ae848eb969b9401e..4616801fde137202ec99c67b7a360253a1fe1caf 100644 --- a/provider/notification-azure/pom.xml +++ b/provider/notification-azure/pom.xml @@ -39,7 +39,7 @@ <springframework.version>4.3.0.RELEASE</springframework.version> <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version> <reactor.core.version>3.3.0.RELEASE</reactor.core.version> - <osdu.corelibazure.version>0.21.0-rc3</osdu.corelibazure.version> + <osdu.corelibazure.version>0.21.0</osdu.corelibazure.version> <osdu.oscorecommon.version>0.19.0-rc6</osdu.oscorecommon.version> <junit.version>5.6.0</junit.version> <jjwt.version>3.8.1</jjwt.version> diff --git a/provider/notification-gc/pom.xml b/provider/notification-gc/pom.xml index cf4bc9a3a867c567a4447301a6f55a9c5b7e785e..320ba43085bc0be59001388432cfb06c73b2c273 100644 --- a/provider/notification-gc/pom.xml +++ b/provider/notification-gc/pom.xml @@ -52,12 +52,12 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-common</artifactId> - <version>0.21.0-rc4</version> + <version>0.21.0</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gc</artifactId> - <version>0.21.0-rc4</version> + <version>0.21.0</version> </dependency> <dependency> @@ -110,7 +110,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>oqm</artifactId> - <version>0.21.0-rc5</version> + <version>0.21.0</version> </dependency> </dependencies> diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorGenerator.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorGenerator.java index 2192620af432a28f0e2cbfb99fc2ed19a192c883..6613775dcede4f8a33df0601995ccf944b20f86e 100644 --- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorGenerator.java +++ b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorGenerator.java @@ -18,7 +18,7 @@ package org.opengroup.osdu.notification.provider.gcp.security; import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import org.springframework.stereotype.Component; import java.util.Arrays; @@ -26,7 +26,7 @@ import java.util.Arrays; @Component public class GoogleServiceAccountValidatorGenerator { - public GoogleIdTokenVerifier getVerifier(NetHttpTransport transport, JacksonFactory factory, String... googleAudiences) { + public GoogleIdTokenVerifier getVerifier(NetHttpTransport transport, GsonFactory factory, String... googleAudiences) { GoogleIdTokenVerifier verifier; if (googleAudiences == null || googleAudiences.length == 0) { verifier = new GoogleIdTokenVerifier.Builder(transport, factory) diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorImpl.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorImpl.java index 367e18ed2919cc6c9a912cc02fcf40b498eea086..fe9152709b0ec0b64b8af5376253ce1f209374ed 100644 --- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorImpl.java +++ b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/GoogleServiceAccountValidatorImpl.java @@ -19,7 +19,7 @@ package org.opengroup.osdu.notification.provider.gcp.security; import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken; import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import org.opengroup.osdu.core.common.logging.JaxRsDpsLog; import org.opengroup.osdu.notification.provider.gcp.config.AppProperties; import org.opengroup.osdu.notification.provider.interfaces.IServiceAccountValidator; @@ -30,7 +30,7 @@ import org.springframework.stereotype.Service; public class GoogleServiceAccountValidatorImpl implements IServiceAccountValidator { private final NetHttpTransport netHttpTransport = new NetHttpTransport(); - private final JacksonFactory jacksonFactory = new JacksonFactory(); + private final GsonFactory gsonFactory = new GsonFactory(); @Autowired private JaxRsDpsLog log; @@ -46,7 +46,7 @@ public class GoogleServiceAccountValidatorImpl implements IServiceAccountValidat @Override public boolean isValidServiceAccount(String jwt, String userIdentity, String... googleAudiences) { - GoogleIdTokenVerifier verifier = this.verifierGenerator.getVerifier(this.netHttpTransport, this.jacksonFactory, googleAudiences); + GoogleIdTokenVerifier verifier = this.verifierGenerator.getVerifier(this.netHttpTransport, this.gsonFactory, googleAudiences); try { GoogleIdToken idToken = verifier.verify(jwt); if (idToken != null) { diff --git a/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/secutity/GoogleServiceAccountValidatorGeneratorTest.java b/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/secutity/GoogleServiceAccountValidatorGeneratorTest.java index de09494a9e6e7a7c0af2f45cf34fc8d8ae15bc80..a3a9a54ece14c2338f25971594224fe84f71e4c4 100644 --- a/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/secutity/GoogleServiceAccountValidatorGeneratorTest.java +++ b/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/secutity/GoogleServiceAccountValidatorGeneratorTest.java @@ -18,7 +18,7 @@ package org.opengroup.osdu.notification.secutity; import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,7 +31,7 @@ import java.util.Collection; @RunWith(PowerMockRunner.class) public class GoogleServiceAccountValidatorGeneratorTest { private final NetHttpTransport netHttpTransport = new NetHttpTransport(); - private final JacksonFactory jacksonFactory = new JacksonFactory(); + private final GsonFactory gsonFactory = new GsonFactory(); private static final String AUDIENCE_1 = "aud1"; private static final String AUDIENCE_2 = "aud2"; @@ -40,15 +40,15 @@ public class GoogleServiceAccountValidatorGeneratorTest { @Test public void should_returnVerifierWithoutAudiences_when_noAudiencesProvided() { - GoogleIdTokenVerifier verifier = this.sut.getVerifier(netHttpTransport, jacksonFactory); + GoogleIdTokenVerifier verifier = this.sut.getVerifier(netHttpTransport, gsonFactory); Assert.assertNull(verifier.getAudience()); } @Test public void should_returnVerifierWithAudiences_when_AudiencesProvided() { - GoogleIdTokenVerifier verifier = this.sut.getVerifier(netHttpTransport, jacksonFactory, AUDIENCE_1, AUDIENCE_2); + GoogleIdTokenVerifier verifier = this.sut.getVerifier(netHttpTransport, gsonFactory, AUDIENCE_1, AUDIENCE_2); Collection<String> audiences = verifier.getAudience(); Assert.assertTrue(audiences.contains(AUDIENCE_1)); Assert.assertTrue(audiences.contains(AUDIENCE_2)); } -} +} \ No newline at end of file diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml index 6c60b2771a9af743772c94706400b3e1d80c609c..34ac601b6ae70522483e39fa5b526e2d1d9ab62e 100644 --- a/testing/notification-test-aws/pom.xml +++ b/testing/notification-test-aws/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.21.0-rc5</version> + <version>0.21.0</version> </dependency> <dependency> <groupId>com.amazonaws</groupId>