diff --git a/Directory.Build.props b/Directory.Build.props index 49665ef9b..9587bfb16 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -24,7 +24,7 @@ 1 8 0 - 432 + 442 b06 OpenJDK $(OpenJdkMinorVersion)u$(OpenJdkUpdateVersion) $(OpenJdkBuildNumber) $(OpenJdkMajorVersion).$(OpenJdkMinorVersion).$(OpenJdkMicroVersion)_$(OpenJdkUpdateVersion)-$(OpenJdkBuildNumber) diff --git a/ext/openjdk b/ext/openjdk index f2320fd28..e3f5387ef 160000 --- a/ext/openjdk +++ b/ext/openjdk @@ -1 +1 @@ -Subproject commit f2320fd28b8edc0b410e96a583880ab57c0225f0 +Subproject commit e3f5387ef84fa5f2675c9d85c2da2b53eed43814 diff --git a/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt index e2a4d4ce4..37fce581a 100644 --- a/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt +++ b/src/IKVM.OpenJDK.Tests/jdk/test/ExcludeList.txt @@ -4837,3 +4837,7 @@ javax/swing/reliability/TaskZoomJFrameChangeState.java javax/swing/reliability/TaskZoomJFrameRepaint.java linux-all,macosx-all sun/java2d/OpenGL/CopyAreaOOB.java macosx-all,windows-all sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java generic-all + +# these use a newer JUnit than what our jtreg has +tools/jar/ExtractFilesTest.java generic-all +tools/jar/MultipleManifestTest.java generic-all