Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump the java-sample-app-deps group in /sample-apps/java-sample-app with 18 updates #1013

Closed
wants to merge 1 commit into from
Closed

Bump the java-sample-app-deps group in /sample-apps/java-sample-app with 18 updates #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sample-apps/java-sample-app/auto/build.gradle.kts
View file
Open in desktop
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.32.0"
val javaAgent = "software.amazon.opentelemetry:aws-opentelemetry-agent:1.32.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ repositories {

dependencies {
// Used to have access to the APIs
api("io.opentelemetry:opentelemetry-api:1.33.0")
api("io.opentelemetry:opentelemetry-api:1.36.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.12.0")
api(platform("software.amazon.awssdk:bom:2.22.9"))
api(platform("software.amazon.awssdk:bom:2.25.22"))
api("software.amazon.awssdk:s3")

// Not exposed to dependent modules
implementation("org.yaml:snakeyaml:2.2")
implementation("org.apache.logging.log4j:log4j-api:2.22.1")
implementation("org.apache.logging.log4j:log4j-core:2.22.1")
implementation("org.slf4j:slf4j-simple:2.0.10")
implementation("org.apache.logging.log4j:log4j-api:2.23.1")
implementation("org.apache.logging.log4j:log4j-core:2.23.1")
implementation("org.slf4j:slf4j-simple:2.0.12")

}

10 changes: 5 additions & 5 deletions sample-apps/java-sample-app/extension/build.gradle.kts
View file
Open in desktop
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.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
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.33.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-sdk-extension-autoconfigure-spi:1.36.0")
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.2.0")
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:2.2.0-alpha")
compileOnly("io.opentelemetry:opentelemetry-semconv:1.30.1-alpha")
}

Expand Down
18 changes: 9 additions & 9 deletions sample-apps/java-sample-app/manual/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,35 @@ jib {
dependencies {

// OpenTelemetry APIs and SDKs
implementation(platform("io.opentelemetry:opentelemetry-bom:1.33.0"))
implementation(platform("io.opentelemetry:opentelemetry-bom:1.36.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.32.0-alpha")
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.32.0")
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.34.0-alpha")
implementation("io.opentelemetry.contrib:opentelemetry-aws-xray:1.34.0")

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

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

implementation(project(":base"))

constraints {
implementation("com.fasterxml.jackson:jackson-bom:2.16.1") {
implementation("com.fasterxml.jackson:jackson-bom:2.17.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.22.1")
implementation("org.apache.logging.log4j:log4j-core:2.22.1")
implementation("org.slf4j:slf4j-simple:2.0.10")
implementation("org.apache.logging.log4j:log4j-api:2.23.1")
implementation("org.apache.logging.log4j:log4j-core:2.23.1")
implementation("org.slf4j:slf4j-simple:2.0.12")
}


Expand Down
2 changes: 1 addition & 1 deletion sample-apps/java-sample-app/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rootProject.name = "java-sample-app"

pluginManagement {
plugins {
id("com.google.cloud.tools.jib") version "3.4.0"
id("com.google.cloud.tools.jib") version "3.4.2"
}
}

Expand Down
Loading