Skip to content

Commit

Permalink
Merge pull request #870 from aws-observability/dependabot/gradle/samp…
Browse files Browse the repository at this point in the history
…le-apps/java-sample-app/java-sample-app-deps-6483a4a110

Bump the java-sample-app-deps group in /sample-apps/java-sample-app with 17 updates
  • Loading branch information
vasireddy99 committed Dec 11, 2023
2 parents 7bcd647 + e7d42d7 commit fc4f5af
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion sample-apps/java-sample-app/auto/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repositories {
}


val javaAgent = "software.amazon.opentelemetry:aws-opentelemetry-agent:1.30.0"
val javaAgent = "software.amazon.opentelemetry:aws-opentelemetry-agent:1.31.1"
val javaAgentVersion = javaAgent.split(":").get(2)

jib {
Expand Down
10 changes: 5 additions & 5 deletions sample-apps/java-sample-app/base/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ repositories {

dependencies {
// Used to have access to the APIs
api("io.opentelemetry:opentelemetry-api:1.31.0")
api("io.opentelemetry:opentelemetry-api:1.32.0")

// Third party libraries used in this application
// Exposed to dependent modules
api("com.sparkjava:spark-core:2.9.4")
api("com.squareup.okhttp3:okhttp:4.11.0")
api(platform("software.amazon.awssdk:bom:2.20.162"))
api("com.squareup.okhttp3:okhttp:4.12.0")
api(platform("software.amazon.awssdk:bom:2.21.38"))
api("software.amazon.awssdk:s3")

// Not exposed to dependent modules
implementation("org.yaml:snakeyaml:2.2")
implementation("org.apache.logging.log4j:log4j-api:2.20.0")
implementation("org.apache.logging.log4j:log4j-core:2.20.0")
implementation("org.apache.logging.log4j:log4j-api:2.22.0")
implementation("org.apache.logging.log4j:log4j-core:2.22.0")
implementation("org.slf4j:slf4j-simple:2.0.9")

}
Expand Down
10 changes: 5 additions & 5 deletions sample-apps/java-sample-app/extension/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ repositories {
mavenCentral()
}
dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
compileOnly("com.google.auto.service:auto-service:1.1.1")
annotationProcessor("com.google.auto.service:auto-service:1.1.1")

compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.31.0")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.30.0")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.30.0-alpha")
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.32.0")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.32.0")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.32.0-alpha")
compileOnly("io.opentelemetry:opentelemetry-semconv:1.30.1-alpha")
}

Expand Down
16 changes: 8 additions & 8 deletions sample-apps/java-sample-app/manual/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,34 @@ jib {
dependencies {

// OpenTelemetry APIs and SDKs
implementation(platform("io.opentelemetry:opentelemetry-bom:1.30.1"))
implementation(platform("io.opentelemetry:opentelemetry-bom:1.32.0"))
implementation("io.opentelemetry:opentelemetry-api")
implementation("io.opentelemetry:opentelemetry-sdk")

// OpenTelemetry Exporters
implementation("io.opentelemetry:opentelemetry-exporter-otlp")

// OpenTelemetry Aws Xray dependencies
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.30.0-alpha")
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.30.0")
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.32.0-alpha")
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.32.0")

// OpenTelemetry AWS SDK Library Instrumentation
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha"))
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha"))
implementation("io.opentelemetry.instrumentation:opentelemetry-aws-sdk-2.2")

// Opentelemetry OkHttp Library Instrumentation
implementation("io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.30.0-alpha")
implementation("io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.32.0-alpha")

implementation(project(":base"))

constraints {
implementation("com.fasterxml.jackson:jackson-bom:2.15.2") {
implementation("com.fasterxml.jackson:jackson-bom:2.16.0") {
because("bom used upstream is problematic. https://github.com/FasterXML/jackson-bom/issues/52#issuecomment-1292883281")
}
}

implementation("org.apache.logging.log4j:log4j-api:2.20.0")
implementation("org.apache.logging.log4j:log4j-core:2.20.0")
implementation("org.apache.logging.log4j:log4j-api:2.22.0")
implementation("org.apache.logging.log4j:log4j-core:2.22.0")
implementation("org.slf4j:slf4j-simple:2.0.9")
}

Expand Down

0 comments on commit fc4f5af

Please sign in to comment.