Skip to content
Snippets Groups Projects
Commit 7d5c6d57 authored by khoi huynh anh's avatar khoi huynh anh
Browse files

Merge branch 'develop' into 'main'

Develop to main M25

See merge request !119
parents 836306b1 ed4acf20
No related tags found
1 merge request!119Develop to main M25
Pipeline #293146 failed
......@@ -158,6 +158,12 @@ The following software have components provided under the terms of this license:
- Okio (from https://github.com/square/okio/, https://repo1.maven.org/maven2/com/squareup/okio/okio)
- OpenTelemetry Instrumentation for Java (from https://github.com/open-telemetry/opentelemetry-java-instrumentation)
- OpenTelemetry Java (from https://github.com/open-telemetry/opentelemetry-java)
- Spring Beans (from http://www.springframework.org, https://github.com/SpringSource/spring-framework, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-beans)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
- Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core)
- Spring Web (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-web)
- micrometer-commons (from https://github.com/micrometer-metrics/micrometer)
- micrometer-observation (from https://github.com/micrometer-metrics/micrometer)
========================================================================
BSD-2-Clause
......@@ -186,6 +192,7 @@ The following software have components provided under the terms of this license:
- 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)
- OpenTelemetry Java (from https://github.com/open-telemetry/opentelemetry-java)
- scala-asm (from http://www.scala-lang.org/)
- Spring Core (from http://www.springframework.org, https://github.com/spring-projects/spring-framework, https://repo1.maven.org/maven2/org/springframework/spring-core)
========================================================================
Beerware
......@@ -306,6 +313,7 @@ The following software have components provided under the terms of this license:
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- Microsoft Azure Java XML Library (from https://github.com/Azure/azure-sdk-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java, https://github.com/AzureAD/microsoft-authentication-library-for-java)
- micrometer-commons (from https://github.com/micrometer-metrics/micrometer)
========================================================================
MPL-2.0
......
......@@ -73,7 +73,7 @@ lazy val core =
//Newly added
//"org.json4s" %% "json4s-jackson" % "3.6.5",
//"org.json4s" %% "json4s-ext" % "3.6.5",
"org.opengroup.osdu.production" %% "pddms-integration-lib" % "0.2.0-test-3",
"org.opengroup.osdu.production" %% "pddms-integration-lib" % "0.2.0-test-4",
"org.scala-lang" %% "scala3-staging" % scalaVer,
"org.opengroup.osdu.production" %% "pddms-observability-lib" % "0.0.20",
//"com.google.protobuf" % "protobuf-java" % "3.13.0" % "protobuf"
......
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