From 6300b47897c9dbe0f922680ea255ec78409593cd Mon Sep 17 00:00:00 2001 From: Michael Barry Date: Tue, 7 Jun 2022 20:40:46 -0400 Subject: [PATCH 1/4] Fix flaky windows test (#264) --- .../collection/LongLongMapTest.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/LongLongMapTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/LongLongMapTest.java index 34b584fe..f795176b 100644 --- a/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/LongLongMapTest.java +++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/LongLongMapTest.java @@ -146,14 +146,17 @@ public abstract class LongLongMapTest { assertTrue(usage > 60_000_000_000L, sizeDescription); assertTrue(usage < 100_000_000_000L, sizeDescription); } - LongLongMap map = LongLongMap.from(type, storage, params); - try (var writer = map.newWriter()) { - writer.put(2, 3); - writer.put(4, 5); - } - if (type != LongLongMap.Type.NOOP) { - assertEquals(3, map.get(2), variant); - assertEquals(5, map.get(4), variant); + try (LongLongMap map = LongLongMap.from(type, storage, params)) { + try (var writer = map.newWriter()) { + writer.put(2, 3); + writer.put(4, 5); + } + if (type != LongLongMap.Type.NOOP) { + assertEquals(3, map.get(2), variant); + assertEquals(5, map.get(4), variant); + } + } catch (IOException e) { + throw new AssertionError(e); } } } From 82e144d6b23d744e0d02a21ce8a8a3069c80cf9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jun 2022 20:49:52 -0400 Subject: [PATCH 2/4] Bump maven-surefire-plugin from 3.0.0-M6 to 3.0.0-M7 (#263) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M6 to 3.0.0-M7. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M6...surefire-3.0.0-M7) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2152bbc7..63116e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -211,7 +211,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M6 + 3.0.0-M7 From ccf16889c02ca23a2cf6372deeacd2c7b6ea9477 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 04:58:16 -0400 Subject: [PATCH 3/4] Bump commonmark from 0.18.2 to 0.19.0 (#269) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63116e4d..aed09634 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ org.commonmark commonmark - 0.18.2 + 0.19.0 org.junit.jupiter From 0f7745953f0ed5978e7e4a526e0f05d1a4edbe21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 04:58:50 -0400 Subject: [PATCH 4/4] Bump maven-surefire-plugin in /.github/planetiler-examples-dependabot (#270) --- planetiler-examples/standalone.pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetiler-examples/standalone.pom.xml b/planetiler-examples/standalone.pom.xml index fb5a45c7..6d9c91f4 100644 --- a/planetiler-examples/standalone.pom.xml +++ b/planetiler-examples/standalone.pom.xml @@ -78,7 +78,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M6 + 3.0.0-M7 org.apache.maven.plugins