Skip to content

Commit

Permalink
Changes for bazel 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@fireduck64
fireduck64 committed Dec 20, 2019
1 parent 2188277 commit 29c34cb
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 55 deletions.
22 changes: 10 additions & 12 deletions BUILD
View file
Expand Up @@ -9,8 +9,8 @@ java_library(
name = "lobstack_lib",
srcs = glob(["src/lobstack/*.java"]),
deps = [
"@junit_junit//jar",
"@protobuf//jar",
"@maven//:junit_junit",
"@maven//:com_google_protobuf_protobuf_java",
":duckutil_lib",
],
)
Expand All @@ -20,20 +20,18 @@ java_library(
srcs = glob(["src/jsonrpc/*.java"]),
deps = [
":duckutil_lib",
"@jsonrpc2_server//jar",
"@jsonrpc2_base//jar",
"@json_smart//jar",
"@accessors_smart//jar",
"@asm//jar",
"@maven//:net_minidev_json_smart",
"@maven//:com_thetransactioncompany_jsonrpc2_server",
"@maven//:com_thetransactioncompany_jsonrpc2_base",
],
)

java_library(
name = "sql_lib",
srcs = glob(["src/sql/*.java"]),
deps = [
"@commons_pool//jar",
"@commons_dbcp//jar",
"@maven//:commons_pool_commons_pool",
"@maven//:commons_dbcp_commons_dbcp",
":duckutil_lib",
],
)
Expand All @@ -53,7 +51,7 @@ java_test(
size = "small",
deps = [
":lobstack_lib",
"@junit_junit//jar",
"@maven//:junit_junit",
],
)

Expand All @@ -64,7 +62,7 @@ java_test(
size = "medium",
deps = [
":duckutil_lib",
"@junit_junit//jar",
"@maven//:junit_junit",
],
)

Expand All @@ -75,7 +73,7 @@ java_test(
size = "small",
deps = [
":lobstack_lib",
"@junit_junit//jar",
"@maven//:junit_junit",
],
)

67 changes: 24 additions & 43 deletions WORKSPACE
View file
@@ -1,53 +1,34 @@
maven_jar(
name = "junit_junit",
artifact = "junit:junit:4.12",
sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec",
)
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

maven_jar(
name = "protobuf",
artifact = "com.google.protobuf:protobuf-java:3.5.1",
sha1 = "8c3492f7662fa1cbf8ca76a0f5eb1146f7725acd",
)
RULES_JVM_EXTERNAL_TAG = "3.0"
RULES_JVM_EXTERNAL_SHA = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a"

maven_jar(
name = "jsonrpc2_server",
artifact = "com.thetransactioncompany:jsonrpc2-server:1.11",
sha1 = "3f5866109d05f036bd12c7998d0b20166c656033",
http_archive(
name = "rules_jvm_external",
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
sha256 = RULES_JVM_EXTERNAL_SHA,
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
)

maven_jar(
name = "jsonrpc2_base",
artifact = "com.thetransactioncompany:jsonrpc2-base:1.38.1",
sha1 = "ba8da1486587870aa0eb2820b731e3ed6f8fa8a2",
)
load("@rules_jvm_external//:defs.bzl", "maven_install")

maven_jar(
name = "json_smart",
artifact = "net.minidev:json-smart:2.3",
sha1 = "007396407491352ce4fa30de92efb158adb76b5b",
)
maven_install(
artifacts = [
"com.google.protobuf:protobuf-java:3.5.1",
"junit:junit:4.12",
"com.thetransactioncompany:jsonrpc2-server:1.11",
"commons-pool:commons-pool:1.6",
"commons-dbcp:commons-dbcp:1.4",

maven_jar(
name = "accessors_smart",
artifact = "net.minidev:accessors-smart:1.2",
sha1 = "c592b500269bfde36096641b01238a8350f8aa31",
],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2",
],
maven_install_json = "//:maven_install.json",
)

maven_jar(
name = "asm",
artifact = "org.ow2.asm:asm:6.2",
sha1 = "1b6c4ff09ce03f3052429139c2a68e295cae6604",
)
load("@maven//:defs.bzl", "pinned_maven_install")
pinned_maven_install()

maven_jar(
name = "commons_pool",
artifact = "commons-pool:commons-pool:1.6",
sha1 = "4572d589699f09d866a226a14b7f4323c6d8f040",
)

maven_jar(
name = "commons_dbcp",
artifact = "commons-dbcp:commons-dbcp:1.4",
sha1 = "30be73c965cc990b153a100aaaaafcf239f82d39",
)
123 changes: 123 additions & 0 deletions maven_install.json
View file
@@ -0,0 +1,123 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 107540355,
"conflict_resolution": {},
"dependencies": [
{
"coord": "com.google.protobuf:protobuf-java:3.5.1",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.jar",
"mirror_urls": [
"https://maven.google.com/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.jar",
"https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.jar"
],
"sha256": "b5e2d91812d183c9f053ffeebcbcda034d4de6679521940a19064714966c2cd4",
"url": "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.5.1/protobuf-java-3.5.1.jar"
},
{
"coord": "com.thetransactioncompany:jsonrpc2-base:1.36",
"dependencies": [
"net.minidev:json-smart:1.3.1"
],
"directDependencies": [
"net.minidev:json-smart:1.3.1"
],
"file": "v1/https/repo1.maven.org/maven2/com/thetransactioncompany/jsonrpc2-base/1.36/jsonrpc2-base-1.36.jar",
"mirror_urls": [
"https://maven.google.com/com/thetransactioncompany/jsonrpc2-base/1.36/jsonrpc2-base-1.36.jar",
"https://repo1.maven.org/maven2/com/thetransactioncompany/jsonrpc2-base/1.36/jsonrpc2-base-1.36.jar"
],
"sha256": "84b5e03daf7731d18de8aebd1e2ed57379cfaaee87f411cedd25b861c5eb8ee5",
"url": "https://repo1.maven.org/maven2/com/thetransactioncompany/jsonrpc2-base/1.36/jsonrpc2-base-1.36.jar"
},
{
"coord": "com.thetransactioncompany:jsonrpc2-server:1.11",
"dependencies": [
"com.thetransactioncompany:jsonrpc2-base:1.36",
"net.minidev:json-smart:1.3.1"
],
"directDependencies": [
"com.thetransactioncompany:jsonrpc2-base:1.36",
"net.minidev:json-smart:1.3.1"
],
"file": "v1/https/repo1.maven.org/maven2/com/thetransactioncompany/jsonrpc2-server/1.11/jsonrpc2-server-1.11.jar",
"mirror_urls": [
"https://maven.google.com/com/thetransactioncompany/jsonrpc2-server/1.11/jsonrpc2-server-1.11.jar",
"https://repo1.maven.org/maven2/com/thetransactioncompany/jsonrpc2-server/1.11/jsonrpc2-server-1.11.jar"
],
"sha256": "92f8a6b8b347580ca63c7b8f71760baaaf9c4ee3396956796955cee9d9b1efc0",
"url": "https://repo1.maven.org/maven2/com/thetransactioncompany/jsonrpc2-server/1.11/jsonrpc2-server-1.11.jar"
},
{
"coord": "commons-dbcp:commons-dbcp:1.4",
"dependencies": [
"commons-pool:commons-pool:1.6"
],
"directDependencies": [
"commons-pool:commons-pool:1.6"
],
"file": "v1/https/repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar",
"mirror_urls": [
"https://maven.google.com/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar",
"https://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"
],
"sha256": "a6e2d83551d0e5b59aa942359f3010d35e79365e6552ad3dbaa6776e4851e4f6",
"url": "https://repo1.maven.org/maven2/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar"
},
{
"coord": "commons-pool:commons-pool:1.6",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/commons-pool/commons-pool/1.6/commons-pool-1.6.jar",
"mirror_urls": [
"https://maven.google.com/commons-pool/commons-pool/1.6/commons-pool-1.6.jar",
"https://repo1.maven.org/maven2/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"
],
"sha256": "46c42b4a38dc6b2db53a9ee5c92c63db103665d56694e2cfce2c95d51a6860cc",
"url": "https://repo1.maven.org/maven2/commons-pool/commons-pool/1.6/commons-pool-1.6.jar"
},
{
"coord": "junit:junit:4.12",
"dependencies": [
"org.hamcrest:hamcrest-core:1.3"
],
"directDependencies": [
"org.hamcrest:hamcrest-core:1.3"
],
"file": "v1/https/repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar",
"mirror_urls": [
"https://maven.google.com/junit/junit/4.12/junit-4.12.jar",
"https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar"
],
"sha256": "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a",
"url": "https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar"
},
{
"coord": "net.minidev:json-smart:1.3.1",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/net/minidev/json-smart/1.3.1/json-smart-1.3.1.jar",
"mirror_urls": [
"https://maven.google.com/net/minidev/json-smart/1.3.1/json-smart-1.3.1.jar",
"https://repo1.maven.org/maven2/net/minidev/json-smart/1.3.1/json-smart-1.3.1.jar"
],
"sha256": "ac3689112788e042088755e63ecd1f689adfeb04d7fb1cfd244513f94f82522c",
"url": "https://repo1.maven.org/maven2/net/minidev/json-smart/1.3.1/json-smart-1.3.1.jar"
},
{
"coord": "org.hamcrest:hamcrest-core:1.3",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
"mirror_urls": [
"https://maven.google.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
"https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
],
"sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
"url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
}
],
"version": "0.1.0"
}
}

0 comments on commit 29c34cb

Please sign in to comment.