Skip to content

Commit d5c2a3e

Browse files
refactor: bom (#201)
* refactor: bom * ci: update suppression file * build: submodule ref merged
1 parent 8a9c04b commit d5c2a3e

39 files changed

Lines changed: 1220 additions & 277 deletions

File tree

.github/workflows/update-locks.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Update Locks
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '12 12 * * 5'
6+
jobs:
7+
update-versions:
8+
runs-on: ubuntu-22.04
9+
steps:
10+
- name: Check out code
11+
uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
14+
submodules: recursive
15+
- name: Calculate simple repository name
16+
id: repo-basename
17+
shell: bash
18+
run: |
19+
echo "value=`basename ${{ github.repository }}`" >> $GITHUB_OUTPUT
20+
- name: Get Token from Github App
21+
uses: tibdex/github-app-token@v2
22+
id: generate-token
23+
with:
24+
app_id: ${{ secrets.GH_CI_APP_ID }}
25+
private_key: ${{ secrets.GH_CI_APP_PRIVATE_KEY }}
26+
repositories: >-
27+
[${{ toJson(steps.repo-basename.outputs.value) }}]
28+
- name: Update locks if needed
29+
uses: hypertrace/github-actions/raise-lock-pr@main
30+
with:
31+
token: ${{ steps.generate-token.outputs.token }}

build.gradle.kts

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,19 @@
11
plugins {
2-
id("org.hypertrace.repository-plugin") version "0.4.2"
3-
id("org.hypertrace.ci-utils-plugin") version "0.3.2"
4-
id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false
5-
id("org.hypertrace.docker-java-application-plugin") version "0.9.9" apply false
6-
id("org.hypertrace.docker-publish-plugin") version "0.9.9" apply false
7-
id("org.hypertrace.code-style-plugin") version "1.2.0" apply false
8-
id("org.owasp.dependencycheck") version "8.2.1"
2+
alias(commonLibs.plugins.hypertrace.ciutils)
3+
alias(commonLibs.plugins.hypertrace.codestyle) apply false
4+
alias(commonLibs.plugins.owasp.dependencycheck)
95
}
106

117
subprojects {
128
group = "org.hypertrace.graphql"
139

1410
pluginManager.withPlugin("java") {
15-
apply(plugin = "org.hypertrace.code-style-plugin")
11+
apply(plugin = commonLibs.plugins.hypertrace.codestyle.get().pluginId)
1612
configure<JavaPluginExtension> {
1713
sourceCompatibility = JavaVersion.VERSION_11
1814
targetCompatibility = JavaVersion.VERSION_11
1915
}
2016
}
21-
22-
pluginManager.withPlugin("java-library") {
23-
dependencies {
24-
"api"(platform(project(":hypertrace-graphql-platform")))
25-
"annotationProcessor"(platform(project(":hypertrace-graphql-platform")))
26-
"testAnnotationProcessor"(platform(project(":hypertrace-graphql-platform")))
27-
"testImplementation"(platform("org.hypertrace.core.graphql:hypertrace-core-graphql-test-platform"))
28-
"compileOnly"(platform(project(":hypertrace-graphql-platform")))
29-
"testCompileOnly"(platform(project(":hypertrace-graphql-platform")))
30-
}
31-
}
3217
}
3318

3419
dependencyCheck {

gradle/libs.versions.toml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[libraries]
2+
graphql-annotations = { module = "io.github.graphql-java:graphql-java-annotations", version = "9.1" }
3+
graphql-servlet = { module = "com.graphql-java-kickstart:graphql-java-servlet", version = "14.0.0" }
4+
5+
core-attribute-constants = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-scope-constants" }
6+
core-schema-common = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema" }
7+
core-schema-utils = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-schema-utils" }
8+
core-schema-registry = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-schema-registry" }
9+
core-schema-metadata = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-metadata-schema" }
10+
core-schema-spans = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-span-schema" }
11+
core-schema-logevents = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-log-event-schema" }
12+
core-schema-traces = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-trace-schema" }
13+
core-attribute-store = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-store" }
14+
core-spi = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-spi" }
15+
core-grpc = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-grpc-utils" }
16+
core-context = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-context" }
17+
core-deserialization = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization" }
18+
core-rxutils = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-rx-utils" }
19+
core-request-transformation = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-request-transformation" }
20+
core-gateway-utils = { module = "org.hypertrace.core.graphql:hypertrace-core-graphql-gateway-service-utils" }

gradle/wrapper/gradle-wrapper.jar

4.09 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 28 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hypertrace-core-graphql

hypertrace-graphql-attribute-scope/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ plugins {
33
}
44

55
dependencies {
6-
api("com.google.inject:guice")
7-
api("io.reactivex.rxjava3:rxjava")
8-
api("org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-scope-constants")
9-
api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema")
10-
implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-attribute-store")
6+
api(commonLibs.guice)
7+
api(commonLibs.rxjava3)
8+
api(localLibs.core.attribute.constants)
9+
api(localLibs.core.schema.common)
10+
implementation(localLibs.core.attribute.store)
1111
}
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath
5+
com.auth0:java-jwt:4.4.0=runtimeClasspath
6+
com.auth0:jwks-rsa:0.22.0=runtimeClasspath
7+
com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,runtimeClasspath
8+
com.fasterxml.jackson.core:jackson-core:2.15.2=compileClasspath,runtimeClasspath
9+
com.fasterxml.jackson.core:jackson-databind:2.15.2=compileClasspath,runtimeClasspath
10+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath
11+
com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath
12+
com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath
13+
com.google.android:annotations:4.1.1.4=runtimeClasspath
14+
com.google.api.grpc:proto-google-common-protos:2.17.0=runtimeClasspath
15+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath
16+
com.google.code.gson:gson:2.10.1=runtimeClasspath
17+
com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath
18+
com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath
19+
com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath
20+
com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath
21+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath
22+
com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath
23+
com.google.j2objc:j2objc-annotations:2.8=compileClasspath
24+
com.google.protobuf:protobuf-java:3.24.1=runtimeClasspath
25+
com.graphql-java-kickstart:graphql-java-kickstart:14.0.0=compileClasspath,runtimeClasspath
26+
com.graphql-java-kickstart:graphql-java-servlet:14.0.0=compileClasspath,runtimeClasspath
27+
com.graphql-java:graphql-java-extended-scalars:17.0=compileClasspath,runtimeClasspath
28+
com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath
29+
com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath
30+
io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath
31+
io.grpc:grpc-api:1.57.2=runtimeClasspath
32+
io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath
33+
io.grpc:grpc-context:1.57.2=runtimeClasspath
34+
io.grpc:grpc-core:1.57.2=runtimeClasspath
35+
io.grpc:grpc-protobuf-lite:1.57.2=runtimeClasspath
36+
io.grpc:grpc-protobuf:1.57.2=runtimeClasspath
37+
io.grpc:grpc-stub:1.57.2=runtimeClasspath
38+
io.netty:netty-bom:4.1.100.Final=runtimeClasspath
39+
io.perfmark:perfmark-api:0.26.0=runtimeClasspath
40+
io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath
41+
jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath
42+
javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath
43+
javax.inject:javax.inject:1=compileClasspath,runtimeClasspath
44+
javax.servlet:javax.servlet-api:4.0.1=compileClasspath,runtimeClasspath
45+
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
46+
javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath
47+
org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath
48+
org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath
49+
org.hypertrace.bom:hypertrace-bom:0.2.11=compileClasspath,runtimeClasspath
50+
org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath
51+
org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath
52+
org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath
53+
org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=runtimeClasspath
54+
org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=runtimeClasspath
55+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath
56+
org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath
57+
org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath
58+
empty=annotationProcessor

0 commit comments

Comments
 (0)