Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
FilesystemDeleteHandler: Fix misused week year flagged by error prone
Upgrade bazlets to latest stable-2.16 to build with 2.16.12 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API
.bazelrc: Update 'strict_action_env' flag
Switch required bazel version to 0.29.1
Make build tests name consistent with stable-2.15
Upgrade bazlets to latest stable-2.16
Upgrade bazlets to latest stable-2.15
Bump required bazel version to 1.0.0rc2
Upgrade bazlets to latest stable-2.14
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Upgrade bazlets to latest stable-2.16 to build with 2.16.11.1 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.16 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.15 API
Upgrade bazlets to latest stable-2.16 to build with 2.16.10 API
Upgrade bazlets to latest stable-2.16
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Upgrade bazlets to latest stable-2.16 to build with 2.16.9 API
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Align tests target name prefix with plugin name
Upgrade bazlets to latest stable-2.15 to build with 2.15.14 API
Upgrade bazlets to latest revision on stable-2.16
Upgrade mockito-core to 2.28.2
Make transitive starlark loads explicit
Make transitive starlark loads explicit
Change-Id: If70f8a70d96525645b0037b9d9978db5dba83047
diff --git a/BUILD b/BUILD
index 83793ef..819cac0 100644
--- a/BUILD
+++ b/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
load("//tools/bzl:junit.bzl", "junit_tests")
load(
"//tools/bzl:plugin.bzl",
@@ -44,7 +45,7 @@
)
junit_tests(
- name = "delete_project_tests",
+ name = "delete-project_tests",
srcs = glob(["src/test/java/**/*.java"]),
tags = ["delete-project"],
deps = [
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/DeleteTrashFolders.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/DeleteTrashFolders.java
index 7b84951..1be7f1c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/DeleteTrashFolders.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/DeleteTrashFolders.java
@@ -57,7 +57,7 @@
/**
* Newer trash folder name format. Besides the changes in TRASH_2, it uses a timestamp format
- * (YYYYMMddHHmmss) instead of the epoch one for increased readability.
+ * (yyyyMMddHHmmss) instead of the epoch one for increased readability.
*/
private static final Pattern TRASH_3 = Pattern.compile(".*\\.\\d{14}.%deleted%.git");
diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java
index d8a4883..ac50295 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/fs/FilesystemDeleteHandler.java
@@ -42,7 +42,7 @@
public class FilesystemDeleteHandler {
private static final FluentLogger log = FluentLogger.forEnclosingClass();
private static final DateTimeFormatter FORMAT =
- DateTimeFormatter.ofPattern("YYYYMMddHHmmss").withZone(ZoneId.of("UTC"));
+ DateTimeFormatter.ofPattern("yyyyMMddHHmmss").withZone(ZoneId.of("UTC"));
private final GitRepositoryManager repoManager;
private final DynamicSet<ProjectDeletedListener> deletedListeners;
