Skip to content

Commit

Permalink
change code
Browse files Browse the repository at this point in the history
  • Loading branch information
lannoy0523 committed Apr 26, 2023
1 parent d63fa79 commit 2cd204e
Show file tree
Hide file tree
Showing 3 changed files with 148 additions and 136 deletions.
128 changes: 65 additions & 63 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,70 @@ load("@rules_spring//springboot:springboot.bzl", "springboot")

package(default_visibility = ["//visibility:public"])

deps = [
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_fasterxml_jackson_core_jackson_annotations",
"@maven//:com_fasterxml_jackson_core_jackson_core",
"@maven//:com_fasterxml_jackson_core_jackson_databind",
"@maven//:com_fasterxml_jackson_datatype_jackson_datatype_jdk8",
"@maven//:com_fasterxml_jackson_datatype_jackson_datatype_jsr310",
"@maven//:com_fasterxml_jackson_module_jackson_module_parameter_names",
"@maven//:com_jayway_jsonpath_json_path",
"@maven//:com_vaadin_external_google_android_json",
"@maven//:jakarta_activation_jakarta_activation_api",
"@maven//:jakarta_annotation_jakarta_annotation_api",
"@maven//:jakarta_xml_bind_jakarta_xml_bind_api",
"@maven//:net_bytebuddy_byte_buddy",
"@maven//:net_bytebuddy_byte_buddy_agent",
"@maven//:net_minidev_accessors_smart",
"@maven//:net_minidev_json_smart",
"@maven//:org_apache_logging_log4j_log4j_api",
"@maven//:org_apache_logging_log4j_log4j_to_slf4j",
"@maven//:org_apache_tomcat_embed_tomcat_embed_core",
"@maven//:org_apache_tomcat_embed_tomcat_embed_el",
"@maven//:org_apache_tomcat_embed_tomcat_embed_websocket",
"@maven//:org_apiguardian_apiguardian_api",
"@maven//:org_assertj_assertj_core",
"@maven//:org_hamcrest_hamcrest",
"@maven//:org_junit_jupiter_junit_jupiter",
"@maven//:org_junit_jupiter_junit_jupiter_api",
"@maven//:org_junit_jupiter_junit_jupiter_engine",
"@maven//:org_junit_jupiter_junit_jupiter_params",
"@maven//:org_junit_platform_junit_platform_commons",
"@maven//:org_junit_platform_junit_platform_engine",
"@maven//:org_mockito_mockito_core",
"@maven//:org_mockito_mockito_junit_jupiter",
"@maven//:org_objenesis_objenesis",
"@maven//:org_opentest4j_opentest4j",
"@maven//:org_ow2_asm_asm",
"@maven//:org_skyscreamer_jsonassert",
"@maven//:org_slf4j_jul_to_slf4j",
"@maven//:org_slf4j_slf4j_api",
"@maven//:org_springframework_boot_spring_boot",
"@maven//:org_springframework_boot_spring_boot_autoconfigure",
"@maven//:org_springframework_boot_spring_boot_loader",
"@maven//:org_springframework_boot_spring_boot_starter",
"@maven//:org_springframework_boot_spring_boot_starter_json",
"@maven//:org_springframework_boot_spring_boot_starter_logging",
"@maven//:org_springframework_boot_spring_boot_starter_test",
"@maven//:org_springframework_boot_spring_boot_starter_tomcat",
"@maven//:org_springframework_boot_spring_boot_starter_web",
"@maven//:org_springframework_boot_spring_boot_test",
"@maven//:org_springframework_boot_spring_boot_test_autoconfigure",
"@maven//:org_springframework_spring_aop",
"@maven//:org_springframework_spring_beans",
"@maven//:org_springframework_spring_context",
"@maven//:org_springframework_spring_core",
"@maven//:org_springframework_spring_expression",
"@maven//:org_springframework_spring_jcl",
"@maven//:org_springframework_spring_test",
"@maven//:org_springframework_spring_web",
"@maven//:org_springframework_spring_webmvc",
"@maven//:org_xmlunit_xmlunit_core",
"@maven//:org_yaml_snakeyaml",
]

java_library(
name = "maven_springboot-library",
srcs = glob([
Expand All @@ -11,69 +75,7 @@ java_library(
resources = glob([
"src/main/resources/**",
]),
deps = [
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_fasterxml_jackson_core_jackson_annotations",
"@maven//:com_fasterxml_jackson_core_jackson_core",
"@maven//:com_fasterxml_jackson_core_jackson_databind",
"@maven//:com_fasterxml_jackson_datatype_jackson_datatype_jdk8",
"@maven//:com_fasterxml_jackson_datatype_jackson_datatype_jsr310",
"@maven//:com_fasterxml_jackson_module_jackson_module_parameter_names",
"@maven//:com_jayway_jsonpath_json_path",
"@maven//:com_vaadin_external_google_android_json",
"@maven//:jakarta_activation_jakarta_activation_api",
"@maven//:jakarta_annotation_jakarta_annotation_api",
"@maven//:jakarta_xml_bind_jakarta_xml_bind_api",
"@maven//:net_bytebuddy_byte_buddy",
"@maven//:net_bytebuddy_byte_buddy_agent",
"@maven//:net_minidev_accessors_smart",
"@maven//:net_minidev_json_smart",
"@maven//:org_apache_logging_log4j_log4j_api",
"@maven//:org_apache_logging_log4j_log4j_to_slf4j",
"@maven//:org_apache_tomcat_embed_tomcat_embed_core",
"@maven//:org_apache_tomcat_embed_tomcat_embed_el",
"@maven//:org_apache_tomcat_embed_tomcat_embed_websocket",
"@maven//:org_apiguardian_apiguardian_api",
"@maven//:org_assertj_assertj_core",
"@maven//:org_hamcrest_hamcrest",
"@maven//:org_junit_jupiter_junit_jupiter",
"@maven//:org_junit_jupiter_junit_jupiter_api",
"@maven//:org_junit_jupiter_junit_jupiter_engine",
"@maven//:org_junit_jupiter_junit_jupiter_params",
"@maven//:org_junit_platform_junit_platform_commons",
"@maven//:org_junit_platform_junit_platform_engine",
"@maven//:org_mockito_mockito_core",
"@maven//:org_mockito_mockito_junit_jupiter",
"@maven//:org_objenesis_objenesis",
"@maven//:org_opentest4j_opentest4j",
"@maven//:org_ow2_asm_asm",
"@maven//:org_skyscreamer_jsonassert",
"@maven//:org_slf4j_jul_to_slf4j",
"@maven//:org_slf4j_slf4j_api",
"@maven//:org_springframework_boot_spring_boot",
"@maven//:org_springframework_boot_spring_boot_autoconfigure",
"@maven//:org_springframework_boot_spring_boot_loader",
"@maven//:org_springframework_boot_spring_boot_starter",
"@maven//:org_springframework_boot_spring_boot_starter_json",
"@maven//:org_springframework_boot_spring_boot_starter_logging",
"@maven//:org_springframework_boot_spring_boot_starter_test",
"@maven//:org_springframework_boot_spring_boot_starter_tomcat",
"@maven//:org_springframework_boot_spring_boot_starter_web",
"@maven//:org_springframework_boot_spring_boot_test",
"@maven//:org_springframework_boot_spring_boot_test_autoconfigure",
"@maven//:org_springframework_spring_aop",
"@maven//:org_springframework_spring_beans",
"@maven//:org_springframework_spring_context",
"@maven//:org_springframework_spring_core",
"@maven//:org_springframework_spring_expression",
"@maven//:org_springframework_spring_jcl",
"@maven//:org_springframework_spring_test",
"@maven//:org_springframework_spring_web",
"@maven//:org_springframework_spring_webmvc",
"@maven//:org_xmlunit_xmlunit_core",
"@maven//:org_yaml_snakeyaml",
],
deps = deps,
)

springboot(
Expand Down
82 changes: 82 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
module(
name = "common_api",
version = "0.0.1"
)

bazel_dep(name = "rules_java", version = "5.5.0")
bazel_dep(name = "rules_jvm_external", version = "4.5")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

maven.install(
name = "maven",
artifacts = [
"ch.qos.logback:logback-classic:1.2.11",
"ch.qos.logback:logback-core:1.2.11",
"com.fasterxml.jackson.core:jackson-annotations:2.13.4",
"com.fasterxml.jackson.core:jackson-core:2.13.4",
"com.fasterxml.jackson.core:jackson-databind:2.13.4.2",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4",
"com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4",
"com.jayway.jsonpath:json-path:2.6.0",
"com.vaadin.external.google:android-json:0.0.20131108.vaadin1",
"jakarta.activation:jakarta.activation-api:1.2.2",
"jakarta.annotation:jakarta.annotation-api:1.3.5",
"jakarta.xml.bind:jakarta.xml.bind-api:2.3.3",
"net.bytebuddy:byte-buddy:1.11.22",
"net.bytebuddy:byte-buddy-agent:1.11.22",
"net.minidev:accessors-smart:2.4.8",
"net.minidev:json-smart:2.4.8",
"org.apache.logging.log4j:log4j-api:2.17.2",
"org.apache.logging.log4j:log4j-to-slf4j:2.17.2",
"org.apache.tomcat.embed:tomcat-embed-core:9.0.68",
"org.apache.tomcat.embed:tomcat-embed-el:9.0.68",
"org.apache.tomcat.embed:tomcat-embed-websocket:9.0.68",
"org.apiguardian:apiguardian-api:1.1.2",
"org.assertj:assertj-core:3.21.0",
"org.hamcrest:hamcrest:2.2",
"org.junit.jupiter:junit-jupiter:5.8.2",
"org.junit.jupiter:junit-jupiter-api:5.8.2",
"org.junit.jupiter:junit-jupiter-engine:5.8.2",
"org.junit.jupiter:junit-jupiter-params:5.8.2",
"org.junit.platform:junit-platform-commons:1.8.2",
"org.junit.platform:junit-platform-engine:1.8.2",
"org.mockito:mockito-core:4.0.0",
"org.mockito:mockito-junit-jupiter:4.0.0",
"org.objenesis:objenesis:3.2",
"org.opentest4j:opentest4j:1.2.0",
"org.ow2.asm:asm:9.1",
"org.skyscreamer:jsonassert:1.5.1",
"org.slf4j:jul-to-slf4j:1.7.36",
"org.slf4j:slf4j-api:1.7.36",
"org.springframework:spring-aop:5.3.23",
"org.springframework:spring-beans:5.3.23",
"org.springframework:spring-context:5.3.23",
"org.springframework:spring-core:5.3.23",
"org.springframework:spring-expression:5.3.23",
"org.springframework:spring-jcl:5.3.23",
"org.springframework:spring-test:5.3.23",
"org.springframework:spring-web:5.3.23",
"org.springframework:spring-webmvc:5.3.23",
"org.springframework.boot:spring-boot:2.6.13",
"org.springframework.boot:spring-boot-autoconfigure:2.6.13",
"org.springframework.boot:spring-boot-loader:2.6.13",
"org.springframework.boot:spring-boot-starter:2.6.13",
"org.springframework.boot:spring-boot-starter-json:2.6.13",
"org.springframework.boot:spring-boot-starter-logging:2.6.13",
"org.springframework.boot:spring-boot-starter-test:2.6.13",
"org.springframework.boot:spring-boot-starter-tomcat:2.6.13",
"org.springframework.boot:spring-boot-starter-web:2.6.13",
"org.springframework.boot:spring-boot-test:2.6.13",
"org.springframework.boot:spring-boot-test-autoconfigure:2.6.13",
"org.xmlunit:xmlunit-core:2.8.4",
"org.yaml:snakeyaml:1.29",
],
repositories = [
"https://repo1.maven.org/maven2/",
],
use_unsafe_shared_cache = True,
)

use_repo(maven, "maven")
74 changes: 1 addition & 73 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -61,76 +61,4 @@ http_archive(
url = "https://github.com/salesforce/rules_spring/releases/download/2.1.4/rules-spring-2.1.4.zip",
)

load("@rules_spring//springboot:springboot.bzl", "springboot")

maven_install(
name = "maven",

artifacts = [
maven.artifact("ch.qos.logback", "logback-classic", "1.2.11"),
maven.artifact("ch.qos.logback", "logback-core", "1.2.11"),
maven.artifact("com.fasterxml.jackson.core", "jackson-annotations", "2.13.4"),
maven.artifact("com.fasterxml.jackson.core", "jackson-core", "2.13.4"),
maven.artifact("com.fasterxml.jackson.core", "jackson-databind", "2.13.4.2"),
maven.artifact("com.fasterxml.jackson.datatype", "jackson-datatype-jdk8", "2.13.4"),
maven.artifact("com.fasterxml.jackson.datatype", "jackson-datatype-jsr310", "2.13.4"),
maven.artifact("com.fasterxml.jackson.module", "jackson-module-parameter-names", "2.13.4"),
maven.artifact("com.jayway.jsonpath", "json-path", "2.6.0"),
maven.artifact("com.vaadin.external.google", "android-json", "0.0.20131108.vaadin1"),
maven.artifact("jakarta.activation", "jakarta.activation-api", "1.2.2"),
maven.artifact("jakarta.annotation", "jakarta.annotation-api", "1.3.5"),
maven.artifact("jakarta.xml.bind", "jakarta.xml.bind-api", "2.3.3"),
maven.artifact("net.bytebuddy", "byte-buddy", "1.11.22"),
maven.artifact("net.bytebuddy", "byte-buddy-agent", "1.11.22"),
maven.artifact("net.minidev", "accessors-smart", "2.4.8"),
maven.artifact("net.minidev", "json-smart", "2.4.8"),
maven.artifact("org.apache.logging.log4j", "log4j-api", "2.17.2"),
maven.artifact("org.apache.logging.log4j", "log4j-to-slf4j", "2.17.2"),
maven.artifact("org.apache.tomcat.embed", "tomcat-embed-core", "9.0.68"),
maven.artifact("org.apache.tomcat.embed", "tomcat-embed-el", "9.0.68"),
maven.artifact("org.apache.tomcat.embed", "tomcat-embed-websocket", "9.0.68"),
maven.artifact("org.apiguardian", "apiguardian-api", "1.1.2"),
maven.artifact("org.assertj", "assertj-core", "3.21.0"),
maven.artifact("org.hamcrest", "hamcrest", "2.2"),
maven.artifact("org.junit.jupiter", "junit-jupiter", "5.8.2"),
maven.artifact("org.junit.jupiter", "junit-jupiter-api", "5.8.2"),
maven.artifact("org.junit.jupiter", "junit-jupiter-engine", "5.8.2"),
maven.artifact("org.junit.jupiter", "junit-jupiter-params", "5.8.2"),
maven.artifact("org.junit.platform", "junit-platform-commons", "1.8.2"),
maven.artifact("org.junit.platform", "junit-platform-engine", "1.8.2"),
maven.artifact("org.mockito", "mockito-core", "4.0.0"),
maven.artifact("org.mockito", "mockito-junit-jupiter", "4.0.0"),
maven.artifact("org.objenesis", "objenesis", "3.2"),
maven.artifact("org.opentest4j", "opentest4j", "1.2.0"),
maven.artifact("org.ow2.asm", "asm", "9.1"),
maven.artifact("org.skyscreamer", "jsonassert", "1.5.1"),
maven.artifact("org.slf4j", "jul-to-slf4j", "1.7.36"),
maven.artifact("org.slf4j", "slf4j-api", "1.7.36"),
maven.artifact("org.springframework", "spring-aop", "5.3.23"),
maven.artifact("org.springframework", "spring-beans", "5.3.23"),
maven.artifact("org.springframework", "spring-context", "5.3.23"),
maven.artifact("org.springframework", "spring-core", "5.3.23"),
maven.artifact("org.springframework", "spring-expression", "5.3.23"),
maven.artifact("org.springframework", "spring-jcl", "5.3.23"),
maven.artifact("org.springframework", "spring-test", "5.3.23"),
maven.artifact("org.springframework", "spring-web", "5.3.23"),
maven.artifact("org.springframework", "spring-webmvc", "5.3.23"),
maven.artifact("org.springframework.boot", "spring-boot", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-autoconfigure", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-loader", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-starter", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-starter-json", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-starter-logging", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-starter-test", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-starter-tomcat", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-starter-web", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-test", "2.6.13"),
maven.artifact("org.springframework.boot", "spring-boot-test-autoconfigure", "2.6.13"),
maven.artifact("org.xmlunit", "xmlunit-core", "2.8.4"),
maven.artifact("org.yaml", "snakeyaml", "1.29"),
],
repositories = [
"https://repo1.maven.org/maven2/",
],
use_unsafe_shared_cache = True,
)

0 comments on commit 2cd204e

Please sign in to comment.