Skip to content

Commit 2b81ef5

Browse files
committed
fix: docs generation
1 parent 1623b30 commit 2b81ef5

File tree

4 files changed

+38
-6
lines changed

4 files changed

+38
-6
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.7")
2424
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
2525
maven.install(
2626
artifacts = [
27+
"javax.annotation:javax.annotation-api:1.2",
2728
"com.google.protobuf:protobuf-java:4.29.3",
2829
"ch.epfl.scala:bsp4j:2.2.0-M2",
2930
"com.fasterxml.jackson.core:jackson-databind:2.18.2",

maven_install.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1267820339,
4-
"__RESOLVED_ARTIFACTS_HASH": 1984398607,
3+
"__INPUT_ARTIFACTS_HASH": 828238765,
4+
"__RESOLVED_ARTIFACTS_HASH": -33843454,
55
"conflict_resolution": {
66
"com.google.api.grpc:proto-google-common-protos:2.29.0": "com.google.api.grpc:proto-google-common-protos:2.48.0",
77
"com.google.code.gson:gson:2.11.0": "com.google.code.gson:gson:2.12.1",
@@ -474,6 +474,12 @@
474474
},
475475
"version": "0.27.0"
476476
},
477+
"javax.annotation:javax.annotation-api": {
478+
"shasums": {
479+
"jar": "5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04"
480+
},
481+
"version": "1.2"
482+
},
477483
"junit:junit": {
478484
"shasums": {
479485
"jar": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3"
@@ -1901,6 +1907,11 @@
19011907
"io.perfmark:perfmark-api": [
19021908
"io.perfmark"
19031909
],
1910+
"javax.annotation:javax.annotation-api": [
1911+
"javax.annotation",
1912+
"javax.annotation.security",
1913+
"javax.annotation.sql"
1914+
],
19041915
"junit:junit": [
19051916
"junit.extensions",
19061917
"junit.framework",
@@ -2734,6 +2745,7 @@
27342745
"io.opentelemetry:opentelemetry-sdk-metrics",
27352746
"io.opentelemetry:opentelemetry-sdk-trace",
27362747
"io.perfmark:perfmark-api",
2748+
"javax.annotation:javax.annotation-api",
27372749
"junit:junit",
27382750
"net.java.dev.jna:jna",
27392751
"org.apache.commons:commons-lang3",
@@ -2868,6 +2880,7 @@
28682880
"io.opentelemetry:opentelemetry-sdk-metrics",
28692881
"io.opentelemetry:opentelemetry-sdk-trace",
28702882
"io.perfmark:perfmark-api",
2883+
"javax.annotation:javax.annotation-api",
28712884
"junit:junit",
28722885
"net.java.dev.jna:jna",
28732886
"org.apache.commons:commons-lang3",
@@ -3002,6 +3015,7 @@
30023015
"io.opentelemetry:opentelemetry-sdk-metrics",
30033016
"io.opentelemetry:opentelemetry-sdk-trace",
30043017
"io.perfmark:perfmark-api",
3018+
"javax.annotation:javax.annotation-api",
30053019
"junit:junit",
30063020
"net.java.dev.jna:jna",
30073021
"org.apache.commons:commons-lang3",
@@ -3136,6 +3150,7 @@
31363150
"io.opentelemetry:opentelemetry-sdk-metrics",
31373151
"io.opentelemetry:opentelemetry-sdk-trace",
31383152
"io.perfmark:perfmark-api",
3153+
"javax.annotation:javax.annotation-api",
31393154
"junit:junit",
31403155
"net.java.dev.jna:jna",
31413156
"org.apache.commons:commons-lang3",

rules/publishing/publish_sonatype.bzl

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ def publish_sonatype(
99
coord = None,
1010
jar = None,
1111
source = None,
12-
pom = None):
12+
pom = None,
13+
doc = None):
1314
"""Macro for generating a Sonatype's release bundle and running publish action with a
1415
new Sonatype release API: https://central.sonatype.org/publish/publish-portal-api/#uploading-a-deployment-bundle
1516
@@ -42,15 +43,15 @@ def publish_sonatype(
4243
name = "{}_{}".format(name, suffix),
4344
artifact = artifact,
4445
)
45-
for artifact, suffix in [(pom, "pom"), (jar, "jar"), (source, "source")]
46+
for artifact, suffix in [(pom, "pom"), (jar, "jar"), (source, "source"), (doc, "doc")]
4647
]
4748

4849
[
4950
_sign(
5051
name = "{}_{}".format(name, suffix),
5152
artifact = artifact,
5253
)
53-
for artifact, suffix in [(pom, "pom"), (jar, "jar"), (source, "source")]
54+
for artifact, suffix in [(pom, "pom"), (jar, "jar"), (source, "source"), (doc, "doc")]
5455
]
5556

5657
pkg_files(
@@ -69,6 +70,12 @@ def publish_sonatype(
6970
"{}_jar_sha256".format(name),
7071
"{}_jar_sha512".format(name),
7172
"{}_jar_asc".format(name),
73+
doc,
74+
"{}_doc_md5".format(name),
75+
"{}_doc_sha1".format(name),
76+
"{}_doc_sha256".format(name),
77+
"{}_doc_sha512".format(name),
78+
"{}_doc_asc".format(name),
7279
source,
7380
"{}_source_md5".format(name),
7481
"{}_source_sha1".format(name),
@@ -89,6 +96,12 @@ def publish_sonatype(
8996
"{}_jar_sha1".format(name): "{}-{}.jar.sha1".format(coordinates.artifact, coordinates.version),
9097
"{}_jar_sha256".format(name): "{}-{}.jar.sha256".format(coordinates.artifact, coordinates.version),
9198
"{}_jar_sha512".format(name): "{}-{}.jar.sha512".format(coordinates.artifact, coordinates.version),
99+
doc: "{}-{}.doc".format(coordinates.artifact, coordinates.version),
100+
"{}_doc_asc".format(name): "{}-{}.doc.asc".format(coordinates.artifact, coordinates.version),
101+
"{}_doc_md5".format(name): "{}-{}.doc.md5".format(coordinates.artifact, coordinates.version),
102+
"{}_doc_sha1".format(name): "{}-{}.doc.sha1".format(coordinates.artifact, coordinates.version),
103+
"{}_doc_sha256".format(name): "{}-{}.doc.sha256".format(coordinates.artifact, coordinates.version),
104+
"{}_doc_sha512".format(name): "{}-{}.doc.sha512".format(coordinates.artifact, coordinates.version),
92105
source: "{}-{}-sources.jar".format(coordinates.artifact, coordinates.version),
93106
"{}_source_asc".format(name): "{}-{}-sources.jar.asc".format(coordinates.artifact, coordinates.version),
94107
"{}_source_md5".format(name): "{}-{}-sources.jar.md5".format(coordinates.artifact, coordinates.version),

server/install/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_jvm_external//:defs.bzl", "javadoc")
12
load("@rules_jvm_external//:kt_defs.bzl", "kt_jvm_export")
23
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library")
34
load("//:versions.bzl", "BAZEL_BSP_ARTIFACT_VERSION")
@@ -32,13 +33,14 @@ kt_jvm_export(
3233
pom_template = "//server/server/src/main/resources:pom.xml",
3334
tags = [
3435
"manual",
35-
"no-javadocs",
3636
],
3737
visibility = ["//visibility:public"],
3838
runtime_deps = [
3939
"//server/commons",
4040
"//server/install:install-lib",
4141
"//server/server/src/main/kotlin/org/jetbrains/bsp/bazel/server",
42+
# Needed for javadoc generation:
43+
"@maven//:javax_annotation_javax_annotation_api",
4244
# Needed for protobuf runtime version consitency, otherwise NoClassDefFoundError is raised
4345
"@maven//:original_com_google_protobuf_protobuf_java_4_29_3",
4446
# Needed because the installer injects its own classpath as the one to be used by the installed server
@@ -50,6 +52,7 @@ kt_jvm_export(
5052
publish_sonatype(
5153
name = "publish",
5254
coord = "com.virtuslab:bazel-bsp:{}".format(BAZEL_BSP_ARTIFACT_VERSION),
55+
doc = ":install_export-docs",
5356
jar = ":install_export-maven-artifact",
5457
pom = ":install_export-pom",
5558
source = ":install_export-maven-source",

0 commit comments

Comments
 (0)