Skip to content

Commit 6f68e95

Browse files
Bom (#147)
* build: upgrade gradle, project accessors * ci: add gh workflow * refactor: initial locks, plugins * refactor: migrate to bom * build: update locks * ci: fix cron expression
1 parent eee2612 commit 6f68e95

File tree

47 files changed

+1281
-347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1281
-347
lines changed

.github/workflows/update-locks.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
- name: Calculate simple repository name
15+
id: repo-basename
16+
shell: bash
17+
run: |
18+
echo "value=`basename ${{ github.repository }}`" >> $GITHUB_OUTPUT
19+
- name: Get Token from Github App
20+
uses: tibdex/github-app-token@v2
21+
id: generate-token
22+
with:
23+
app_id: ${{ secrets.GH_CI_APP_ID }}
24+
private_key: ${{ secrets.GH_CI_APP_PRIVATE_KEY }}
25+
repositories: >-
26+
[${{ toJson(steps.repo-basename.outputs.value) }}]
27+
- name: Update locks if needed
28+
uses: hypertrace/github-actions/raise-lock-pr@main
29+
with:
30+
token: ${{ steps.generate-token.outputs.token }}

build.gradle.kts

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
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.core.graphql"
139
pluginManager.withPlugin("java") {
14-
apply(plugin = "org.hypertrace.code-style-plugin")
10+
apply(plugin = commonLibs.plugins.hypertrace.codestyle.get().pluginId)
1511
configure<JavaPluginExtension> {
1612
sourceCompatibility = JavaVersion.VERSION_11
1713
targetCompatibility = JavaVersion.VERSION_11
1814
}
1915
}
20-
21-
pluginManager.withPlugin("java-library") {
22-
dependencies {
23-
"api"(platform(project(":hypertrace-core-graphql-platform")))
24-
"annotationProcessor"(platform(project(":hypertrace-core-graphql-platform")))
25-
"testAnnotationProcessor"(platform(project(":hypertrace-core-graphql-platform")))
26-
"testImplementation"(platform(project(":hypertrace-core-graphql-test-platform")))
27-
"compileOnly"(platform(project(":hypertrace-core-graphql-platform")))
28-
}
29-
}
3016
}
3117

3218
dependencyCheck {

gradle/libs.versions.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
[libraries]
3+
graphql-annotations = { module = "io.github.graphql-java:graphql-java-annotations", version = "9.1" }
4+
graphql-servlet = { module = "com.graphql-java-kickstart:graphql-java-servlet", version = "14.0.0" }
5+
opentelemetry-proto = { module = "io.opentelemetry:opentelemetry-proto", version = "1.1.0-alpha" }

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
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
143144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC2039,SC3045
146149
MAX_FD=$( ulimit -H -n ) ||
147150
warn "Could not query maximum file descriptor limit"
148151
esac
149152
case $MAX_FD in #(
150153
'' | soft) :;; #(
151154
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC2039,SC3045
152157
ulimit -n "$MAX_FD" ||
153158
warn "Could not set maximum file descriptor limit to $MAX_FD"
154159
esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
193198
done
194199
fi
195200

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
201210

202211
set -- \
203212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204213
-classpath "$CLASSPATH" \
205214
org.gradle.wrapper.GradleWrapperMain \
206215
"$@"
207216

217+
# Stop when "xargs" is not available.
218+
if ! command -v xargs >/dev/null 2>&1
219+
then
220+
die "xargs is not available"
221+
fi
222+
208223
# Use "xargs" to parse quoted args.
209224
#
210225
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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+
com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath
5+
io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath
6+
org.hypertrace.bom:hypertrace-bom:0.2.10=compileClasspath,runtimeClasspath
7+
org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath
8+
empty=annotationProcessor

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

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

55
dependencies {
6-
api("com.google.inject:guice")
7-
api("io.reactivex.rxjava3:rxjava")
8-
api(project(":hypertrace-core-graphql-attribute-store"))
9-
api(project(":hypertrace-core-graphql-common-schema"))
6+
api(commonLibs.guice)
7+
api(commonLibs.rxjava3)
8+
api(projects.hypertraceCoreGraphqlAttributeStore)
9+
api(projects.hypertraceCoreGraphqlCommonSchema)
1010
// These are kept in a separate project so they can be referenced by other projects without circular dependencies
11-
compileOnly(project(":hypertrace-core-graphql-attribute-scope-constants"))
11+
compileOnly(projects.hypertraceCoreGraphqlAttributeScopeConstants)
1212
}
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.10=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)