| commit | f93fb91d6f0dc5ac755a3782fe8bb6d130aead08 | [log] [tgz] |
|---|---|---|
| author | David Ostrovsky <david@ostrovsky.org> | Thu Oct 03 13:35:18 2019 +0200 |
| committer | David Ostrovsky <david@ostrovsky.org> | Thu Oct 03 13:35:18 2019 +0200 |
| tree | 67818f64dd2ccca4769c7e29ff6122da0ec7652a | |
| parent | f3683bd73e698ac84d6fe53548dfed0b6ae2cd19 [diff] | |
| parent | d69c32186f4f2f2100772c2d90c2a573c241ff06 [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: FilesystemDeleteHandler: Fix misused week year flagged by error prone Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API Change-Id: I1a359dd758ffecfc10f149b90da33999e29b379b
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;