From f8ba38fd889e7ff2e1e82ec1fa2250c365c82d36 Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Sat, 21 Dec 2024 21:22:08 -0700 Subject: [PATCH 1/7] rules_spring 2.6.0 --- modules/rules_spring/2.6.0/MODULE.bazel | 67 ++++++++++++++++++++++++ modules/rules_spring/2.6.0/presubmit.yml | 34 ++++++++++++ modules/rules_spring/2.6.0/source.json | 5 ++ modules/rules_spring/metadata.json | 17 ++++++ 4 files changed, 123 insertions(+) create mode 100644 modules/rules_spring/2.6.0/MODULE.bazel create mode 100644 modules/rules_spring/2.6.0/presubmit.yml create mode 100644 modules/rules_spring/2.6.0/source.json create mode 100644 modules/rules_spring/metadata.json diff --git a/modules/rules_spring/2.6.0/MODULE.bazel b/modules/rules_spring/2.6.0/MODULE.bazel new file mode 100644 index 00000000000..4762e02b458 --- /dev/null +++ b/modules/rules_spring/2.6.0/MODULE.bazel @@ -0,0 +1,67 @@ +module( + name = "rules_spring", + version = "2.6.0", + compatibility_level = 2, + repo_name = "rules_spring", +) + +# Python for dupe class checking support +bazel_dep(name = "rules_python", version = "0.40.0") + +# For License support +bazel_dep(name = "rules_license", version = "1.0.0") + + +# DEV DEPENDENCIES + +# Maven dependencies for the examples +bazel_dep(name = "rules_jvm_external", version = "6.6", dev_dependency = True) +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven", dev_dependency = True) +maven.install( + artifacts = [ + "org.slf4j:slf4j-api:2.0.13", + "org.springframework.boot:spring-boot:3.3.5", + "org.springframework.boot:spring-boot-actuator:3.3.5", + "org.springframework.boot:spring-boot-actuator-autoconfigure:3.3.5", + "org.springframework.boot:spring-boot-autoconfigure:3.3.5", + "org.springframework.boot:spring-boot-configuration-processor:3.3.5", + "org.springframework.boot:spring-boot-loader:3.3.5", + "org.springframework.boot:spring-boot-loader-tools:3.3.5", + "org.springframework.boot:spring-boot-starter:3.3.5", + "org.springframework.boot:spring-boot-starter-actuator:3.3.5", + "org.springframework.boot:spring-boot-starter-freemarker:3.3.5", + "org.springframework.boot:spring-boot-starter-jdbc:3.3.5", + "org.springframework.boot:spring-boot-starter-jetty:3.3.5", + "org.springframework.boot:spring-boot-starter-logging:3.3.5", + "org.springframework.boot:spring-boot-starter-security:3.3.5", + "org.springframework.boot:spring-boot-starter-test:3.3.5", + "org.springframework.boot:spring-boot-starter-web:3.3.5", + "org.springframework.boot:spring-boot-test:3.3.5", + "org.springframework.boot:spring-boot-test-autoconfigure:3.3.5", + "org.springframework.boot:spring-boot-starter-thymeleaf:3.3.5", + + "org.springframework:spring-aop:6.1.14", + "org.springframework:spring-aspects:6.1.14", + "org.springframework:spring-beans:6.1.14", + "org.springframework:spring-context:6.1.14", + "org.springframework:spring-context-support:6.1.14", + "org.springframework:spring-core:6.1.14", + "org.springframework:spring-expression:6.1.14", + "org.springframework:spring-jdbc:6.1.14", + "org.springframework:spring-test:6.1.14", + "org.springframework:spring-tx:6.1.14", + "org.springframework:spring-web:6.1.14", + "org.springframework:spring-webmvc:6.1.14", + + # intentionally ancient version annotation-api; in demoapp we use + # a filter to exclude this dependency + "javax.annotation:javax.annotation-api:1.3.2", + + # test deps + "junit:junit:4.13.2", + "org.hamcrest:hamcrest-core:2.2", + ], + lock_file = "//:maven_install.json", +) + +use_repo(maven, "maven") diff --git a/modules/rules_spring/2.6.0/presubmit.yml b/modules/rules_spring/2.6.0/presubmit.yml new file mode 100644 index 00000000000..3aa4605cfab --- /dev/null +++ b/modules/rules_spring/2.6.0/presubmit.yml @@ -0,0 +1,34 @@ +matrix: + platform: + - debian10 + - ubuntu2004 + - macos + - macos_arm64 + bazel: [7.x, rolling] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@rules_spring//springboot:springboot_cli' +bcr_test_module: + module_path: //examples + matrix: + platform: + - debian10 + - ubuntu2004 + - macos + - macos_arm64 + bazel: [7.x, rolling] + tasks: + run_test_module: + name: Run test module + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - //examples/demoapp:demoapp + - //examples/helloworld:helloworld + test_targets: + - //examples/demoapp:SampleRestFuncTest + - //examples/helloworld:SampleRestFuncTest \ No newline at end of file diff --git a/modules/rules_spring/2.6.0/source.json b/modules/rules_spring/2.6.0/source.json new file mode 100644 index 00000000000..816afdf47bd --- /dev/null +++ b/modules/rules_spring/2.6.0/source.json @@ -0,0 +1,5 @@ +{ + "url": "https://github.com/salesforce/rules_spring/archive/refs/tags/2.6.0.tar.gz", + "integrity": "sha256-stvlnezb8RWbVMFkST9SpH+2x6Z8HeUhkvY1awTZlJs=", + "strip_prefix": "rules_spring-2.6.0" +} diff --git a/modules/rules_spring/metadata.json b/modules/rules_spring/metadata.json new file mode 100644 index 00000000000..2eaa44f44ce --- /dev/null +++ b/modules/rules_spring/metadata.json @@ -0,0 +1,17 @@ +{ + "homepage": "https://github.com/salesforce/rules_spring", + "maintainers": [ + { + "email": "laird_peter@yahoo.com", + "github": "plaird", + "name": "Peter Laird" + } + ], + "repository": [ + "github:salesforce/rules_spring" + ], + "versions": [ + "2.6.0" + ], + "yanked_versions": {} +} From 1d0d08b9665a3281a8fe9e1f0ec0346984091578 Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Sun, 22 Dec 2024 23:18:10 -0700 Subject: [PATCH 2/7] Apply suggestions from code review Co-authored-by: Fabian Meumertzheim --- modules/rules_spring/2.6.0/presubmit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rules_spring/2.6.0/presubmit.yml b/modules/rules_spring/2.6.0/presubmit.yml index 3aa4605cfab..8749c204e72 100644 --- a/modules/rules_spring/2.6.0/presubmit.yml +++ b/modules/rules_spring/2.6.0/presubmit.yml @@ -4,7 +4,7 @@ matrix: - ubuntu2004 - macos - macos_arm64 - bazel: [7.x, rolling] + bazel: [7.x, 8.x, rolling] tasks: verify_targets: name: Verify build targets @@ -20,7 +20,7 @@ bcr_test_module: - ubuntu2004 - macos - macos_arm64 - bazel: [7.x, rolling] + bazel: [7.x, 8.x, rolling] tasks: run_test_module: name: Run test module From 8a95c528ec777d08f36e089ca014c2615c0f8716 Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Mon, 23 Dec 2024 14:38:48 -0700 Subject: [PATCH 3/7] fixed source url --- modules/rules_spring/2.6.0/source.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/rules_spring/2.6.0/source.json b/modules/rules_spring/2.6.0/source.json index 816afdf47bd..4e150773a85 100644 --- a/modules/rules_spring/2.6.0/source.json +++ b/modules/rules_spring/2.6.0/source.json @@ -1,5 +1,4 @@ { - "url": "https://github.com/salesforce/rules_spring/archive/refs/tags/2.6.0.tar.gz", - "integrity": "sha256-stvlnezb8RWbVMFkST9SpH+2x6Z8HeUhkvY1awTZlJs=", - "strip_prefix": "rules_spring-2.6.0" + "url": "https://github.com/salesforce/rules_spring/releases/download/2.6.0/rules-spring-2.6.0.zip", + "integrity": "sha256-uMLeioEjkGydD8Wv01395fVdYDDE1yJm5N/QVD9iHYk=" } From 2b99ec234b659850a81e1aa4eee96d34c1b0174f Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Mon, 23 Dec 2024 14:43:43 -0700 Subject: [PATCH 4/7] update rules_spring test targets --- modules/rules_spring/2.6.0/presubmit.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/rules_spring/2.6.0/presubmit.yml b/modules/rules_spring/2.6.0/presubmit.yml index 8749c204e72..1b175740ba5 100644 --- a/modules/rules_spring/2.6.0/presubmit.yml +++ b/modules/rules_spring/2.6.0/presubmit.yml @@ -27,8 +27,6 @@ bcr_test_module: platform: ${{ platform }} bazel: ${{ bazel }} build_targets: - - //examples/demoapp:demoapp - - //examples/helloworld:helloworld + - //springboot/springboot_cli test_targets: - - //examples/demoapp:SampleRestFuncTest - - //examples/helloworld:SampleRestFuncTest \ No newline at end of file + - //springboot/springboot:check_dupe_classes_test From fd304a0fddddb5a55bd2c244b84f555ea53b580b Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Mon, 23 Dec 2024 14:50:51 -0700 Subject: [PATCH 5/7] update rules_spring test targets --- modules/rules_spring/2.6.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rules_spring/2.6.0/presubmit.yml b/modules/rules_spring/2.6.0/presubmit.yml index 1b175740ba5..2902615b095 100644 --- a/modules/rules_spring/2.6.0/presubmit.yml +++ b/modules/rules_spring/2.6.0/presubmit.yml @@ -13,7 +13,7 @@ tasks: build_targets: - '@rules_spring//springboot:springboot_cli' bcr_test_module: - module_path: //examples + module_path: //springboot matrix: platform: - debian10 From dd077e4da947826e3a75d41888d54f72a21a0943 Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Mon, 23 Dec 2024 14:53:55 -0700 Subject: [PATCH 6/7] update rules_spring test targets --- modules/rules_spring/2.6.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rules_spring/2.6.0/presubmit.yml b/modules/rules_spring/2.6.0/presubmit.yml index 2902615b095..e5c3d630675 100644 --- a/modules/rules_spring/2.6.0/presubmit.yml +++ b/modules/rules_spring/2.6.0/presubmit.yml @@ -13,7 +13,7 @@ tasks: build_targets: - '@rules_spring//springboot:springboot_cli' bcr_test_module: - module_path: //springboot + module_path: "" matrix: platform: - debian10 From 89b976a3b94844ac3b82b63836f58ac6f569b677 Mon Sep 17 00:00:00 2001 From: Peter Laird Date: Mon, 23 Dec 2024 14:55:51 -0700 Subject: [PATCH 7/7] update rules_spring test targets --- modules/rules_spring/2.6.0/presubmit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rules_spring/2.6.0/presubmit.yml b/modules/rules_spring/2.6.0/presubmit.yml index e5c3d630675..20f70b1c132 100644 --- a/modules/rules_spring/2.6.0/presubmit.yml +++ b/modules/rules_spring/2.6.0/presubmit.yml @@ -27,6 +27,6 @@ bcr_test_module: platform: ${{ platform }} bazel: ${{ bazel }} build_targets: - - //springboot/springboot_cli + - //springboot:springboot_cli test_targets: - - //springboot/springboot:check_dupe_classes_test + - //springboot:check_dupe_classes_test