Use the new assemble_maven from @graknlabs_dependencies

Ganeshwara Hananda · Ganeshwara Hananda · commit 71b277adb6b2 · 2021-03-30T10:54:29.000+01:00
diff --git a/WORKSPACE b/WORKSPACE
@@ -91,13 +91,16 @@ pip_deps()
 load("@graknlabs_bazel_distribution//github:deps.bzl", github_deps = "deps")
 github_deps()
 
+# Load //maven
+load("@graknlabs_bazel_distribution//maven:deps.bzl", graknlabs_bazel_distribution_maven_artifacts = "maven_artifacts")
+
 ############################
 # Load @maven dependencies #
 ############################
 
 load("@graknlabs_dependencies//library/maven:rules.bzl", "maven")
 load("//dependencies/maven:artifacts.bzl", "artifacts")
-maven(artifacts + graknlabs_dependencies_tool_maven_artifacts)
+maven(artifacts + graknlabs_dependencies_tool_maven_artifacts + graknlabs_bazel_distribution_maven_artifacts)
 
 #############################################
 # Create @graknlabs_protocol_workspace_refs #
diff --git a/dependencies/graknlabs/repositories.bzl b/dependencies/graknlabs/repositories.bzl
@@ -21,5 +21,5 @@ def graknlabs_dependencies():
     git_repository(
         name = "graknlabs_dependencies",
         remote = "https://github.com/graknlabs/dependencies",
-        commit = "d49062d3cfe3f2ee1d9b33fa181ce9e9792d9f15", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies
+        commit = "adb0d08bf56a64ae7d731800cfc0f85c63733cf1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies
     )
diff --git a/dependencies/maven/artifacts.snapshot b/dependencies/maven/artifacts.snapshot
@@ -24,6 +24,8 @@
 @maven//:commons_io_commons_io_1_4
 @maven//:commons_logging_commons_logging
 @maven//:commons_logging_commons_logging_1_2
+@maven//:info_picocli_picocli
+@maven//:info_picocli_picocli_4_3_2
 @maven//:io_grpc_grpc_api
 @maven//:io_grpc_grpc_api_1_33_1
 @maven//:io_grpc_grpc_context
diff --git a/grpc/java/BUILD b/grpc/java/BUILD
@@ -66,7 +66,7 @@ checkstyle_test(
 assemble_maven(
     name = "assemble-maven",
     target = ":protocol",
-    package = "grpc",
+    source_jar_prefix = "grakn/protocol/",
     version_overrides = version(artifacts_org = artifacts),
     workspace_refs = "@graknlabs_protocol_workspace_refs//:refs.json"
 )

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ def graknlabs_dependencies():`
`21`	`21`	`git_repository(`
`22`	`22`	`name = "graknlabs_dependencies",`
`23`	`23`	`remote = "https://github.com/graknlabs/dependencies",`
`24`		`- commit = "d49062d3cfe3f2ee1d9b33fa181ce9e9792d9f15", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies`
	`24`	`+ commit = "adb0d08bf56a64ae7d731800cfc0f85c63733cf1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ checkstyle_test(`
`66`	`66`	`assemble_maven(`
`67`	`67`	`name = "assemble-maven",`
`68`	`68`	`target = ":protocol",`
`69`		`- package = "grpc",`
	`69`	`+ source_jar_prefix = "grakn/protocol/",`
`70`	`70`	`version_overrides = version(artifacts_org = artifacts),`
`71`	`71`	`workspace_refs = "@graknlabs_protocol_workspace_refs//:refs.json"`
`72`	`72`	`)`