Merge branch 'jetty-9.4.x' into jetty-10.0.x

jetty · Dec 16, 2020 · 6769a83 · 6769a83
2 parents 5d64ba0 + 38f0fc4
commit 6769a83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
@@ -342,9 +342,12 @@ public void testAccessUniCodeFile(Class resourceClass) throws Exception
             assertThat("Ref A2 exists", refA2.exists(), is(true));
             assertThat("Ref O1 exists", refO1.exists(), is(true));
 
-            assertThat("Ref A1 alias", refA1.isAlias(), is(false));
-            assertThat("Ref A2 alias", refA2.isAlias(), is(false));
-            assertThat("Ref O1 alias", refO1.isAlias(), is(false));
+            if (LINUX.isCurrentOs())
+            {
+                assertThat("Ref A1 alias", refA1.isAlias(), is(false));
+                assertThat("Ref A2 alias", refA2.isAlias(), is(false));
+                assertThat("Ref O1 alias", refO1.isAlias(), is(false));
+            }
 
             assertThat("Ref A1 contents", toString(refA1), is("hi a-with-circle"));
             assertThat("Ref A2 contents", toString(refA2), is("hi a-with-two-dots"));

diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
     <settingsPath>src/it/settings.xml</settingsPath>
     <invoker.mergeUserSettings>false</invoker.mergeUserSettings>
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
-    <testcontainers.version>1.15.0</testcontainers.version>
+    <testcontainers.version>1.15.1</testcontainers.version>
     <maria.version>2.7.0</maria.version>
   </properties>