diff --git a/NOTICE b/NOTICE index 3493bbb436a05aa85bc7763b44a5fa19217f52e8..e62ecc04798069a04ad3927ecba6c6333fb841d9 100644 --- a/NOTICE +++ b/NOTICE @@ -17,7 +17,7 @@ The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Cobertura (from http://cobertura.sourceforge.net) - Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - oro (from ) ======================================================================== @@ -27,9 +27,9 @@ The following software have components provided under the terms of this license: - AMQP 1.0 JMS Spring Boot AutoConfiguration (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-autoconfigure) - AMQP 1.0 JMS Spring Boot Starter (from https://repo1.maven.org/maven2/org/amqphub/spring/amqp-10-jms-spring-boot-starter) -- ASM Core (from ) -- ASM Core (from ) -- ASM Core (from ) +- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm) +- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm) +- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm) - ASM based accessors helper used by json-smart (from ) - ASM based accessors helper used by json-smart (from ) - AWS Event Stream (from https://github.com/awslabs/aws-eventstream-java) @@ -308,18 +308,16 @@ The following software have components provided under the terms of this license: - Apache Ant + JUnit (from http://ant.apache.org/) - Apache Ant Core (from http://ant.apache.org/) - Apache Ant Launcher (from http://ant.apache.org/) -- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/) - 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 Collections (from http://commons.apache.org/proper/commons-collections/) - Apache Commons IO (from https://commons.apache.org/proper/commons-io/) -- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/) +- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) - Apache HttpClient (from http://hc.apache.org/httpcomponents-client) - Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client) -- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) - Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) @@ -335,13 +333,14 @@ The following software have components provided under the terms of this license: - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) - Bean Validation API (from http://beanvalidation.org) - Bean Validation API (from http://beanvalidation.org) +- BeanUtils (from http://jakarta.apache.org/commons/beanutils/) - Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave) - Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http) - Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty) - Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Byte Buddy 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-rev20210127-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Storage JSON API v1-rev20200927-1.30.10 (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) @@ -362,27 +361,27 @@ The following software have components provided under the terms of this license: - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine) -- Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java) -- 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/java-core) -- Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore) +- 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 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 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/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging) -- Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub) -- Google Cloud Storage (from https://github.com/googleapis/java-storage) +- Google Cloud Logging (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging) +- Google Cloud Pub/Sub (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-pubsub) +- Google Cloud Storage (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-storage) - 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) -- Gson (from https://github.com/google/gson) +- Gson (from http://code.google.com/p/google-gson/) - Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess) - Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) +- HttpCore (base module) (from http://hc.apache.org/httpcomponents-core/) - 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) - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java) -- Identity and Access Management (IAM) API v1-rev247-1.23.0 (from ) +- Identity and Access Management (IAM) API v1-rev307-1.25.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam) - IntelliJ IDEA Annotations (from http://www.jetbrains.org) - IntelliJ IDEA Annotations (from http://www.jetbrains.org) - J2ObjC Annotations (from https://github.com/google/j2objc/) @@ -399,56 +398,54 @@ The following software have components provided under the terms of this license: - 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 https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310) -- 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: 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-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from http://wiki.fasterxml.com/JacksonHome) - Jackson-core (from http://wiki.fasterxml.com/JacksonHome) - 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-Afterburner (from http://wiki.fasterxml.com/JacksonHome) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava) -- Java Native Access (from https://repo1.maven.org/maven2/net/java/dev/jna/jna) +- Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Java UUID Generator (from http://wiki.fasterxml.com/JugHome) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Jetty Server (from http://jetty.mortbay.org) -- Jetty Utilities (from http://jetty.mortbay.org) +- 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) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) -- Json Path (from https://github.com/jayway/JsonPath) - 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) - KeePassJava2 :: JAXB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-jaxb) - KeePassJava2 :: KDB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdb) - KeePassJava2 :: KDBX (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdbx) - KeePassJava2 :: Simple (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-simple) -- KeyCloak Authz: Client API (from ) +- KeyCloak Authz: Client API (from https://repo1.maven.org/maven2/org/keycloak/keycloak-authz-client) - Keycloak :: Spring :: Boot :: Default :: Starter (from ) -- Keycloak Adapter Core (from ) -- Keycloak Adapter SPI (from ) -- Keycloak Common (from ) -- Keycloak Core (from ) +- Keycloak Adapter Core (from https://repo1.maven.org/maven2/org/keycloak/keycloak-adapter-core) +- Keycloak Adapter SPI (from https://repo1.maven.org/maven2/org/keycloak/keycloak-adapter-spi) +- Keycloak Common (from https://repo1.maven.org/maven2/org/keycloak/keycloak-common) +- Keycloak Core (from https://repo1.maven.org/maven2/org/keycloak/keycloak-core) - Keycloak Spring Boot 2 Integration (from ) - Keycloak Spring Boot Adapter Core (from ) -- Keycloak Spring Security Integration (from ) +- Keycloak Spring Security Integration (from https://repo1.maven.org/maven2/org/keycloak/keycloak-spring-security-adapter) - Kotlin Stdlib (from https://kotlinlang.org/) - Kotlin Stdlib Common (from https://kotlinlang.org/) -- Logback Contrib :: JSON :: Classic (from ) -- Logback Contrib :: JSON :: Core (from ) +- 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) - Logback Contrib :: Jackson (from ) - MapStruct Core (from https://repo1.maven.org/maven2/org/mapstruct/mapstruct) - Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact) - Maven Artifact Manager (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact-manager) - Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core) - Maven Error Diagnostics (from https://repo1.maven.org/maven2/org/apache/maven/maven-error-diagnostics) -- Maven Local Settings Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) - Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model) - Maven Monitor (from https://repo1.maven.org/maven2/org/apache/maven/maven-monitor) - Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api) @@ -459,6 +456,7 @@ The following software have components provided under the terms of this license: - Maven Project Builder (from https://repo1.maven.org/maven2/org/apache/maven/maven-project) - Maven Reporting API (from https://repo1.maven.org/maven2/org/apache/maven/reporting/maven-reporting-api) - Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata) +- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings) - Maven Wagon API (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-provider-api) - Maven Wagon File Provider (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-file) - Maven Wagon HTTP Shared Library (from https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http-shared) @@ -499,57 +497,78 @@ The following software have components provided under the terms of this license: - Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core) - 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 (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) - 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) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus Common Utilities (from http://plexus.codehaus.org/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) +- 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 ) -- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) +- Reactor Netty with all modules (from https://github.com/reactor/reactor-netty) - Retrofit (from https://github.com/square/retrofit) - Servlet Specification 2.5 API (from http://jetty.mortbay.org) -- SnakeYAML (from http://code.google.com/p/snakeyaml/) -- Spring AOP (from https://repo1.maven.org/maven2/org/springframework/spring-aop) -- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) -- Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat) -- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) +- 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 (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 Actuator Starter (from http://projects.spring.io/spring-boot/) +- Spring Boot AutoConfigure (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 (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 Validation Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-validation) +- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux) - Spring Cloud GCP Autoconfigure Module (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-autoconfigure) - Spring Cloud GCP Core Module (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-core) -- Spring Cloud GCP Datastore Module (from ) +- Spring Cloud GCP Datastore Module (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-data-datastore) - Spring Cloud GCP Datastore Starter (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-starter-data-datastore) - Spring Cloud GCP Support Starter (from https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-gcp-starter) - 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) - 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) - Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) - Spring JMS (from https://github.com/spring-projects/spring-framework) - Spring Messaging (from https://github.com/spring-projects/spring-framework) -- Spring Plugin - Core (from ) - Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata) -- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework) +- Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core) +- Spring TestContext Framework (from https://github.com/SpringSource/spring-framework) - Spring Transaction (from https://github.com/spring-projects/spring-framework) +- Spring Web (from https://github.com/spring-projects/spring-framework) +- Spring Web MVC (from https://github.com/spring-projects/spring-framework) - Spring WebFlux (from https://github.com/spring-projects/spring-framework) -- Spring beans (from https://repo1.maven.org/maven2/org/springframework/spring-beans) -- Spring context (from https://repo1.maven.org/maven2/org/springframework/spring-context) -- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core) -- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web) -- Spring web MVC (from https://repo1.maven.org/maven2/org/springframework/spring-webmvc) - Woodstox (from https://github.com/FasterXML/woodstox) - 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) - aalto-xml (from ) - aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client) -- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis) -- com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis) -- datastore-v1-proto-client (from ) +- com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis) +- com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis) +- datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) - 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) - io.grpc:grpc-alts (from https://github.com/grpc/grpc-java) - io.grpc:grpc-api (from https://github.com/grpc/grpc-java) - io.grpc:grpc-auth (from https://github.com/grpc/grpc-java) @@ -562,55 +581,36 @@ 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://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://github.com/FasterXML/jackson) +- 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/) - jose4j (from https://bitbucket.org/b_c/jose4j/) +- json-path (from http://code.google.com/p/json-path/) - lettuce (from http://github.com/mp911de/lettuce/wiki) +- logging-interceptor (from https://github.com/square/okhttp) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) - mockito-core (from https://github.com/mockito/mockito) - mockito-core (from https://github.com/mockito/mockito) -- okhttp (from https://square.github.io/okhttp/) -- okhttp-logging-interceptor (from https://square.github.io/okhttp/) - okhttp-urlconnection (from https://github.com/square/okhttp) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) -- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) -- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) -- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) -- powermock-core (from http://www.powermock.org) -- powermock-core (from http://www.powermock.org) -- powermock-module-junit4 (from http://www.powermock.org) -- powermock-module-junit4 (from http://www.powermock.org) +- org.xmlunit:xmlunit-core (from https://www.xmlunit.org/) - powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) - 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) -- powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect) -- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging) -- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-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://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-pubsub-v1) - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - rxjava (from https://github.com/ReactiveX/RxJava) -- 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-container-bundle (from ) - 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-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-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-boot-starter-tomcat (from https://spring.io/projects/spring-boot) +- spring-boot-starter-web (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-client (from http://spring.io/spring-security) @@ -639,15 +639,15 @@ 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) +- API Common (from https://github.com/googleapis) - 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) +- GAX (Google Api eXtensions) (from https://github.com/googleapis) +- GAX (Google Api eXtensions) (from https://github.com/googleapis) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Reflections (from http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) @@ -658,17 +658,17 @@ 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) +- API Common (from https://github.com/googleapis) - ASM Analysis (from ) -- ASM Commons (from ) -- ASM Core (from ) -- ASM Core (from ) -- ASM Core (from ) +- ASM Commons (from https://repo1.maven.org/maven2/org/ow2/asm/asm-commons) +- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm) +- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm) +- ASM Core (from https://repo1.maven.org/maven2/org/ow2/asm/asm) - 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) +- GAX (Google Api eXtensions) (from https://github.com/googleapis) +- GAX (Google Api eXtensions) (from https://github.com/googleapis) - GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) - Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials) @@ -683,12 +683,12 @@ The following software have components provided under the terms of this license: - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) -- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) +- Plexus Common Utilities (from http://plexus.codehaus.org/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) -- SnakeYAML (from http://code.google.com/p/snakeyaml/) -- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core) +- SnakeYAML (from http://www.snakeyaml.org) +- Spring Core (from https://github.com/spring-projects/spring-framework) - ThreeTen backport (from https://www.threeten.org/threetenbp) - classworlds (from http://classworlds.codehaus.org/) - jakarta.xml.bind-api (from ) @@ -758,20 +758,20 @@ The following software have components provided under the terms of this license: - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- JUnit Jupiter API (from https://junit.org/junit5/) -- JUnit Jupiter Engine (from https://junit.org/junit5/) - JUnit Jupiter Params (from https://junit.org/junit5/) -- Logback Classic Module (from http://logback.qos.ch) -- Logback Contrib :: JSON :: Classic (from ) -- Logback Contrib :: JSON :: Core (from ) +- 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) - Logback Contrib :: Jackson (from ) -- Logback Core Module (from http://logback.qos.ch) +- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-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) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) -- SnakeYAML (from http://code.google.com/p/snakeyaml/) +- SnakeYAML (from http://www.snakeyaml.org) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) +- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) +- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) - org.junit.platform:junit-platform-commons (from http://junit.org/junit5/) - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/) @@ -782,10 +782,10 @@ The following software have components provided under the terms of this license: - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- JUnit Jupiter API (from https://junit.org/junit5/) -- JUnit Jupiter Engine (from https://junit.org/junit5/) - JUnit Jupiter Params (from https://junit.org/junit5/) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) +- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) +- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) - org.junit.platform:junit-platform-commons (from http://junit.org/junit5/) - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/) @@ -807,7 +807,7 @@ GPL-2.0-or-later ======================================================================== The following software have components provided under the terms of this license: -- SnakeYAML (from http://code.google.com/p/snakeyaml/) +- SnakeYAML (from http://www.snakeyaml.org) ======================================================================== GPL-2.0-with-classpath-exception @@ -827,9 +827,9 @@ GPL-3.0-only The following software have components provided under the terms of this license: - Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) ======================================================================== @@ -861,15 +861,15 @@ The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) - Commons Lang (from http://commons.apache.org/lang/) -- Java Native Access (from https://repo1.maven.org/maven2/net/java/dev/jna/jna) +- Java Native Access (from https://github.com/java-native-access/jna) - Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- Logback Classic Module (from http://logback.qos.ch) -- Logback Contrib :: JSON :: Classic (from ) -- Logback Contrib :: JSON :: Core (from ) +- 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) - Logback Contrib :: Jackson (from ) -- Logback Core Module (from http://logback.qos.ch) +- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-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) - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -882,7 +882,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- SnakeYAML (from http://code.google.com/p/snakeyaml/) +- SnakeYAML (from http://www.snakeyaml.org) ======================================================================== LGPL-3.0-only @@ -932,16 +932,16 @@ 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) - Plexus Default Interactivity Handler (from ) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) - SLF4J API Module (from http://www.slf4j.org) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos) - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) -- java jwt (from http://www.jwt.io) +- java jwt (from https://github.com/auth0/java-jwt) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - mockito-core (from https://github.com/mockito/mockito) - mockito-core (from https://github.com/mockito/mockito) @@ -966,7 +966,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- okhttp (from https://square.github.io/okhttp/) +- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) ======================================================================== PHP-3.01 @@ -982,7 +982,7 @@ Public-Domain ======================================================================== 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 Common Utilities (from http://plexus.codehaus.org/plexus-utils) - Spongy Castle (from http://rtyley.github.io/spongycastle/) ======================================================================== @@ -1033,16 +1033,16 @@ The following software have components provided under the terms of this license: - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/) -- Keycloak Common (from ) +- Keycloak Common (from https://repo1.maven.org/maven2/org/keycloak/keycloak-common) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) -- Project Lombok (from https://projectlombok.org) -- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Project Lombok (from http://projectlombok.org) +- Spring Web (from https://github.com/spring-projects/spring-framework) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - reactive-streams (from http://www.reactive-streams.org/) @@ -1061,13 +1061,13 @@ The following software have components provided under the terms of this license: - JTidy (from http://jtidy.sourceforge.net) - JUnit (from http://junit.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) -- JUnit Jupiter API (from https://junit.org/junit5/) -- JUnit Jupiter Engine (from https://junit.org/junit5/) - JUnit Jupiter Params (from https://junit.org/junit5/) - JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/jakarta.activation) - JavaBeans Activation Framework API jar (from ) - Spongy Castle (from http://rtyley.github.io/spongycastle/) - jakarta.xml.bind-api (from ) +- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/) +- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/) - org.junit.platform:junit-platform-commons (from http://junit.org/junit5/) - org.junit.platform:junit-platform-engine (from http://junit.org/junit5/) - xml-apis (from ) diff --git a/README.md b/README.md index 9672c34cb046a6681dfd01d725990bbbf96ea654..2b1b855d0b217e7b511e3c3d0f2bb706d9a2c420 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/docs/api/partition_openapi.yaml b/docs/api/partition_openapi.yaml index df9712e0b20e57538718224d6cc82cf75b29a713..e540fcbc34ea5acf88494c8682e5539b6ab83914 100644 --- a/docs/api/partition_openapi.yaml +++ b/docs/api/partition_openapi.yaml @@ -15,6 +15,8 @@ tags: description: Partition Api - name: health-check description: Health Check + - name: info + description: "Version info endpoint" paths: /actuator/health: get: @@ -214,6 +216,21 @@ paths: security: - JWT: - global + /info: + get: + tags: + - info + summary: "Version info" + description: "For deployment available public `/info` endpoint, \ + \ which provides build and git related information." + operationId: "Version info" + produces: + - "application/json" + responses: + 200: + description: "Version info." + schema: + $ref: "#/definitions/VersionInfo" securityDefinitions: JWT: type: apiKey @@ -241,6 +258,46 @@ definitions: cosmos-connection: sensitive: true value: 'cosmos-connection' + VersionInfo: + type: "object" + properties: + groupId: + type: "string" + description: "Maven artifact group ID." + actifactId: + type: "string" + description: "Maven artifact ID." + version: + type: "string" + description: "Maven artifact version" + buildTime: + type: "string" + description: "Maven artifact build time" + branch: + type: "string" + description: "Current git branch" + commitId: + type: "string" + description: "Latest commit hash" + commitMessage: + type: "string" + description: "Latest commit message" + connectedOuterServices: + type: "array" + description: "Connected outer services information" + items: + $ref: "#/definitions/ConnectedOuterService" + description: "Version info." + ConnectedOuterService: + type: "object" + properties: + name: + type: "string" + description: "Connected outer service name." + version: + type: "string" + description: "Connected outer service version." + description: "Connected outer service information." Property: type: object properties: diff --git a/docs/tutorial/Partition.md b/docs/tutorial/Partition.md index d3bad4589a346fd08ca19d17455f9e4ab9e6b453..4b9ec6ccc402f04297dd0e9bd05442f22a3d06d8 100644 --- a/docs/tutorial/Partition.md +++ b/docs/tutorial/Partition.md @@ -10,7 +10,7 @@ * [Update an existing partition](#update-partition) * [Delete an existing partition](#delete-partition) * [List of partitions](#list-partition) - +* [Version info endpoint](#version-info-endpoint) ## Introduction Partition service is responsible for creating and retrieving the partition specific properties (secret and non-secret) on behalf of other services. @@ -200,4 +200,40 @@ A sample output is shown below. -[Back to Table of Contents](#TOC) \ No newline at end of file +[Back to Table of Contents](#TOC) + +## Version info endpoint +For deployment available public `/info` endpoint, which provides build and git related information. +#### Example response: +```json +{ + "groupId": "org.opengroup.osdu", + "artifactId": "storage-gcp", + "version": "0.10.0-SNAPSHOT", + "buildTime": "2021-07-09T14:29:51.584Z", + "branch": "feature/GONRG-2681_Build_info", + "commitId": "7777", + "commitMessage": "Added copyright to version info properties file", + "connectedOuterServices": [ + { + "name": "elasticSearch", + "version":"..." + }, + { + "name": "postgresSql", + "version":"..." + }, + { + "name": "redis", + "version":"..." + } + ] +} +``` +This endpoint takes information from files, generated by `spring-boot-maven-plugin`, +`git-commit-id-plugin` plugins. Need to specify paths for generated files to matching +properties: +- `version.info.buildPropertiesPath` +- `version.info.gitPropertiesPath` + +[Back to table of contents](#TOC) diff --git a/partition-core/src/main/java/org/opengroup/osdu/partition/api/InfoApi.java b/partition-core/src/main/java/org/opengroup/osdu/partition/api/InfoApi.java new file mode 100644 index 0000000000000000000000000000000000000000..3bd4885b44bc2271b63383827e546bcc5b1898dc --- /dev/null +++ b/partition-core/src/main/java/org/opengroup/osdu/partition/api/InfoApi.java @@ -0,0 +1,40 @@ +/* + * Copyright 2021 Google LLC + * Copyright 2021 EPAM Systems, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.opengroup.osdu.partition.api; + +import java.io.IOException; +import org.opengroup.osdu.core.common.info.VersionInfoBuilder; +import org.opengroup.osdu.core.common.model.info.VersionInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping +public class InfoApi { + + @Autowired + private VersionInfoBuilder versionInfoBuilder; + + @GetMapping(value = "/info", produces = MediaType.APPLICATION_JSON_VALUE) + public VersionInfo info() throws IOException { + return versionInfoBuilder.buildVersionInfo(); + } +} diff --git a/pom.xml b/pom.xml index 5b8cb91d9bdd8fa7cdc246b35f528357cb421851..76b4b09fdb82df561d5a978c1bfd8c47cd0e43ef 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1.8 1.8 UTF-8 - 0.10.0 + 0.11.0-SNAPSHOT 2.4.5 @@ -86,9 +86,40 @@ org.springframework.boot spring-boot-maven-plugin ${org.springframework.boot.version} + + + build-info + + build-info + + + + + + + pl.project13.maven + git-commit-id-plugin + 4.0.5 + + + + revision + + + + + true + yyyy-MM-dd'T'HH:mm:ssZ + true + + ${project.build.outputDirectory}/git.properties + + + + diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java index ba916caea6eb66b0e9bb2dd4789825cf8393dbe4..74294bef5653362c8db58e6e5c5fea46d00f833f 100644 --- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java +++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/security/AADSecurityConfig.java @@ -47,6 +47,7 @@ public class AADSecurityConfig extends WebSecurityConfigurerAdapter { "/configuration/security", "/swagger", "/swagger-ui.html", + "/info", "/webjars/**").permitAll() .anyRequest().authenticated() .and() diff --git a/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java b/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..baa931ac761e26a134acb716f3705941c58e2f45 --- /dev/null +++ b/testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java @@ -0,0 +1,20 @@ +package org.opengroup.osdu.partition.api; + +import org.junit.After; +import org.junit.Before; +import org.opengroup.osdu.partition.util.AwsTestUtils; + +public class TestGetVersionInfo extends GetVersionInfoApiTest { + + @Before + @Override + public void setup() throws Exception { + this.testUtils = new AwsTestUtils(); + } + + @After + @Override + public void tearDown() throws Exception { + this.testUtils = null; + } +} diff --git a/testing/partition-test-azure/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java b/testing/partition-test-azure/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..75a838d98e4917f6b45c98f40901dd1b10f66353 --- /dev/null +++ b/testing/partition-test-azure/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java @@ -0,0 +1,20 @@ +package org.opengroup.osdu.partition.api; + +import org.junit.After; +import org.junit.Before; +import org.opengroup.osdu.partition.util.AzureTestUtils; + +public class TestGetVersionInfo extends GetVersionInfoApiTest { + + @Before + @Override + public void setup() throws Exception { + this.testUtils = new AzureTestUtils(); + } + + @After + @Override + public void tearDown() throws Exception { + this.testUtils = null; + } +} diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/GetVersionInfoApiTest.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/GetVersionInfoApiTest.java new file mode 100644 index 0000000000000000000000000000000000000000..86291eeed8ace7f6a62df0f8e45bce2c035165cc --- /dev/null +++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/GetVersionInfoApiTest.java @@ -0,0 +1,53 @@ +/* + * Copyright 2021 Google LLC + * Copyright 2021 EPAM Systems, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.opengroup.osdu.partition.api; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import com.sun.jersey.api.client.ClientResponse; +import org.junit.Test; +import org.opengroup.osdu.partition.util.TestBase; +import org.opengroup.osdu.partition.util.TestUtils; +import org.opengroup.osdu.partition.util.VersionInfoUtils; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; + +public abstract class GetVersionInfoApiTest extends TestBase { + + protected static final VersionInfoUtils VERSION_INFO_UTILS = new VersionInfoUtils(); + + @Test + public void should_returnInfo() throws Exception { + ClientResponse response = TestUtils + .send("api/partition/v1/info", HttpMethod.GET.name(), this.testUtils.getAccessToken(), "", + "", false); + assertEquals(HttpStatus.OK.value(), response.getStatus()); + + VersionInfoUtils.VersionInfo responseObject = VERSION_INFO_UTILS + .getVersionInfoFromResponse(response); + + assertNotNull(responseObject.groupId); + assertNotNull(responseObject.artifactId); + assertNotNull(responseObject.version); + assertNotNull(responseObject.buildTime); + assertNotNull(responseObject.branch); + assertNotNull(responseObject.commitId); + assertNotNull(responseObject.commitMessage); + } +} diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/VersionInfoUtils.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/VersionInfoUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..0918d6c92caba4b1e7cf9a5ccbe610cd2782ca7e --- /dev/null +++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/util/VersionInfoUtils.java @@ -0,0 +1,44 @@ +/* + * Copyright 2021 Google LLC + * Copyright 2021 EPAM Systems, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.opengroup.osdu.partition.util; + +import static org.junit.Assert.assertTrue; + +import com.google.gson.Gson; +import com.sun.jersey.api.client.ClientResponse; + +public class VersionInfoUtils { + + public VersionInfo getVersionInfoFromResponse(ClientResponse response) { + assertTrue(response.getType().toString().contains("application/json")); + String json = response.getEntity(String.class); + Gson gson = new Gson(); + return gson.fromJson(json, VersionInfo.class); + } + + public class VersionInfo { + + public String groupId; + public String artifactId; + public String version; + public String buildTime; + public String branch; + public String commitId; + public String commitMessage; + } +} diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..513958fa3d4b194f5da6c14a9ab3e1763e74802b --- /dev/null +++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java @@ -0,0 +1,37 @@ +/* + * Copyright 2021 Google LLC + * Copyright 2021 EPAM Systems, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.opengroup.osdu.partition.api; + +import org.junit.After; +import org.junit.Before; +import org.opengroup.osdu.partition.util.GCPTestUtils; + +public class TestGetVersionInfo extends GetVersionInfoApiTest { + + @Before + @Override + public void setup() throws Exception { + this.testUtils = new GCPTestUtils(); + } + + @After + @Override + public void tearDown() throws Exception { + this.testUtils = null; + } +} diff --git a/testing/partition-test-ibm/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java b/testing/partition-test-ibm/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..7d4f37045cc2c9df2c383b421e3c328a3333b729 --- /dev/null +++ b/testing/partition-test-ibm/src/test/java/org/opengroup/osdu/partition/api/TestGetVersionInfo.java @@ -0,0 +1,20 @@ +package org.opengroup.osdu.partition.api; + +import org.junit.After; +import org.junit.Before; +import org.opengroup.osdu.partition.util.IBMTestUtils; + +public class TestGetVersionInfo extends GetVersionInfoApiTest { + + @Before + @Override + public void setup() throws Exception { + this.testUtils = new IBMTestUtils(); + } + + @After + @Override + public void tearDown() throws Exception { + this.testUtils = null; + } +}