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

Merge sandbox #27

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Merge sandbox #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e1c82
resolve merge conflict
pmchung Nov 20, 2024
ce5d4ba
add back submodule
pmchung Nov 20, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ jobs:
- name: Install dependencies
run: yarn install
- run: yarn run build

10 changes: 5 additions & 5 deletions annotations-processor/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"compileClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -145,7 +145,7 @@
},
"runtimeClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -244,7 +244,7 @@
},
"testCompileClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -605,7 +605,7 @@
},
"testRuntimeClasspath": {
"com.github.jknack:handlebars": {
"locked": "4.3.0"
"locked": "4.3.1"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
Expand Down Expand Up @@ -988,4 +988,4 @@
]
}
}
}
}
258 changes: 257 additions & 1 deletion awss3-storage/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,18 @@
"com.netflix.conductor:conductor-core"
]
},
"com.squareup.okhttp3:okhttp": {
"locked": "3.14.9",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"com.squareup.okio:okio": {
"locked": "1.17.2",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"commons-codec:commons-codec": {
"locked": "1.15",
"transitive": [
Expand All @@ -360,12 +372,128 @@
"org.apache.httpcomponents:httpclient"
]
},
"io.opentelemetry:opentelemetry-api": {
"locked": "1.23.1",
"transitive": [
"com.netflix.conductor:conductor-core",
"io.opentelemetry:opentelemetry-api-events",
"io.opentelemetry:opentelemetry-api-logs",
"io.opentelemetry:opentelemetry-exporter-common",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace",
"io.opentelemetry:opentelemetry-semconv"
]
},
"io.opentelemetry:opentelemetry-api-events": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-api-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-context": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api"
]
},
"io.opentelemetry:opentelemetry-exporter-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp": {
"locked": "1.23.1",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp"
]
},
"io.opentelemetry:opentelemetry-sdk": {
"locked": "1.23.1",
"transitive": [
"com.netflix.conductor:conductor-core",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
"io.sentry:sentry-opentelemetry-core"
]
},
"io.opentelemetry:opentelemetry-sdk-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-logs",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-sdk-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-metrics": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-trace": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-semconv": {
"locked": "1.23.1-alpha",
"transitive": [
"com.netflix.conductor:conductor-core",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.reactivex:rxjava": {
"locked": "1.3.8",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"io.sentry:sentry": {
"locked": "6.14.0",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"io.sentry:sentry-opentelemetry-core": {
"locked": "6.14.0",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"jakarta.activation:jakarta.activation-api": {
"locked": "1.2.2",
"transitive": [
Expand Down Expand Up @@ -1025,6 +1153,18 @@
"com.netflix.conductor:conductor-core"
]
},
"com.squareup.okhttp3:okhttp": {
"locked": "3.14.9",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"com.squareup.okio:okio": {
"locked": "1.17.2",
"transitive": [
"com.squareup.okhttp3:okhttp"
]
},
"com.vaadin.external.google:android-json": {
"locked": "0.0.20131108.vaadin1",
"transitive": [
Expand All @@ -1050,12 +1190,128 @@
"org.apache.httpcomponents:httpclient"
]
},
"io.opentelemetry:opentelemetry-api": {
"locked": "1.23.1",
"transitive": [
"com.netflix.conductor:conductor-core",
"io.opentelemetry:opentelemetry-api-events",
"io.opentelemetry:opentelemetry-api-logs",
"io.opentelemetry:opentelemetry-exporter-common",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace",
"io.opentelemetry:opentelemetry-semconv"
]
},
"io.opentelemetry:opentelemetry-api-events": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-api-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk-logs"
]
},
"io.opentelemetry:opentelemetry-context": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-api"
]
},
"io.opentelemetry:opentelemetry-exporter-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp": {
"locked": "1.23.1",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"io.opentelemetry:opentelemetry-exporter-otlp-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp"
]
},
"io.opentelemetry:opentelemetry-sdk": {
"locked": "1.23.1",
"transitive": [
"com.netflix.conductor:conductor-core",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
"io.sentry:sentry-opentelemetry-core"
]
},
"io.opentelemetry:opentelemetry-sdk-common": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-logs",
"io.opentelemetry:opentelemetry-sdk-metrics",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-exporter-otlp-common"
]
},
"io.opentelemetry:opentelemetry-sdk-logs": {
"locked": "1.23.1-alpha",
"transitive": [
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-metrics": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"
]
},
"io.opentelemetry:opentelemetry-sdk-trace": {
"locked": "1.23.1",
"transitive": [
"io.opentelemetry:opentelemetry-exporter-otlp",
"io.opentelemetry:opentelemetry-sdk"
]
},
"io.opentelemetry:opentelemetry-semconv": {
"locked": "1.23.1-alpha",
"transitive": [
"com.netflix.conductor:conductor-core",
"io.opentelemetry:opentelemetry-sdk-common",
"io.opentelemetry:opentelemetry-sdk-trace"
]
},
"io.reactivex:rxjava": {
"locked": "1.3.8",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"io.sentry:sentry": {
"locked": "6.14.0",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"io.sentry:sentry-opentelemetry-core": {
"locked": "6.14.0",
"transitive": [
"com.netflix.conductor:conductor-core"
]
},
"jakarta.activation:jakarta.activation-api": {
"locked": "1.2.2",
"transitive": [
Expand Down Expand Up @@ -1430,4 +1686,4 @@
]
}
}
}
}
Loading