Merge pull request #139 from pshipton/0.33.1

Merge 17.0.4.1+1 into 0.33.1
ibmruntimes · Aug 17, 2022 · 1f4d354 · 1f4d354
2 parents 6edb492 + 96a9951
commit 1f4d354
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 189 deletions.
diff --git a/.jcheck/conf b/.jcheck/conf
@@ -1,7 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=17.0.4
+version=17.0.4.1
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

diff --git a/closed/openjdk-tag.gmk b/closed/openjdk-tag.gmk
@@ -1 +1 @@
-OPENJDK_TAG := jdk-17.0.4+8
+OPENJDK_TAG := jdk-17.0.4.1+1
diff --git a/make/conf/version-numbers.conf b/make/conf/version-numbers.conf
@@ -29,11 +29,11 @@
 DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=4
-DEFAULT_VERSION_PATCH=0
+DEFAULT_VERSION_PATCH=1
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2022-07-19
+DEFAULT_VERSION_DATE=2022-08-12
 DEFAULT_VERSION_CLASSFILE_MAJOR=61  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11

diff --git a/test/hotspot/jtreg/compiler/allocation/TestAllocArrayAfterAllocNoUse.java b/test/hotspot/jtreg/compiler/allocation/TestAllocArrayAfterAllocNoUse.java
diff --git a/test/hotspot/jtreg/compiler/allocation/TestCCPAllocateArray.java b/test/hotspot/jtreg/compiler/allocation/TestCCPAllocateArray.java
diff --git a/test/hotspot/jtreg/compiler/allocation/TestFailedAllocationBadGraph.java b/test/hotspot/jtreg/compiler/allocation/TestFailedAllocationBadGraph.java
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OPENJDK_TAG := jdk-17.0.4+8
		OPENJDK_TAG := jdk-17.0.4.1+1