Revert "JBR-6246 add default CDS archives into jbrsdk distributions and remove the step normalizing timestamp"

This reverts commit be6842220b.
update exclude list on results of 21.0.2_b341 test runs
2026-01-15 13:01:42 +01:00 · 2024-01-20 16:46:09 +07:00 · 2024-01-20 10:06:05 +07:00
10 changed files with 10 additions and 50 deletions
--- a/jb/project/tools/linux/scripts/mkimages_aarch64.sh
+++ b/jb/project/tools/linux/scripts/mkimages_aarch64.sh
@@ -77,7 +77,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
    mv release "$IMAGES_DIR"/"$__root_dir"/release
    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
  fi
--- a/jb/project/tools/linux/scripts/mkimages_x64.sh
+++ b/jb/project/tools/linux/scripts/mkimages_x64.sh
@@ -77,7 +77,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
    mv release "$IMAGES_DIR"/"$__root_dir"/release
    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
  fi
--- a/jb/project/tools/linux/scripts/mkimages_x86.sh
+++ b/jb/project/tools/linux/scripts/mkimages_x86.sh
@@ -65,7 +65,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
    mv release "$IMAGES_DIR"/"$__root_dir"/release
    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
  fi
--- a/jb/project/tools/mac/scripts/mkimages.sh
+++ b/jb/project/tools/mac/scripts/mkimages.sh
@@ -72,7 +72,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
    mv release $JRE_CONTENTS/Home/release
    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
-    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/server/*.jsa $JRE_CONTENTS/Home/lib/server
    copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
  fi
@@ -88,7 +87,7 @@ function create_image_bundle {

  echo Creating "$JBR".tar.gz ...
  # Normalize timestamp
-  #find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
+  find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"

  (cd "$tmp" &&
      find "$__root_dir" -print0 | LC_ALL=C sort -z | \
--- a/jb/project/tools/windows/scripts/mkimages_aarch64.sh
+++ b/jb/project/tools/windows/scripts/mkimages_aarch64.sh
@@ -75,7 +75,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
    mv release $__root_dir/release
    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
    done
--- a/jb/project/tools/windows/scripts/mkimages_x64.sh
+++ b/jb/project/tools/windows/scripts/mkimages_x64.sh
@@ -66,7 +66,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
    mv release $__root_dir/release
    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
    done
--- a/jb/project/tools/windows/scripts/mkimages_x86.sh
+++ b/jb/project/tools/windows/scripts/mkimages_x86.sh
@@ -62,7 +62,6 @@ function create_image_bundle {
    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
    mv release $__root_dir/release
    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
    done
--- a/test/jdk/jb/build/CDSArchivesTest.sh
+++ b/test/jdk/jb/build/CDSArchivesTest.sh
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# @test
-# @summary CDSArchivesTest.sh checks jsa files exist in jbrsdk distributions, jbr distributions are skipped
-# @run shell CDSArchivesTest.sh
-
-if [ -z "${TESTJAVA}" ]; then
-  echo "TESTJAVA undefined: testing cancelled"
-  exit 1
-fi
-
-source ${TESTJAVA}/release
-echo "Checking $IMPLEMENTOR_VERSION"
-if [[ "$IMPLEMENTOR_VERSION" != *"JBRSDK"* ]]; then
-  echo "Test executed for JBRSDK only"
-  echo "skipping the test"
-  exit 0
-fi
-
-FIND="/usr/bin/find"
-files=$(${FIND} ${TESTJAVA} -name "*.jsa")
-ls -l $files
-if [ $? != 0 ]; then
-    echo "Command failed."
-    exit 1
-elif [ -z "$files" ]; then
-    echo "*** FAILED *** jsa-files not found"
-    echo "\n*** FAILED *** Test failed"
-    exit 1
-fi
-echo "\nTest passed"
--- a/test/jdk/jbMMProblemList.txt
+++ b/test/jdk/jbMMProblemList.txt
@@ -6,7 +6,6 @@ java/awt/EmbeddedFrame/GraphicsConfigTest/GraphicsConfigTest.java 8305515
 java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java 8311535 windows-all
 java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java 8292588,JBR-6058 macosx-all,windows-all,linux-all
 java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java JBR-5531 macosx-all,linux-all
-java/awt/Frame/FramesGC/FramesGC.java JBR-6057 windows-all
 java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java JBR-5117,JBR-6509 linux-all,generic-all
 java/awt/Frame/MaximizedToOppositeScreen/MaximizedToOppositeScreenSmall.java JBR-4379 windows-all
 java/awt/Frame/SetMaximizedBounds/SetMaximizedBounds.java JBR-4379 windows-all
@@ -17,7 +16,6 @@ java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java JBR-5062 linux-all
 java/awt/GraphicsDevice/DisplayModes/UnknownRefrshRateTest.java JBR-6336 macosx-aarch64
 java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java JBR-6336 macosx-aarch64
 java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java JBR-5086 linux-5.15.0-46-generic Ubuntu 20.04
-java/awt/Frame/FramesGC/FramesGC.java JBR-6057 windows-all,macosx-all
 java/awt/Robot/NonEmptyErrorStream.java JBR-5442 linux-all
 java/awt/Robot/MouseLocationOnScreen/MouseLocationOnScreen.java JBR-5390 macosx-all,linux-all
 java/awt/Robot/NonEmptyErrorStream.java JBR-5442 linux-all
--- a/test/jdk/jbProblemList.txt
+++ b/test/jdk/jbProblemList.txt
@@ -228,10 +228,6 @@ java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generi
 java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all
 java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java JBR-6393 linux-5.18.2-arch1-1
 java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java 8300704 linux-all
-java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java JBR-5812 linux-all
-java/awt/Toolkit/SecurityTest/SecurityTest2.java JBR-5225 windows-all
-java/awt/Toolkit/SunDisplayChangerLeakTest/SunDisplayChangerLeakTest.java JBR-5051 windows-all
-java/awt/Toolkit/RealSync/Test.java 6849383,8072110 linux-all,windows-all
 java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252,JBR-5050 windows-all,macosx-all
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8072110,8203047 macosx-all,linux-all
 java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java 8073636,JBR-4211 macosx-all,linux-all
@@ -263,8 +259,16 @@ java/awt/dnd/Button2DragTest/Button2DragTest.java 8310490 linux-all
 java/awt/dnd/RejectDragDropActionTest.java JBR-5858 windows-10.0
 java/awt/dnd/RemoveDropTargetCrashTest/RemoveDropTargetCrashTest.java JBR-6549 windows-all
 java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java 8194947 generic-all
-java/awt/Frame/FramesGC/FramesGC.java 8079069 macosx-all
+java/awt/Frame/FramesGC/FramesGC.java 8079069,JBR-6057 macosx-all,windows-all,linux-all
 java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java 8253184 windows-all
+java/awt/Toolkit/DesktopProperties/rfe4758438.java JBR-5510 linux-5.18.2-arch1-1
+java/awt/Toolkit/Headless/HeadlessToolkit.java JBR-6550 macosx-all
+java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java JBR-5765 macosx-all
+java/awt/Toolkit/RealSync/Test.java 6849383,8072110 linux-all,windows-all
+java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java JBR-5812 linux-all
+java/awt/Toolkit/SecurityTest/SecurityTest2.java JBR-5225 windows-all
+java/awt/Toolkit/SunDisplayChangerLeakTest/SunDisplayChangerLeakTest.java JBR-5051 windows-all
+java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java 6847163 linux-all,windows-all
 java/awt/TrayIcon/ActionCommand/ActionCommand.java 8150540,JBR-3107 windows-all,linux-all
 java/awt/TrayIcon/ActionEventMask/ActionEventMask.java 8150540,8242801,8295300,JBR-3107 windows-all,macosx-all,linux-all
 java/awt/TrayIcon/ActionEventTest/ActionEventTest.java 8150540,8242801 windows-all,macosx-all
@@ -644,7 +648,6 @@ java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java 8253184 win
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676,8253184 linux-all,windows-all
 java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,windows-all
 java/awt/Mouse/MouseWheelAbsXY/MouseWheelAbsXY.java 8253184 windows-all
-java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java 6847163 linux-all,windows-all
 java/awt/xembed/server/RunTestXEmbed.java 7034201 linux-all
 java/awt/xembed/server/RunTestXEmbed.java 7034201 linux-all
 java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java 8164473 linux-all
@@ -1270,7 +1273,6 @@ jb/java/awt/Font/font430.sh
 jb/java/awt/Font/Font467.java                                                       JBR-3960 generic-all
 jb/java/awt/keyboard/AltGrMustGenerateAltGrModifierTest4207.java                    JBR-4207 windows-all
 jb/java/awt/Toolkit/AWTThreadingTest.java                                           JBR-4350 macosx-all
-java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java                       JBR-5765 macosx-all
 jb/java/awt/Toolkit/LWCToolkitInvokeAndWaitTest.java                                JBR-4896,JBR-5163 macosx-all,

 java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java JBR-4250 windows-all
@@ -1412,7 +1414,6 @@ javax/swing/JSpinner/4788637/bug4788637.java JBR-5510 linux-5.18.2-arch1-1
 javax/swing/LookAndFeel/8145547/DemandGTK2.sh JBR-5510 linux-5.18.2-arch1-1
 javax/swing/LookAndFeel/8145547/DemandGTK3.sh JBR-5510 linux-5.18.2-arch1-1

-java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java JBR-5765 macosx-all
 jb/sun/awt/macos/InputMethodTest/FocusMoveUncommitedCharactersTest.java JBR-5765 macosx-all

 jb/java/awt/Focus/BrokenTraversalAWT.java JBR-5799 windows-all
@@ -1428,7 +1429,6 @@ java/awt/Graphics/XORPaint.java#id2 JBR-5510 linux-5.18.2-arch1-1
 java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java JBR-5510 linux-5.18.2-arch1-1
 java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java JBR-5510 linux-5.18.2-arch1-1
 java/awt/Robot/NonEmptyErrorStream.java JBR-5510 linux-5.18.2-arch1-1
-java/awt/Toolkit/DesktopProperties/rfe4758438.java JBR-5510 linux-5.18.2-arch1-1
 javax/swing/JComboBox/6406264/bug6406264.java JBR-5510 linux-5.18.2-arch1-1
 javax/swing/JComboBox/TestComboBoxComponentRendering.java JBR-5510 linux-5.18.2-arch1-1
 javax/swing/JMenu/TestDisabledMenuForegroundColor.java JBR-5510 linux-5.18.2-arch1-1
Author	SHA1	Message	Date
Vitaly Provodin	ee1caab002	Revert "JBR-6246 add default CDS archives into jbrsdk distributions and remove the step normalizing timestamp" This reverts commit `be6842220b`.	2024-01-20 16:46:09 +07:00
Vitaly Provodin	c2e84f90cf	update exclude list on results of 21.0.2_b341 test runs	2024-01-20 10:06:05 +07:00