Merge pull request #403 from ikvmnet/feature/jdk8u152-b16

Upgrade JDK8u152
ikvmnet · Mar 11, 2024 · 212225f · 212225f
2 parents 9838f96 + 1139e76
commit 212225f
Show file tree

Hide file tree

Showing 121 changed files with 7,026 additions and 1,112 deletions.
diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
@@ -1,6 +1,7 @@
 name: IKVM
 
 on:
+  workflow_dispatch:
   push:
     branches:
     - main
@@ -635,10 +636,11 @@ jobs:
                 "--blame",
                 "--blame-crash",
                 "--blame-hang",
-                "--blame-hang-timeout", "120m",
+                "--blame-hang-timeout", "60m",
+                "--blame-hang-dump-type", "full",
                 "-v:diag",
                 "--results-directory", "TestResults",
-                "--logger:console;verbosity=diag",
+                "--logger:console;verbosity=detailed",
                 "--logger:trx"
                 # "--collect", "Code Coverage"
             )

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -24,8 +24,8 @@
         <OpenJdkMajorVersion>1</OpenJdkMajorVersion>
         <OpenJdkMinorVersion>8</OpenJdkMinorVersion>
         <OpenJdkMicroVersion>0</OpenJdkMicroVersion>
-        <OpenJdkUpdateVersion>92</OpenJdkUpdateVersion>
-        <OpenJdkBuildNumber>b34</OpenJdkBuildNumber>
+        <OpenJdkUpdateVersion>152</OpenJdkUpdateVersion>
+        <OpenJdkBuildNumber>b16</OpenJdkBuildNumber>
         <OpenJdkVersion>OpenJDK $(OpenJdkMinorVersion)u$(OpenJdkUpdateVersion) $(OpenJdkBuildNumber)</OpenJdkVersion>
         <OpenJdkFullVersion>$(OpenJdkMajorVersion).$(OpenJdkMinorVersion).$(OpenJdkMicroVersion)_$(OpenJdkUpdateVersion)-$(OpenJdkBuildNumber)</OpenJdkFullVersion>
         <OpenJdkVendor>Oracle</OpenJdkVendor>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -7,4 +7,5 @@
         <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)' == 'win7-x64' ">win-x64</RuntimeIdentifier>
         <Prefer32Bit Condition=" '$(RuntimeIdentifier)' == 'win-x86' ">true</Prefer32Bit>
     </PropertyGroup>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -37,7 +37,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.58">
+        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.88">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/IKVM.sln b/IKVM.sln
@@ -221,6 +221,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.linu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Image.JRE.runtime.linux-musl-x64", "src\IKVM.Image.JRE.runtime.linux-musl-x64\IKVM.Image.JRE.runtime.linux-musl-x64.csproj", "{4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xjc", "src\xjc\xjc.msbuildproj", "{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}"
+EndProject
 Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libunpack", "src\libunpack\libunpack.clangproj", "{1E74B9F3-AF8C-4ADB-90EA-0E1696C7886C}"
 EndProject
 Project("{6DE1C62B-E8D7-451A-8734-87EAEB46E35B}") = "libjvm", "src\libjvm\libjvm.clangproj", "{FE90DDCB-06F3-4470-A9A7-7640B04EA9E4}"
@@ -668,6 +670,10 @@ Global
 		{4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AC61233-8347-4AC6-9E01-5C5BC48D5A8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C35B9502-AC9F-4490-9480-6EAB4FD94AAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E74B9F3-AF8C-4ADB-90EA-0E1696C7886C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E74B9F3-AF8C-4ADB-90EA-0E1696C7886C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E74B9F3-AF8C-4ADB-90EA-0E1696C7886C}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1 b/ext/ikvm-native-sdk/Fix-SymbolicLinks.ps1
@@ -19,7 +19,7 @@ function Fix-SymbolicLink ($i, $p) {
 		}
 
 		# recurse into target, attempting to fix it
-		$t = gi $(Join-Path $i.DirectoryName $i.Target)
+		$t = gi $(Join-Path "$($i.DirectoryName)" "$($i.Target)")
 		$t = Fix-SymbolicLink $t
 
 		# is the target a directory?
@@ -28,11 +28,11 @@ function Fix-SymbolicLink ($i, $p) {
 			$t = $i.Target
 
 			# remove original item and replace with mklink /D
-			ri $i
+			ri $i.FullName
 			& cmd /c "mklink /D $n $t" | Write-Host
 
 			# refresh item for recursive call
-			return (gi $i)
+			return (gi $i.FullName)
 		}
 	} catch {
 		Write-Host -Foreground Red -Background Black ($i.FullName + ": " + $_.Exception.Message)

diff --git a/openjdk b/openjdk
diff --git a/openjdk.props b/openjdk.props
@@ -1113,11 +1113,6 @@
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\font\TextSource.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\font\TextSourceLabel.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\font\Underline.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\anon\AnonymousClassLoader.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\anon\ConstantPoolParser.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\anon\ConstantPoolPatch.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\anon\ConstantPoolVisitor.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\anon\InvalidConstantPoolFormatException.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\empty\Empty.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\package-info.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\invoke\util\BytecodeDescriptor.java" />
@@ -1290,6 +1285,7 @@
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaNetHttpCookieAccess.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaNioAccess.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaObjectInputStreamAccess.java" />
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaOISAccess.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaSecurityAccess.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaSecurityProtectionDomainAccess.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\JavaUtilJarAccess.java" />
@@ -1300,6 +1296,7 @@
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\MessageUtils.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\MetaIndex.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\NativeSignalHandler.java" />
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\ObjectInputFilter.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\ObjectStreamClassValidator.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\Perf.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\misc\PerfCounter.java" />
@@ -1462,6 +1459,7 @@
         <!--<OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\windows\classes\sun\nio\fs\WindowsChannelFactory.java" />-->
 
         <!--<OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\sun\nio\fs\**\*.java" PackagePath="sun\nio\fs" />-->
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\sun\nio\fs\UnixFileKey.java" />
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\solaris\classes\sun\nio\fs\DefaultFileSystemProvider.java" />
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\solaris\classes\sun\nio\fs\DefaultFileTypeDetector.java" />
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\solaris\classes\sun\nio\fs\SolarisAclFileAttributeView.java" />
@@ -1478,6 +1476,7 @@
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\BackgroundServiceLookup.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\CustomMediaSizeName.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\CustomMediaTray.java" />
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\DialogOnTop.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\DialogOwner.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\DocumentPropertiesUI.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\print\ImagePrinter.java" />
@@ -1698,8 +1697,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <OpenJdkRmiStub Include="sun.rmi.registry.RegistryImpl" Flags="-v1.1" />
-        <OpenJdkRmiStub Include="sun.rmi.transport.DGCImpl" Flags="-v1.1" />
         <OpenJdkRmiStub Include="sun.rmi.server.Activation$ActivationSystemImpl" Flags="-v1.2" />
         <OpenJdkRmiStub Include="java.rmi.activation.ActivationGroup" Flags="-v1.2" />
         <OpenJdkRmiStub Include="com.sun.jndi.rmi.registry.ReferenceWrapper" Flags="-v1.2" />
@@ -1723,11 +1720,9 @@
         <OpenJdkImageContent Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\currency.data" ImagePath="lib\currency.data" />
         <OpenJdkImageContent Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\cmm\**\*" ImagePath="lib\cmm\%(RecursiveDir)%(Filename)%(Extension)" />
         <OpenJdkImageContent Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\management\**\*" ImagePath="lib\management\%(RecursiveDir)%(Filename)%(Extension)" />
-        <OpenJdkImageContent Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\security\**\*" ImagePath="lib\security\%(Filename)%(Extension)" />
+        <OpenJdkImageContent Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\security\**\*" ImagePath="lib\security\%(RecursiveDir)%(Filename)%(Extension)" />
         <OpenJdkImageContent Remove="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\security\java.security" />
         <OpenJdkImageContent Remove="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\security\cacerts" />
-        <OpenJdkImageContent Remove="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\security\local_policy.jar" />
-        <OpenJdkImageContent Include="$(OpenJdkDir)\build\linux-x86_64-normal-server-release\jdk\lib\security\US_export_policy.jar" ImagePath="lib\security\local_policy.jar" />
         <OpenJdkImageContent Include="$(OpenJdkDir)\jdk\src\windows\lib\*" ImagePath="lib\%(Filename)%(Extension)" />
     </ItemGroup>
 

diff --git a/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj b/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj
@@ -7,9 +7,9 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.0.0" />
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.4.0" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.9.0" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     </ItemGroup>

diff --git a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
@@ -16,9 +16,10 @@
         <BinProject Include="..\jdeps\jdeps.msbuildproj" />
         <BinProject Include="..\native2ascii\native2ascii.msbuildproj" />
         <BinProject Include="..\rmic\rmic.msbuildproj" />
+        <BinProject Include="..\schemagen\schemagen.msbuildproj" />
         <BinProject Include="..\wsgen\wsgen.msbuildproj" />
         <BinProject Include="..\wsimport\wsimport.msbuildproj" />
-        <BinProject Include="..\schemagen\schemagen.msbuildproj" />
+        <BinProject Include="..\xjc\xjc.msbuildproj" />
     </ItemGroup>
 
     <ItemGroup>