Skip to content
Snippets Groups Projects
Commit 493efc1e authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'dependency-upgrade' into 'master'

Upgrade First Party Library Dependencies for Release 0.14

See merge request !178
parents 9227a42f b9f6b2c7
No related branches found
No related tags found
2 merge requests!211Updated topics.json - Replace common with osdu as common data partition is not a concept in OSDU.,!178Upgrade First Party Library Dependencies for Release 0.14
Pipeline #101353 passed
......@@ -17,13 +17,15 @@ The following software have components provided under the terms of this license:
- ASM based accessors helper used by json-smart (from https://urielch.github.io/)
- AWS SDK for Java - BOM (from https://aws.amazon.com/sdkforjava)
- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/, https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils)
- Apache Commons CLI (from https://commons.apache.org/proper/commons-cli/, https://repo1.maven.org/maven2/commons-cli/commons-cli)
- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/, https://commons.apache.org/proper/commons-codec/)
- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
- Apache Commons IO (from http://commons.apache.org/io/, https://commons.apache.org/proper/commons-io/, https://repo1.maven.org/maven2/commons-io/commons-io)
- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/logging/, http://commons.apache.org/proper/commons-logging/)
- Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version})
- Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga, http://hc.apache.org/httpcomponents-core-ga/)
- AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core)
- BSON (from http://bsonspec.org, https://bsonspec.org)
......@@ -34,19 +36,18 @@ The following software have components provided under the terms of this license:
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Expression Language 3.0 API (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
- Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava)
- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- HikariCP (from https://github.com/brettwooldridge/HikariCP)
- HttpClient (from http://hc.apache.org/httpcomponents-client)
- IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart, https://urielch.github.io/)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSONassert (from http://github.com/skyscreamer/yoga)
- JSONassert (from http://github.com/skyscreamer/yoga, https://github.com/skyscreamer/JSONassert)
- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310, https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
......@@ -61,7 +62,10 @@ The following software have components provided under the terms of this license:
- 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/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
- Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/)
- Kotlin Stdlib (from https://kotlinlang.org/, https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib)
- Kotlin Stdlib Common (from https://kotlinlang.org/)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
......@@ -85,20 +89,21 @@ The following software have components provided under the terms of this license:
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- PostgreSQL JDBC Driver
- PowerMock (from http://www.powermock.org, https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- RxJava (from https://github.com/ReactiveX/RxJava)
- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org)
- Spring Boot AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-autoconfigure, https://spring.io/projects/spring-boot)
- Spring Plugin - Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core)
- Spring Plugin Core (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-core)
- Woodstox (from https://github.com/FasterXML/woodstox)
- 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 https://github.com/FasterXML/aalto-xml, https://repo1.maven.org/maven2/com/fasterxml/aalto-xml)
- commons-beanutils (from https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- ion-java (from https://github.com/amzn/ion-java/, https://github.com/amznlabs/ion-java/)
- jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome)
- jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject)
- javax.inject (from http://code.google.com/p/atinject/)
- javax.inject (from http://code.google.com/p/atinject/, https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath)
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
......@@ -110,7 +115,6 @@ The following software have components provided under the terms of this license:
- 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)
- rxjava (from https://github.com/ReactiveX/RxJava)
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
......@@ -123,7 +127,7 @@ The following software have components provided under the terms of this license:
- ASM Tree (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-tree)
- ASM Util (from http://asm.ow2.io/)
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- Hamcrest Core (from http://hamcrest.org/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- PostgreSQL JDBC Driver
- Reflections (from http://code.google.com/p/reflections/, http://github.com/ronmamo/reflections)
......@@ -140,11 +144,11 @@ The following software have components provided under the terms of this license:
- ASM Core (from http://asm.ow2.io/, http://asm.ow2.org/)
- ASM Tree (from http://asm.ow2.io/, https://repo1.maven.org/maven2/org/ow2/asm/asm-tree)
- ASM Util (from http://asm.ow2.io/)
- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/, https://commons.apache.org/proper/commons-codec/)
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- Hamcrest Core (from http://hamcrest.org/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
- Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito)
......@@ -174,14 +178,14 @@ CDDL-1.0
========================================================================
The following software have components provided under the terms of this license:
- JavaBeans Activation Framework API jar
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
========================================================================
CDDL-1.1
========================================================================
The following software have components provided under the terms of this license:
- Expression Language 3.0 API (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net)
- HK2 Spring Bridge (from https://repo1.maven.org/maven2/org/glassfish/hk2/spring-bridge)
- HK2 config types (from https://repo1.maven.org/maven2/org/glassfish/hk2/config-types)
- HK2 configuration module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-config)
......@@ -208,8 +212,10 @@ The following software have components provided under the terms of this license:
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Logback Classic Module (from http://logback.qos.ch, https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
......@@ -223,8 +229,6 @@ The following software have components provided under the terms of this license:
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
========================================================================
EPL-2.0
......@@ -233,8 +237,10 @@ The following software have components provided under the terms of this license:
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
......@@ -242,19 +248,18 @@ The following software have components provided under the terms of this license:
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject)
- javax.ws.rs-api (from https://github.com/eclipse-ee4j/jaxrs-api)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
========================================================================
GPL-2.0-only
========================================================================
The following software have components provided under the terms of this license:
- Expression Language 3.0 API (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- JavaBeans Activation Framework
- JavaMail API jar (from https://repo1.maven.org/maven2/javax/mail/javax.mail-api)
- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
......@@ -270,13 +275,14 @@ GPL-2.0-with-classpath-exception
========================================================================
The following software have components provided under the terms of this license:
- Expression Language 3.0 API (from http://uel.java.net)
- Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net)
- HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
- JavaBeans Activation Framework
- JavaMail API jar (from https://repo1.maven.org/maven2/javax/mail/javax.mail-api)
- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator)
- aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged)
- jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject)
......@@ -323,12 +329,20 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- SnakeYAML (from http://code.google.com/p/snakeyaml/, http://www.snakeyaml.org)
========================================================================
LGPL-3.0-only
========================================================================
The following software have components provided under the terms of this license:
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
========================================================================
MIT
========================================================================
The following software have components provided under the terms of this license:
- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
- Checker Qual (from https://checkerframework.org)
- JUL to SLF4J bridge (from http://www.slf4j.org)
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
......@@ -347,6 +361,7 @@ MPL-1.1
The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
========================================================================
MPL-2.0
......@@ -355,13 +370,14 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp, https://square.github.io/okhttp/)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
========================================================================
PHP-3.01
========================================================================
The following software have components provided under the terms of this license:
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
========================================================================
......@@ -383,11 +399,13 @@ public-domain
========================================================================
The following software have components provided under the terms of this license:
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
- Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- PostgreSQL JDBC Driver
- Project Lombok (from http://projectlombok.org, https://projectlombok.org)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
- reactive-streams (from http://www.reactive-streams.org/)
========================================================================
......@@ -395,14 +413,15 @@ unknown
========================================================================
The following software have components provided under the terms of this license:
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
- Checker Qual (from https://checkerframework.org)
- JSON in Java (from https://github.com/douglascrockford/JSON-java)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
......@@ -30,7 +30,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<springfox.version>3.0.0</springfox.version>
<osdu.oscorecommon.version>0.14.0-rc3</osdu.oscorecommon.version>
<osdu.oscorecommon.version>0.14.0</osdu.oscorecommon.version>
<log4j2.version>2.17.1</log4j2.version>
<gson.version>2.8.9</gson.version>
<json-smart.version>2.4.7</json-smart.version>
......
......@@ -115,7 +115,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.13.0</version>
<version>0.14.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -29,8 +29,8 @@
<packaging>jar</packaging>
<version>0.14.0-SNAPSHOT</version>
<properties>
<osdu.corelibazure.version>0.14.0-rc2</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.14.0-rc3</osdu.oscorecommon.version>
<osdu.corelibazure.version>0.14.0</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.14.0</osdu.oscorecommon.version>
<junit-jupiter.version>5.6.0</junit-jupiter.version>
<mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.14.0-rc2</version>
<version>0.14.0</version>
</dependency>
<dependency>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId>
<version>0.13.0</version>
<version>0.14.0</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
......
......@@ -20,7 +20,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.13.0</version>
<version>0.14.0</version>
</dependency>
<dependency>
......
......@@ -33,7 +33,7 @@ Copyright 2020 IBM Corp. All Rights Reserved.
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-lib-ibm.version>0.13.0</os-core-lib-ibm.version>
<os-core-lib-ibm.version>0.14.0</os-core-lib-ibm.version>
</properties>
<dependencies>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment