From 2d360068bcfd5afb65b961a997abeb3876746acf Mon Sep 17 00:00:00 2001 From: Yimin Zhou Date: Thu, 2 Sep 2021 09:21:34 -0500 Subject: [PATCH 01/10] set up virtual service for catalog service --- devops/azure/chart/helm-config.yaml | 2 + .../chart/templates/virtual-service.yaml | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 devops/azure/chart/templates/virtual-service.yaml diff --git a/devops/azure/chart/helm-config.yaml b/devops/azure/chart/helm-config.yaml index 86eca1e..eea5d76 100644 --- a/devops/azure/chart/helm-config.yaml +++ b/devops/azure/chart/helm-config.yaml @@ -19,3 +19,5 @@ image: #repository: #{container-registry}#.azurecr.io/crs-catalog-data #tag: v2 #pullPolicy: Always + +istioDnsHost: #{ISTIO_DNS_HOST}# \ No newline at end of file diff --git a/devops/azure/chart/templates/virtual-service.yaml b/devops/azure/chart/templates/virtual-service.yaml new file mode 100644 index 0000000..c2fb589 --- /dev/null +++ b/devops/azure/chart/templates/virtual-service.yaml @@ -0,0 +1,38 @@ +--- +# Source: /devops/azure/chart/templates/virtual-service.yaml +{{- if .Values.global.istioDnsHost }} +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: {{ .Chart.Name }} + namespace: osdu +spec: + hosts: + - {{ .Values.istioDnsHost }} + gateways: + - istio-gateway + http: + - match: + - uri: + prefix: "/api/crs/catalog" + route: + - destination: + host: {{ .Chart.Name }} + port: + number: 80 + corsPolicy: + maxAge: "60m" + allowCredentials: true + allowHeaders: + - Authorization + - Data-Partition-Id + - Correlation-Id + allowMethods: + - POST + - GET + - PUT + - PATCH + - DELETE + allowOrigins: + - prefix: "*" + {{- end }} \ No newline at end of file -- GitLab From d7ddbce02c8553207a0cee033b2551a5781c8608 Mon Sep 17 00:00:00 2001 From: Yimin Zhou Date: Tue, 7 Sep 2021 07:19:03 -0500 Subject: [PATCH 02/10] remove if checking for istioDnsHost --- devops/azure/chart/templates/virtual-service.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devops/azure/chart/templates/virtual-service.yaml b/devops/azure/chart/templates/virtual-service.yaml index c2fb589..fb90cd3 100644 --- a/devops/azure/chart/templates/virtual-service.yaml +++ b/devops/azure/chart/templates/virtual-service.yaml @@ -1,6 +1,5 @@ --- # Source: /devops/azure/chart/templates/virtual-service.yaml -{{- if .Values.global.istioDnsHost }} apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: @@ -34,5 +33,4 @@ spec: - PATCH - DELETE allowOrigins: - - prefix: "*" - {{- end }} \ No newline at end of file + - prefix: "*" \ No newline at end of file -- GitLab From 666a36ad7155da1802c8abdd4e95a318fded398b Mon Sep 17 00:00:00 2001 From: Yimin Zhou Date: Tue, 7 Sep 2021 09:09:08 -0500 Subject: [PATCH 03/10] add empty value for istioDnsHost in values.yaml --- devops/azure/chart/templates/virtual-service.yaml | 2 +- devops/azure/chart/values.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/devops/azure/chart/templates/virtual-service.yaml b/devops/azure/chart/templates/virtual-service.yaml index fb90cd3..993c264 100644 --- a/devops/azure/chart/templates/virtual-service.yaml +++ b/devops/azure/chart/templates/virtual-service.yaml @@ -7,7 +7,7 @@ metadata: namespace: osdu spec: hosts: - - {{ .Values.istioDnsHost }} + - "{{ .Values.istioDnsHost }}" gateways: - istio-gateway http: diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml index 3c5dce3..fa8feef 100644 --- a/devops/azure/chart/values.yaml +++ b/devops/azure/chart/values.yaml @@ -7,3 +7,5 @@ image: repository: community.opengroup.org:5555/osdu/platform/system/reference/crs-catalog-service tag: latest pullPolicy: Always + +istioDnsHost: "" \ No newline at end of file -- GitLab From 5dd952f3a8593c9e11902febedf3cff44064e9d2 Mon Sep 17 00:00:00 2001 From: Rostislav Vatolin Date: Tue, 7 Sep 2021 15:50:27 -0500 Subject: [PATCH 04/10] fix deployment --- devops/azure/chart/templates/virtual-service.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/azure/chart/templates/virtual-service.yaml b/devops/azure/chart/templates/virtual-service.yaml index 993c264..02da324 100644 --- a/devops/azure/chart/templates/virtual-service.yaml +++ b/devops/azure/chart/templates/virtual-service.yaml @@ -13,12 +13,12 @@ spec: http: - match: - uri: - prefix: "/api/crs/catalog" + prefix: "/api/crs/catalog" route: - destination: - host: {{ .Chart.Name }} - port: - number: 80 + host: {{ .Chart.Name }} + port: + number: 80 corsPolicy: maxAge: "60m" allowCredentials: true -- GitLab From dfc835475b62ceb4bd246bb05ef035dff3cc15d5 Mon Sep 17 00:00:00 2001 From: Yimin Zhou Date: Thu, 9 Sep 2021 06:54:42 -0500 Subject: [PATCH 05/10] update NOTICE --- NOTICE | 111 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 49 deletions(-) diff --git a/NOTICE b/NOTICE index 6b4bf5b..0c39896 100644 --- a/NOTICE +++ b/NOTICE @@ -30,7 +30,7 @@ The following software have components provided under the terms of this license: - ASM based accessors helper used by json-smart (from ) - ASM based accessors helper used by json-smart (from ) - Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava) -- Apache Ant + JUnit (from http://ant.apache.org/) +- Apache Ant + JUnit (from https://ant.apache.org/) - Apache Ant Core (from https://ant.apache.org/) - Apache Ant Launcher (from https://ant.apache.org/) - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) @@ -123,23 +123,24 @@ The following software have components provided under the terms of this license: - JSON Web Token support for the JVM (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt) - JSON library from Android SDK (from http://developer.android.com/sdk) - JSONassert (from https://github.com/skyscreamer/JSONassert) +- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec) - Jackson (from http://jackson.codehaus.org) - 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) -- Jackson datatype: Joda (from https://github.com/FasterXML/jackson-datatype-joda) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson) - Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) -- Jackson module: Old JAXB Annotations (javax.xml.bind) (from https://github.com/FasterXML/jackson-modules-base) +- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-Smile (from http://wiki.fasterxml.com/JacksonForSmile) -- Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml) +- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) +- Jackson-datatype-JODA (from http://wiki.fasterxml.com/JacksonModuleJoda) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) -- Jakarta Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) @@ -149,17 +150,17 @@ The following software have components provided under the terms of this license: - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) - Jetty :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client) - Jetty :: Continuation (from http://www.eclipse.org/jetty) -- Jetty :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http) -- Jetty :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io) -- Jetty :: Plus (from http://www.eclipse.org/jetty) -- Jetty :: Security (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security) -- Jetty :: Server Core (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server) -- Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty) -- Jetty :: Servlet Handling (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet) -- Jetty :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util) +- Jetty :: Http Utility (from http://www.eclipse.org/jetty) +- Jetty :: IO Utility (from http://www.eclipse.org/jetty) +- Jetty :: Plus (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus) +- Jetty :: Security (from http://www.eclipse.org/jetty) +- Jetty :: Server Core (from http://www.eclipse.org/jetty) +- Jetty :: Servlet Annotations (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations) +- Jetty :: Servlet Handling (from http://www.eclipse.org/jetty) +- Jetty :: Utilities (from http://www.eclipse.org/jetty) - Jetty :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax) - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty) -- Jetty :: Webapp Application Support (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp) +- Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty) - Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api) - Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client) - Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common) @@ -167,9 +168,9 @@ The following software have components provided under the terms of this license: - Jetty :: Websocket :: Servlet Interface (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet) - Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl) - Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl) -- Jetty :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml) -- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty) -- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) +- Jetty :: XML utilities (from http://www.eclipse.org/jetty) +- Jetty Server (from http://jetty.mortbay.org) +- Jetty Utilities (from http://jetty.mortbay.org) - Joda-Time (from https://www.joda.org/joda-time/) - KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2) - KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom) @@ -185,8 +186,8 @@ The following software have components provided under the terms of this license: - Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping) - Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) -- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) +- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries) - Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser) @@ -243,9 +244,10 @@ The following software have components provided under the terms of this license: - Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) -- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core) +- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) +- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) - Okio (from https://github.com/square/okio/) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -269,7 +271,7 @@ The following software have components provided under the terms of this license: - SnakeYAML (from http://www.snakeyaml.org) - Spring AOP (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework) -- Spring Boot Log4j 2 Starter (from http://projects.spring.io/spring-boot/) +- Spring Boot Jetty Starter (from http://projects.spring.io/spring-boot/) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework) - Spring Core (from https://github.com/spring-projects/spring-framework) @@ -285,11 +287,13 @@ The following software have components provided under the terms of this license: - Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - T-Digest (from https://github.com/tdunning/t-digest) +- Vavr (from http://vavr.io) +- Vavr Match (from http://vavr.io) - Woodstox (from https://github.com/FasterXML/woodstox) - Xerces2-j (from https://xerces.apache.org/xerces2-j/) -- Zipkin Core Library (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) - Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter) +- Zipkin v2 (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - aalto-xml (from ) - aggs-matrix-stats (from https://github.com/elastic/elasticsearch) - asm (from http://asm.ow2.io/) @@ -299,6 +303,7 @@ The following software have components provided under the terms of this license: - com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis) - compiler (from http://github.com/spullara/mustache.java) - core (from https://github.com/elastic/elasticsearch) +- core (from https://github.com/elastic/elasticsearch) - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) - elasticsearch-geo (from https://github.com/elastic/elasticsearch) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) @@ -323,7 +328,6 @@ The following software have components provided under the terms of this license: - javax.inject (from http://code.google.com/p/atinject/) - lang-mustache (from https://github.com/elastic/elasticsearch) - lettuce (from http://github.com/mp911de/lettuce/wiki) -- logging-interceptor (from https://github.com/square/okhttp) - mapper-extras (from https://github.com/elastic/elasticsearch) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) @@ -344,19 +348,27 @@ The following software have components provided under the terms of this license: - proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos) - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - rank-eval (from https://github.com/elastic/elasticsearch) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://github.com/resilience4j/resilience4j) - rest (from https://github.com/elastic/elasticsearch) - rest-high-level (from https://github.com/elastic/elasticsearch) - rxjava (from https://github.com/ReactiveX/RxJava) - secure-sm (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-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) -- spring-boot-starter-jetty (from https://spring.io/projects/spring-boot) +- spring-boot-starter-aop (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) @@ -366,12 +378,12 @@ The following software have components provided under the terms of this license: - 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 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-resource-server (from http://spring.io/spring-security) -- spring-security-web (from http://spring.io/spring-security) +- spring-security-config (from https://spring.io/spring-security) +- spring-security-core (from https://spring.io/spring-security) +- spring-security-oauth2-core (from https://spring.io/spring-security) +- spring-security-oauth2-jose (from https://spring.io/spring-security) +- spring-security-oauth2-resource-server (from https://spring.io/spring-security) +- spring-security-web (from https://spring.io/spring-security) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -404,7 +416,7 @@ The following software have components provided under the terms of this license: - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) - Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) -- Reflections (from http://github.com/ronmamo/reflections) +- Reflections (from http://code.google.com/p/reflections/) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) - jaxen (from http://www.cafeconleche.org/jaxen) @@ -445,7 +457,7 @@ The following software have components provided under the terms of this license: - Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Protocol Buffers [Core] (from 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) -- Reflections (from http://github.com/ronmamo/reflections) +- Reflections (from http://code.google.com/p/reflections/) - SnakeYAML (from http://www.snakeyaml.org) - Spring Core (from https://github.com/spring-projects/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) @@ -519,6 +531,7 @@ EPL-1.0 ======================================================================== The following software have components provided under the terms of this license: +- AspectJ Weaver (from https://www.eclipse.org/aspectj/) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from https://junit.org/junit5/) - JUnit Jupiter Engine (from https://junit.org/junit5/) @@ -526,22 +539,22 @@ The following software have components provided under the terms of this license: - JUnit Platform Commons (from https://junit.org/junit5/) - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) - Jetty :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client) - Jetty :: Continuation (from http://www.eclipse.org/jetty) -- Jetty :: Http Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http) -- Jetty :: IO Utility (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io) -- Jetty :: Plus (from http://www.eclipse.org/jetty) -- Jetty :: Security (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security) -- Jetty :: Server Core (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server) -- Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty) -- Jetty :: Servlet Handling (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet) -- Jetty :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util) +- Jetty :: Http Utility (from http://www.eclipse.org/jetty) +- Jetty :: IO Utility (from http://www.eclipse.org/jetty) +- Jetty :: Plus (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus) +- Jetty :: Security (from http://www.eclipse.org/jetty) +- Jetty :: Server Core (from http://www.eclipse.org/jetty) +- Jetty :: Servlet Annotations (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations) +- Jetty :: Servlet Handling (from http://www.eclipse.org/jetty) +- Jetty :: Utilities (from http://www.eclipse.org/jetty) - Jetty :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax) - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty) -- Jetty :: Webapp Application Support (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp) +- Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty) - Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api) - Jetty :: Websocket :: Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-client) - Jetty :: Websocket :: Common (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-common) @@ -549,7 +562,7 @@ The following software have components provided under the terms of this license: - Jetty :: Websocket :: Servlet Interface (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-servlet) - Jetty :: Websocket :: javax.websocket :: Client Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-client-impl) - Jetty :: Websocket :: javax.websocket.server :: Server Implementation (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/javax-websocket-server-impl) -- Jetty :: XML utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml) +- Jetty :: XML utilities (from http://www.eclipse.org/jetty) - Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic) - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core) @@ -573,7 +586,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Commons (from https://junit.org/junit5/) - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) @@ -604,7 +617,7 @@ The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) - Cobertura (from http://cobertura.sourceforge.net) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) - JavaBeans Activation Framework (from ) @@ -616,7 +629,7 @@ GPL-3.0-only The following software have components provided under the terms of this license: - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) +- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Project Lombok (from https://projectlombok.org) @@ -699,7 +712,7 @@ The following software have components provided under the terms of this license: - JOpt Simple (from http://pholser.github.com/jopt-simple) - JUL to SLF4J bridge (from http://www.slf4j.org) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) -- Jetty :: Utilities (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util) +- Jetty :: Utilities (from http://www.eclipse.org/jetty) - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -735,7 +748,7 @@ The following software have components provided under the terms of this license: - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) -- spring-security-core (from http://spring.io/spring-security) +- spring-security-core (from https://spring.io/spring-security) ======================================================================== MPL-1.1 @@ -809,7 +822,7 @@ WTFPL ======================================================================== The following software have components provided under the terms of this license: -- Reflections (from http://github.com/ronmamo/reflections) +- Reflections (from http://code.google.com/p/reflections/) ======================================================================== X11 -- GitLab From f0e052097cd2a4bbb4e6ac268dd3033c749daac0 Mon Sep 17 00:00:00 2001 From: Yimin Zhou Date: Thu, 9 Sep 2021 11:08:36 -0500 Subject: [PATCH 06/10] update NOTICE --- NOTICE | 64 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/NOTICE b/NOTICE index 0c39896..f85dad9 100644 --- a/NOTICE +++ b/NOTICE @@ -88,7 +88,7 @@ The following software have components provided under the terms of this license: - Google Cloud Core (from https://github.com/googleapis/java-core) - Google Cloud Core HTTP (from https://github.com/googleapis/java-core) - 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/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore) +- Google Cloud Datastore (from https://github.com/googleapis/java-datastore) - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials) - Google Cloud Key Management Service (KMS) API v1-rev9-1.22.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) - Google Cloud Logging (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging) @@ -106,7 +106,7 @@ The following software have components provided under the terms of this license: - Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) - HttpClient (from http://hc.apache.org/httpcomponents-client) - HttpClient Cache (from http://hc.apache.org/httpcomponents-client) -- HttpCore (from http://hc.apache.org/httpcomponents-core-ga/) +- HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java) - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java) @@ -127,11 +127,11 @@ The following software have components provided under the terms of this license: - Jackson (from http://jackson.codehaus.org) - 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) +- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson) - 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 https://github.com/FasterXML/jackson-modules-base) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-Smile (from http://wiki.fasterxml.com/JacksonForSmile) @@ -141,14 +141,14 @@ The following software have components provided under the terms of this license: - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) +- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet) - Java UUID Generator (from http://wiki.fasterxml.com/JugHome) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) -- Jetty :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client) +- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty) - Jetty :: Continuation (from http://www.eclipse.org/jetty) - Jetty :: Http Utility (from http://www.eclipse.org/jetty) - Jetty :: IO Utility (from http://www.eclipse.org/jetty) @@ -158,7 +158,7 @@ The following software have components provided under the terms of this license: - Jetty :: Servlet Annotations (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations) - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty) - Jetty :: Utilities (from http://www.eclipse.org/jetty) -- Jetty :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax) +- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty) - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty) - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty) - Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api) @@ -248,7 +248,7 @@ The following software have components provided under the terms of this license: - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) - OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) -- Okio (from https://github.com/square/okio/) +- Okio (from 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) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -258,10 +258,6 @@ The following software have components provided under the terms of this license: - Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Plexus Velocity Component (from ) - PowerMock (from http://www.powermock.org) -- PowerMock (from http://www.powermock.org) -- PowerMock (from http://www.powermock.org) -- PowerMock (from http://www.powermock.org) -- 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 ) @@ -300,7 +296,6 @@ The following software have components provided under the terms of this license: - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) - cli (from https://github.com/elastic/elasticsearch) -- com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis) - compiler (from http://github.com/spullara/mustache.java) - core (from https://github.com/elastic/elasticsearch) - core (from https://github.com/elastic/elasticsearch) @@ -337,25 +332,30 @@ The following software have components provided under the terms of this license: - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) -- org.xmlunit:xmlunit-core (from https://www.xmlunit.org/) +- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) - parent-join (from https://github.com/elastic/elasticsearch) - perfmark:perfmark-api (from https://github.com/perfmark/perfmark) +- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) +- powermock-core (from http://www.powermock.org) +- powermock-module-junit4 (from http://www.powermock.org) - powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) +- powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect) - project ':json-path' (from https://github.com/jayway/JsonPath) +- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1) - proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1) - proto-google-cloud-logging-v2 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-logging-v2) - proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1) - proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos) - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - rank-eval (from https://github.com/elastic/elasticsearch) -- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) -- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) - rest (from https://github.com/elastic/elasticsearch) - rest-high-level (from https://github.com/elastic/elasticsearch) - rxjava (from https://github.com/ReactiveX/RxJava) @@ -403,9 +403,6 @@ BSD-2-Clause The following software have components provided under the terms of this license: - API Common (from https://github.com/googleapis/api-common-java) -- ASM Analysis (from ) -- ASM Commons (from https://repo1.maven.org/maven2/org/ow2/asm/asm-commons) -- ASM Tree (from ) - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - 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) @@ -419,6 +416,9 @@ The following software have components provided under the terms of this license: - Reflections (from http://code.google.com/p/reflections/) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) +- asm-analysis (from http://asm.ow2.io/) +- asm-commons (from http://asm.ow2.io/) +- asm-tree (from http://asm.ow2.io/) - jaxen (from http://www.cafeconleche.org/jaxen) ======================================================================== @@ -427,13 +427,6 @@ BSD-3-Clause The following software have components provided under the terms of this license: - API Common (from https://github.com/googleapis/api-common-java) -- ASM Analysis (from ) -- ASM Analysis (from ) -- ASM Commons (from https://repo1.maven.org/maven2/org/ow2/asm/asm-commons) -- ASM Commons (from https://repo1.maven.org/maven2/org/ow2/asm/asm-commons) -- ASM Tree (from ) -- ASM Tree (from ) -- ASM Util (from ) - 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) @@ -464,6 +457,13 @@ The following software have components provided under the terms of this license: - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) +- asm-analysis (from http://asm.ow2.io/) +- asm-analysis (from http://asm.ow2.io/) +- asm-commons (from http://asm.ow2.io/) +- asm-commons (from http://asm.ow2.io/) +- asm-tree (from http://asm.ow2.io/) +- asm-tree (from http://asm.ow2.io/) +- asm-util (from http://asm.ow2.io/) - classworlds (from http://classworlds.codehaus.org/) - jaxen (from http://www.cafeconleche.org/jaxen) - jsch (from https://repo1.maven.org/maven2/com/jcraft/jsch) @@ -540,9 +540,9 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) -- Jetty :: Asynchronous HTTP Client (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client) +- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet) +- Jetty :: Asynchronous HTTP Client (from http://www.eclipse.org/jetty) - Jetty :: Continuation (from http://www.eclipse.org/jetty) - Jetty :: Http Utility (from http://www.eclipse.org/jetty) - Jetty :: IO Utility (from http://www.eclipse.org/jetty) @@ -552,7 +552,7 @@ The following software have components provided under the terms of this license: - Jetty :: Servlet Annotations (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations) - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty) - Jetty :: Utilities (from http://www.eclipse.org/jetty) -- Jetty :: Utilities :: Ajax(JSON) (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util-ajax) +- Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty) - Jetty :: Utility Servlets and Filters (from http://www.eclipse.org/jetty) - Jetty :: Webapp Application Support (from http://www.eclipse.org/jetty) - Jetty :: Websocket :: API (from https://repo1.maven.org/maven2/org/eclipse/jetty/websocket/websocket-api) @@ -587,8 +587,8 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) +- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet) ======================================================================== GPL-2.0-only @@ -618,8 +618,8 @@ The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) - Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket) +- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet) - JavaBeans Activation Framework (from ) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) @@ -630,7 +630,7 @@ The following software have components provided under the terms of this license: - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet) +- Java Servlet API (from https://projects.eclipse.org/projects/ee4j.servlet) - Project Lombok (from https://projectlombok.org) ======================================================================== -- GitLab From 964c1b58446d733aef0133ef87cbe60de191aaaf Mon Sep 17 00:00:00 2001 From: Rostislav Vatolin Date: Thu, 9 Sep 2021 15:32:55 -0500 Subject: [PATCH 07/10] add name of protocol --- devops/azure/chart/templates/service.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/azure/chart/templates/service.yaml b/devops/azure/chart/templates/service.yaml index 73539df..7154576 100644 --- a/devops/azure/chart/templates/service.yaml +++ b/devops/azure/chart/templates/service.yaml @@ -9,5 +9,6 @@ spec: - protocol: TCP port: 80 targetPort: 80 + name: http selector: app: {{ .Chart.Name }} -- GitLab From 72252d2d3219fdcf33039b167f974c3efffad8e6 Mon Sep 17 00:00:00 2001 From: Rostislav Vatolin Date: Thu, 9 Sep 2021 19:07:23 -0500 Subject: [PATCH 08/10] remove unused methods --- devops/azure/chart/templates/virtual-service.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/devops/azure/chart/templates/virtual-service.yaml b/devops/azure/chart/templates/virtual-service.yaml index 02da324..e17561b 100644 --- a/devops/azure/chart/templates/virtual-service.yaml +++ b/devops/azure/chart/templates/virtual-service.yaml @@ -29,8 +29,5 @@ spec: allowMethods: - POST - GET - - PUT - - PATCH - - DELETE allowOrigins: - prefix: "*" \ No newline at end of file -- GitLab From c78fc0743058c39addf1e0bf81f09e9697b1dd94 Mon Sep 17 00:00:00 2001 From: Yimin Zhou Date: Mon, 13 Sep 2021 07:42:11 -0500 Subject: [PATCH 09/10] update NOTICE --- NOTICE | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/NOTICE b/NOTICE index f85dad9..6cf933b 100644 --- a/NOTICE +++ b/NOTICE @@ -70,6 +70,7 @@ The following software have components provided under the terms of this license: - Commons Digester (from http://commons.apache.org/digester/) - Commons Lang (from http://commons.apache.org/lang/) - Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson) +- Core Reactor components (from https://github.com/reactor/reactor) - Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) - Doxia :: APT Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-apt/) @@ -186,8 +187,8 @@ The following software have components provided under the terms of this license: - Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping) - Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) -- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) +- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries) - Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser) @@ -244,11 +245,9 @@ The following software have components provided under the terms of this license: - Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) -- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) - OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) -- Okio (from 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) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -268,6 +267,8 @@ The following software have components provided under the terms of this license: - Spring AOP (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework) - Spring Boot Jetty Starter (from http://projects.spring.io/spring-boot/) +- Spring Boot Log4j 2 Starter (from http://projects.spring.io/spring-boot/) +- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework) - Spring Core (from https://github.com/spring-projects/spring-framework) @@ -287,9 +288,9 @@ The following software have components provided under the terms of this license: - Vavr Match (from http://vavr.io) - Woodstox (from https://github.com/FasterXML/woodstox) - Xerces2-j (from https://xerces.apache.org/xerces2-j/) +- Zipkin Core Library (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) - Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter) -- Zipkin v2 (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - aalto-xml (from ) - aggs-matrix-stats (from https://github.com/elastic/elasticsearch) - asm (from http://asm.ow2.io/) @@ -298,9 +299,10 @@ The following software have components provided under the terms of this license: - cli (from https://github.com/elastic/elasticsearch) - compiler (from http://github.com/spullara/mustache.java) - core (from https://github.com/elastic/elasticsearch) -- core (from https://github.com/elastic/elasticsearch) - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) +- elasticsearch-core (from https://github.com/elastic/elasticsearch) - elasticsearch-geo (from https://github.com/elastic/elasticsearch) +- elasticsearch-x-content (from https://github.com/elastic/elasticsearch) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) - grpc-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/grpc-google-cloud-pubsub-v1) @@ -329,6 +331,7 @@ The following software have components provided under the terms of this license: - mockito-core (from https://github.com/mockito/mockito) - okhttp (from https://square.github.io/okhttp/) - okhttp-urlconnection (from https://github.com/square/okhttp) +- okio (from https://github.com/square/okio/) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) @@ -368,10 +371,8 @@ The following software have components provided under the terms of this license: - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) - spring-boot-starter-aop (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-validation (from https://spring.io/projects/spring-boot) - spring-boot-starter-web (from https://spring.io/projects/spring-boot) @@ -394,7 +395,6 @@ The following software have components provided under the terms of this license: - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) - swagger-jaxrs (from ) - swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) -- x-content (from https://github.com/elastic/elasticsearch) - xml-apis (from ) ======================================================================== @@ -734,7 +734,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) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) - Objectify App Engine (from https://github.com/objectify/objectify) -- Plexus Default Interactivity Handler (from ) +- Plexus Default Interactivity Handler (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api) - Project Lombok (from https://projectlombok.org) - SLF4J API Module (from http://www.slf4j.org) - Spongy Castle (from http://rtyley.github.io/spongycastle/) -- GitLab From 9402344aa024622c1fb1e12b53671049709ff7bb Mon Sep 17 00:00:00 2001 From: Rostislav Vatolin Date: Mon, 13 Sep 2021 10:53:18 -0500 Subject: [PATCH 10/10] update notice file --- NOTICE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 6cf933b..103c655 100644 --- a/NOTICE +++ b/NOTICE @@ -153,10 +153,10 @@ The following software have components provided under the terms of this license: - Jetty :: Continuation (from http://www.eclipse.org/jetty) - Jetty :: Http Utility (from http://www.eclipse.org/jetty) - Jetty :: IO Utility (from http://www.eclipse.org/jetty) -- Jetty :: Plus (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus) +- Jetty :: Plus (from http://www.eclipse.org/jetty) - Jetty :: Security (from http://www.eclipse.org/jetty) - Jetty :: Server Core (from http://www.eclipse.org/jetty) -- Jetty :: Servlet Annotations (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations) +- Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty) - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty) - Jetty :: Utilities (from http://www.eclipse.org/jetty) - Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty) @@ -546,10 +546,10 @@ The following software have components provided under the terms of this license: - Jetty :: Continuation (from http://www.eclipse.org/jetty) - Jetty :: Http Utility (from http://www.eclipse.org/jetty) - Jetty :: IO Utility (from http://www.eclipse.org/jetty) -- Jetty :: Plus (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-plus) +- Jetty :: Plus (from http://www.eclipse.org/jetty) - Jetty :: Security (from http://www.eclipse.org/jetty) - Jetty :: Server Core (from http://www.eclipse.org/jetty) -- Jetty :: Servlet Annotations (from https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations) +- Jetty :: Servlet Annotations (from http://www.eclipse.org/jetty) - Jetty :: Servlet Handling (from http://www.eclipse.org/jetty) - Jetty :: Utilities (from http://www.eclipse.org/jetty) - Jetty :: Utilities :: Ajax(JSON) (from http://www.eclipse.org/jetty) -- GitLab