diff --git a/NOTICE b/NOTICE index fffb841710e0a63c913a733850cc0f4cd90766db..01a66b8f46b11d59900bab9b63236d8fa64dab2f 100644 --- a/NOTICE +++ b/NOTICE @@ -183,7 +183,7 @@ The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/) -- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) +- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/) @@ -209,8 +209,8 @@ The following software have components provided under the terms of this license: - Apache Maven Wagon :: Providers :: SSH Provider (from ) - Apache Velocity (from http://velocity.apache.org/engine/devel/) - AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core) -- Asynchronous Http Client (from ) -- Asynchronous Http Client Netty Utils (from ) +- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client) +- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils) - AutoValue Annotations (from https://github.com/google/auto/tree/master/value) - AutoValue Processor (from https://github.com/google/auto/tree/master/value) - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) @@ -221,7 +221,7 @@ 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 Storage JSON API v1-rev20190910-1.30.3 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20181109-1.28.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) - Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections) @@ -253,8 +253,8 @@ The following software have components provided under the terms of this license: - Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core) - Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http) - Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http) -- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc) -- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc) +- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) +- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) - Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore) - Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore) - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials) @@ -263,7 +263,7 @@ The following software have components provided under the terms of this license: - Google Cloud Logging (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging) - Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub) - Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub) -- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage) +- Google Cloud Storage (from https://github.com/googleapis/java-storage) - Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client) - Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client) - Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client) @@ -310,9 +310,9 @@ The following software have components provided under the terms of this license: - Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) - Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations) - Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations) -- Jackson-annotations (from http://wiki.fasterxml.com/JacksonHome) -- Jackson-annotations (from http://wiki.fasterxml.com/JacksonHome) -- Jackson-core (from http://wiki.fasterxml.com/JacksonHome) +- Jackson-annotations (from http://github.com/FasterXML/jackson) +- Jackson-annotations (from http://github.com/FasterXML/jackson) +- Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) @@ -397,7 +397,7 @@ The following software have components provided under the terms of this license: - MongoDB Java Driver (from http://www.mongodb.org) - MongoDB Java Driver Core (from http://www.mongodb.org) - Netty Reactive Streams HTTP support (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http) -- Netty Reactive Streams Implementation (from ) +- Netty Reactive Streams Implementation (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams) - Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer) - Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer) - Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec) @@ -456,6 +456,7 @@ The following software have components provided under the terms of this license: - Plexus Velocity Component (from ) - PowerMock (from http://www.powermock.org) - Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf) +- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - QpidJMS Client (from ) - RabbitMQ Java Client (from https://www.rabbitmq.com) - Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) @@ -464,22 +465,7 @@ The following software have components provided under the terms of this license: - SnakeYAML (from http://code.google.com/p/snakeyaml/) - Spatial4J (from https://projects.eclipse.org/projects/locationtech.spatial4j) - Spring AMQP Core (from https://github.com/spring-projects/spring-amqp) -- Spring Boot (from http://projects.spring.io/spring-boot/) - Spring Boot AMQP Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Actuator (from http://projects.spring.io/spring-boot/) -- Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure) -- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) -- Spring Boot Data MongoDB Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Dependencies (from http://projects.spring.io/spring-boot/) -- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) -- Spring Boot Log4J2 Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty) -- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/) -- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) - Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons) @@ -493,7 +479,7 @@ The following software have components provided under the terms of this license: - Spring Plugin - Core (from ) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) - Spring RabbitMQ Support (from https://github.com/spring-projects/spring-amqp) -- Spring Retry (from http://www.springsource.org) +- Spring Retry (from https://www.springsource.org) - Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth) - Spring Security JWT Library (from http://github.com/spring-projects/spring-security-oauth) - Spring TestContext Framework (from https://github.com/spring-projects/spring-framework) @@ -561,22 +547,22 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - ion-java (from https://github.com/amznlabs/ion-java/) - ion-java (from https://github.com/amznlabs/ion-java/) -- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) - javax.inject (from http://code.google.com/p/atinject/) - javax.ws.rs-api (from http://jax-rs-spec.java.net) -- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) -- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) -- jersey-core-client (from git://java.net/jersey~code/jersey-client) +- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) +- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) +- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) -- jersey-core-server (from git://java.net/jersey~code/jersey-server) -- jersey-ext-bean-validation (from ) -- jersey-ext-entity-filtering (from ) +- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) +- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) +- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering) - jersey-inject-hk2 (from ) - jersey-media-jaxb (from ) -- jersey-media-json-jackson (from git://java.net/jersey~code/project/jersey-media-json-jackson) +- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson) - jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4) - jose4j (from https://bitbucket.org/b_c/jose4j/) - lang-mustache (from https://github.com/elastic/elasticsearch) @@ -606,7 +592,6 @@ The following software have components provided under the terms of this license: - proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) - proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) - proto-google-iam-v1 (from https://github.com/googleapis/api-client-staging) -- proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j) - rank-eval (from https://github.com/elastic/elasticsearch) - rank-eval (from https://github.com/elastic/elasticsearch) - resilience4j (from https://github.com/resilience4j/resilience4j) @@ -618,22 +603,37 @@ The following software have components provided under the terms of this license: - rxjava (from https://github.com/ReactiveX/RxJava) - server (from https://github.com/elastic/elasticsearch) - server (from https://github.com/elastic/elasticsearch) +- spring-boot (from https://spring.io/projects/spring-boot) +- spring-boot-actuator (from https://spring.io/projects/spring-boot) +- spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) +- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-configuration-processor (from https://spring.io/projects/spring-boot) +- spring-boot-dependencies (from https://spring.io/projects/spring-boot) +- spring-boot-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) +- spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot) - spring-boot-starter-jersey (from https://spring.io/projects/spring-boot) +- spring-boot-starter-json (from https://spring.io/projects/spring-boot) +- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot) +- spring-boot-starter-logging (from https://spring.io/projects/spring-boot) +- spring-boot-starter-reactor-netty (from https://spring.io/projects/spring-boot) +- spring-boot-starter-security (from https://spring.io/projects/spring-boot) +- spring-boot-starter-test (from https://spring.io/projects/spring-boot) - spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot) - spring-boot-starter-validation (from https://spring.io/projects/spring-boot) - spring-boot-starter-web (from https://spring.io/projects/spring-boot) +- spring-boot-starter-webflux (from https://spring.io/projects/spring-boot) - spring-boot-test (from https://spring.io/projects/spring-boot) +- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot) - spring-security-config (from http://spring.io/spring-security) -- spring-security-core (from https://spring.io/spring-security) +- spring-security-core (from https://repo1.maven.org/maven2/org/springframework/security/spring-security-core) - spring-security-oauth2-client (from http://spring.io/spring-security) - spring-security-oauth2-core (from http://spring.io/spring-security) - spring-security-oauth2-jose (from http://spring.io/spring-security) - spring-security-oauth2-jose (from http://spring.io/spring-security) - spring-security-oauth2-resource-server (from http://spring.io/spring-security) - spring-security-test (from http://spring.io/spring-security) -- spring-security-web (from https://spring.io/spring-security) +- spring-security-web (from https://repo1.maven.org/maven2/org/springframework/security/spring-security-web) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -647,7 +647,7 @@ The following software have components provided under the terms of this license: - tomcat-annotations-api (from https://tomcat.apache.org/) - tomcat-embed-core (from http://tomcat.apache.org/) - tomcat-embed-el (from https://tomcat.apache.org/) -- tomcat-embed-websocket (from http://tomcat.apache.org/) +- tomcat-embed-websocket (from https://tomcat.apache.org/) - xml-apis (from ) ======================================================================== @@ -672,7 +672,7 @@ The following software have components provided under the terms of this license: - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) - ThreeTen backport (from https://www.threeten.org/threetenbp) -- jersey-ext-bean-validation (from ) +- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) - jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4) ======================================================================== @@ -688,7 +688,7 @@ The following software have components provided under the terms of this license: - ASM Core (from ) - ASM Tree (from ) - ASM Util (from ) -- ASM library repackaged as OSGi bundle (from ) +- ASM library repackaged as OSGi bundle (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) @@ -730,11 +730,11 @@ The following software have components provided under the terms of this license: - classworlds (from http://classworlds.codehaus.org/) - jakarta.xml.bind-api (from ) - jaxen (from http://jaxen.codehaus.org/) -- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) -- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) -- jersey-core-client (from git://java.net/jersey~code/jersey-client) -- jersey-core-server (from git://java.net/jersey~code/jersey-server) -- jersey-ext-entity-filtering (from ) +- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) +- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) +- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client) +- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) +- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering) - jersey-inject-hk2 (from ) - jersey-media-jaxb (from ) @@ -768,29 +768,29 @@ CDDL-1.0 ======================================================================== The following software have components provided under the terms of this license: -- ASM library repackaged as OSGi bundle (from ) -- Class Model for Hk2 (from ) +- ASM library repackaged as OSGi bundle (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged) +- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model) - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils) - HK2 Spring Bridge (from ) -- HK2 config types (from ) -- HK2 configuration module (from ) +- HK2 config types (from https://repo1.maven.org/maven2/org/glassfish/hk2/config-types) +- HK2 configuration module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-config) - HK2 core module (from ) -- HK2 module of HK2 itself (from ) +- HK2 module of HK2 itself (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2) - JavaBeans Activation Framework API jar (from ) -- Run Level Service (from ) +- Run Level Service (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-runlevel) - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) - Servlet Specification 2.5 API (from ) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - javax.ws.rs-api (from http://jax-rs-spec.java.net) -- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) -- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) -- jersey-core-client (from git://java.net/jersey~code/jersey-client) +- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) +- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) +- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) -- jersey-core-server (from git://java.net/jersey~code/jersey-server) -- jersey-ext-entity-filtering (from ) +- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) +- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering) - jersey-inject-hk2 (from ) - jersey-media-jaxb (from ) -- jersey-media-json-jackson (from git://java.net/jersey~code/project/jersey-media-json-jackson) +- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson) ======================================================================== CDDL-1.1 @@ -806,7 +806,7 @@ The following software have components provided under the terms of this license: - OSGi resource locator (from ) - Servlet Specification 2.5 API (from ) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) -- jersey-ext-bean-validation (from ) +- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) - jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -850,39 +850,39 @@ GPL-2.0-only ======================================================================== The following software have components provided under the terms of this license: -- ASM library repackaged as OSGi bundle (from ) -- Class Model for Hk2 (from ) +- ASM library repackaged as OSGi bundle (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/asm-all-repackaged) +- Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model) - Cobertura (from http://cobertura.sourceforge.net) - Cobertura Limited Runtime (from http://cobertura.sourceforge.net) - Commons Lang (from http://commons.apache.org/lang/) - Expression Language 3.0 (from http://uel.java.net) - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils) - HK2 Spring Bridge (from ) -- HK2 config types (from ) -- HK2 configuration module (from ) +- HK2 config types (from https://repo1.maven.org/maven2/org/glassfish/hk2/config-types) +- HK2 configuration module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-config) - HK2 core module (from ) -- HK2 module of HK2 itself (from ) +- HK2 module of HK2 itself (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2) - Java Architecture for XML Binding (from http://jaxb.java.net/) - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) - OSGi resource locator (from ) - RabbitMQ Java Client (from https://www.rabbitmq.com) -- Run Level Service (from ) +- Run Level Service (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-runlevel) - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - javax.ws.rs-api (from http://jax-rs-spec.java.net) -- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) -- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) -- jersey-core-client (from git://java.net/jersey~code/jersey-client) +- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) +- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) +- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) -- jersey-core-server (from git://java.net/jersey~code/jersey-server) -- jersey-ext-bean-validation (from ) -- jersey-ext-entity-filtering (from ) +- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) +- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) +- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering) - jersey-inject-hk2 (from ) - jersey-media-jaxb (from ) -- jersey-media-json-jackson (from git://java.net/jersey~code/project/jersey-media-json-jackson) +- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson) - jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -911,16 +911,16 @@ The following software have components provided under the terms of this license: - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) - javax.ws.rs-api (from http://jax-rs-spec.java.net) -- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) -- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) -- jersey-core-client (from git://java.net/jersey~code/jersey-client) +- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) +- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) +- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) -- jersey-core-server (from git://java.net/jersey~code/jersey-server) -- jersey-ext-bean-validation (from ) -- jersey-ext-entity-filtering (from ) +- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) +- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) +- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering) - jersey-inject-hk2 (from ) - jersey-media-jaxb (from ) -- jersey-media-json-jackson (from git://java.net/jersey~code/project/jersey-media-json-jackson) +- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson) - jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4) - tomcat-embed-core (from http://tomcat.apache.org/) @@ -1057,7 +1057,7 @@ The following software have components provided under the terms of this license: - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) - server (from https://github.com/elastic/elasticsearch) -- spring-security-core (from https://spring.io/spring-security) +- spring-security-core (from https://repo1.maven.org/maven2/org/springframework/security/spring-security-core) ======================================================================== MPL-1.1 @@ -1102,7 +1102,7 @@ The following software have components provided under the terms of this license: - Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) -- jersey-core-server (from git://java.net/jersey~code/jersey-server) +- jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) - jts-core (from https://repo1.maven.org/maven2/org/locationtech/jts/jts-core) ======================================================================== @@ -1169,7 +1169,7 @@ The following software have components provided under the terms of this license: - AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava) - AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava) -- Asynchronous Http Client (from ) +- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client) - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html) - Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) @@ -1213,11 +1213,11 @@ The following software have components provided under the terms of this license: - System Rules (from http://stefanbirkner.github.io/system-rules/) - jakarta.xml.bind-api (from ) - jaxen (from http://jaxen.codehaus.org/) -- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) -- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) -- jersey-core-client (from git://java.net/jersey~code/jersey-client) -- jersey-ext-bean-validation (from ) -- jersey-ext-entity-filtering (from ) +- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) +- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) +- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client) +- jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) +- jersey-ext-entity-filtering (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-entity-filtering) - jersey-inject-hk2 (from ) - jersey-media-jaxb (from ) - jersey-spring4 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring4) diff --git a/devops/gcp/deploy/templates/indexer-deploy.yml b/devops/gcp/deploy/templates/indexer-deploy.yml index c85dbf030fce67577620768211a427c61de97055..3c7a1fa1e3b592e90b829a7cc350ca95c5f5489e 100644 --- a/devops/gcp/deploy/templates/indexer-deploy.yml +++ b/devops/gcp/deploy/templates/indexer-deploy.yml @@ -14,6 +14,8 @@ spec: metadata: labels: app: "{{ .Values.conf.app_name }}" + annotations: + rollme: {{ randAlphaNum 5 | quote }} spec: containers: - name: "{{ .Values.conf.app_name }}" diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml index 94aa6f13d7c3c3c7f9c755f5585eea1306ed5481..a6d2ba058ad3ffe95566caf1071b503b0e8b971b 100644 --- a/indexer-core/pom.xml +++ b/indexer-core/pom.xml @@ -4,19 +4,19 @@ <parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>indexer-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <name>indexer-core</name> <description>Indexer Service Core</description> <packaging>jar</packaging> <properties> <commons-beanutils.version>1.9.4</commons-beanutils.version> - <osdu.oscorecommon.version>0.9.0</osdu.oscorecommon.version> + <osdu.oscorecommon.version>0.10.0</osdu.oscorecommon.version> </properties> <dependencies> diff --git a/pom.xml b/pom.xml index 6cb939bafbe005a3fafe98a932c1a130fd3a9199..dc99cd5e0ac97e2ef22e9029dca6b90316497150 100644 --- a/pom.xml +++ b/pom.xml @@ -12,14 +12,14 @@ <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> <packaging>pom</packaging> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <description>Indexer Service</description> <properties> <java.version>1.8</java.version> <springfox-version>2.7.0</springfox-version> <spring-cloud.version>Greenwich.SR2</spring-cloud.version> - <os-core-common.version>0.9.0</os-core-common.version> + <os-core-common.version>0.10.0</os-core-common.version> <snakeyaml.version>1.26</snakeyaml.version> <hibernate-validator.version>6.1.5.Final</hibernate-validator.version> <jackson.version>2.11.4</jackson.version> diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml index 9b61d00163515ed199c46bbf6cb307eabdb07891..b1345abf80a71e29a8b001d260e1db7135d275cc 100644 --- a/provider/indexer-aws/pom.xml +++ b/provider/indexer-aws/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -26,7 +26,7 @@ <artifactId>indexer-aws</artifactId> <description>Storage service on AWS</description> <packaging>jar</packaging> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <properties> <aws.version>1.11.637</aws.version> @@ -42,7 +42,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml index 527ee87a6191a5aaa13c87b1d6fd960f0bcc3b70..a91cc0902f87daddd54c4e417dd99504c5809e8d 100644 --- a/provider/indexer-azure/pom.xml +++ b/provider/indexer-azure/pom.xml @@ -21,12 +21,12 @@ <parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>indexer-azure</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <name>indexer-azure</name> <description>Indexer Service Azure</description> <packaging>jar</packaging> @@ -39,9 +39,9 @@ <azure.appservice.subscription /> <log4j.version>2.11.2</log4j.version> <nimbus-jose-jwt.version>8.2</nimbus-jose-jwt.version> - <indexer-core.version>0.10.0-SNAPSHOT</indexer-core.version> + <indexer-core.version>0.11.0-SNAPSHOT</indexer-core.version> <spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version> - <osdu.corelibazure.version>0.9.0</osdu.corelibazure.version> + <osdu.corelibazure.version>0.10.1</osdu.corelibazure.version> <reactor-netty.version>0.9.12.RELEASE</reactor-netty.version> <java-jwt.version>3.8.1</java-jwt.version> <powermock.version>2.0.2</powermock.version> diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml index 9913de6cd42cf90100717eeb6034e0cc9a483253..a04ddb08ca81f99410fdb050b8cbb998936cce96 100644 --- a/provider/indexer-gcp/pom.xml +++ b/provider/indexer-gcp/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>indexer-gcp</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <name>indexer-gcp</name> <description>Indexer Service GCP App Engine</description> <packaging>jar</packaging> @@ -19,13 +19,13 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.10.0</version> </dependency> <dependency> diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml index 4da0811c54dcdcbd8dee467802452e48e7bc56e4..3ffb6c735078a39f5b1799e540b9a7e0abd3a146 100644 --- a/provider/indexer-ibm/pom.xml +++ b/provider/indexer-ibm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -53,7 +53,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/provider/indexer-reference/pom.xml b/provider/indexer-reference/pom.xml index b1cf1243eedff75bba1f34662720559e476b26f0..3aa33b3733a74817ef0ea27c5cd52ca8e11ea288 100644 --- a/provider/indexer-reference/pom.xml +++ b/provider/indexer-reference/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-service</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>indexer-reference</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <name>indexer-reference</name> <description>Indexer Service GCP Anthos</description> <packaging>jar</packaging> @@ -36,7 +36,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml index 3b30e04e49c219b315f3f291f8f1c4a153215765..1f44c614b05c08ac7a73f1d52d0cdabcc7971f03 100644 --- a/testing/indexer-test-aws/pom.xml +++ b/testing/indexer-test-aws/pom.xml @@ -21,13 +21,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>indexer-test</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-aws</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -42,7 +42,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <!-- AWS specific packages --> diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml index 69b19fdf0ed9ab49bc14c7e1bdad2ac96a83763f..9f897aa2140a4d8e6ca82f9d882567fefd9f0014 100644 --- a/testing/indexer-test-azure/pom.xml +++ b/testing/indexer-test-azure/pom.xml @@ -21,13 +21,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>indexer-test</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-azure</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -45,7 +45,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <!-- Azure dependencies --> diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml index 365aa1f09e4d65f87aa0a097fe56769d393a2621..7e7a0e821ecb21d523a4ba630d1c233c32261672 100644 --- a/testing/indexer-test-core/pom.xml +++ b/testing/indexer-test-core/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>indexer-test</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <properties> <maven.compiler.target>1.8</maven.compiler.target> diff --git a/testing/indexer-test-gcp/pom.xml b/testing/indexer-test-gcp/pom.xml index 2d94432a53ce3b8317865e30a90a55815aa943c7..c04bfaa9a8eeaab55a87e34ab2cb2800c579bfb2 100644 --- a/testing/indexer-test-gcp/pom.xml +++ b/testing/indexer-test-gcp/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>indexer-test</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-gcp</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -37,7 +37,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <!-- Cucumber --> diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml index 5fe05406e7e282d498ac755f731354a8d0cb7495..26a2c992ad25c8a1fd09441cbb78d85b431bf90f 100644 --- a/testing/indexer-test-ibm/pom.xml +++ b/testing/indexer-test-ibm/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>indexer-test</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-ibm</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -38,7 +38,7 @@ <dependency> <groupId>org.opengroup.osdu.indexer</groupId> <artifactId>indexer-test-core</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/testing/pom.xml b/testing/pom.xml index e33b2a83643bab6e01eed2ccd6852fe69f15c484..948d86e1854bb3a62757e5da3bf2989e01799783 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.opengroup.osdu</groupId> <artifactId>indexer-test</artifactId> - <version>0.10.0-SNAPSHOT</version> + <version>0.11.0-SNAPSHOT</version> <description>Indexer Service Integration Test Root Project</description> <properties> <spring.version>5.1.19.RELEASE</spring.version>