Update ICC to OCK since the OpenJDKPlus change this name

closed/get_j9_source.sh

@@ -208,30 +208,30 @@ if [ ${pflag} = true ] ; then
 	wait
 fi
 
-# Download ICC binaries and create Java module folder
+# Download OCK binaries and create Java module folder
 openjceplus_source=OpenJCEPlus
 if [ -n "${git_urls[$openjceplus_source]}" ] ; then
 
 	echo
-	echo "$openjceplus_source exists, download ICC binaries"
+	echo "$openjceplus_source exists, download OCK binaries"
 	echo
 
 	cd $openjceplus_source
-	mkdir -p icc/jgsk_sdk/lib64
+	mkdir -p ock/jgsk_sdk/lib64
 
 	if [ $gskit_credential ]; then
 		# Download GSKit binaries from artifactory
-		curl -vk -u "$gskit_credential" -X GET $gskit_bin > ./icc/jgsk_crypto.tar
-		curl -vk -u "$gskit_credential" -X GET $gskit_sdk_bin > ./icc/jgsk_crypto_sdk.tar
+		curl -vk -u "$gskit_credential" -X GET $gskit_bin > ./ock/jgsk_crypto.tar
+		curl -vk -u "$gskit_credential" -X GET $gskit_sdk_bin > ./ock/jgsk_crypto_sdk.tar
 	else
 		echo
 		echo "GSKit binaries are needed for compiling $openjceplus_source"
 		echo "Please set -with-gskit-bin, -with-gskit-sdk-bin, and -with-gskit-bin-credential"
 		exit 1
 	fi
 
-	tar -xf ./icc/jgsk_crypto_sdk.tar -C ./icc/
-	tar -xf ./icc/jgsk_crypto.tar -C ./icc/jgsk_sdk/lib64/
+	tar -xf ./ock/jgsk_crypto_sdk.tar -C ./ock/
+	tar -xf ./ock/jgsk_crypto.tar -C ./ock/jgsk_sdk/lib64/
 
 	# Create OpenJCEPlus Java module folder
 	mkdir -p ./src/main/openjceplus/share/classes/

closed/make/modules/openjceplus/Copy.gmk

@@ -32,18 +32,18 @@ ifeq (true,$(BUILD_OPENJCEPLUS))
   TARGETS += $(COPY_JGSKIT_LIBS)
 
   # Bundle GSKIT library
-  ICC_DIR := $(TOPDIR)/OpenJCEPlus/icc/jgsk_sdk/lib64
+  OCK_DIR := $(TOPDIR)/OpenJCEPlus/ock/jgsk_sdk/lib64
   ifeq ($(call isTargetOs, windows), true)
-    ICC_SUB_DIR := modules_cmds
+    OCK_SUB_DIR := modules_cmds
   else
-    ICC_SUB_DIR := modules_libs
+    OCK_SUB_DIR := modules_libs
   endif
 
-  $(eval $(call SetupCopyFiles, COPY_ICC, \
-      SRC := $(ICC_DIR), \
-      DEST := $(SUPPORT_OUTPUTDIR)/$(ICC_SUB_DIR)/$(MODULE), \
-      FILES := $(call FindFiles, $(ICC_DIR)), \
+  $(eval $(call SetupCopyFiles, COPY_OCK, \
+      SRC := $(OCK_DIR), \
+      DEST := $(SUPPORT_OUTPUTDIR)/$(OCK_SUB_DIR)/$(MODULE), \
+      FILES := $(call FindFiles, $(OCK_DIR)), \
   ))
 
-  TARGETS += $(COPY_ICC)
+  TARGETS += $(COPY_OCK)
 endif # BUILD_OPENJCEPLUS

closed/make/modules/openjceplus/Lib.gmk

@@ -23,7 +23,7 @@ include LibCommon.gmk
 ifeq (true,$(BUILD_OPENJCEPLUS))
 
 # Identify the desired JGSKIT target platform.
-GSKIT_HOME := $(TOPDIR)/OpenJCEPlus/icc/jgsk_sdk
+GSKIT_HOME := $(TOPDIR)/OpenJCEPlus/ock/jgsk_sdk
 JGSKIT_TARGET :=
 JGSKIT_MAKE := jgskit.mak
 JGSKIT_MAKE_PATH := $(OPENJCEPLUS_TOPDIR)/src/main/native/