LPS-64488 Update IBM JDK from 7 to 8

liferay · Apr 27, 2016 · d10983e · d10983e
1 parent 16fd9fe
commit d10983e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app.server.properties b/app.server.properties
@@ -231,8 +231,8 @@
     app.server.websphere.custom.zip.name=websphere-8.5.5.0.zip
     app.server.websphere.deploy.dir=${app.server.websphere.instance.dir}/wsadmin-deploy
     app.server.websphere.fix.pack.jdk.zip.names=\
-        7.1.0.0-WS-IBMWASJAVA-part1.zip,\
-        7.1.0.0-WS-IBMWASJAVA-part2.zip
+        8.0.2.10-WS-IBMWASJAVA-part1.zip,\
+        8.0.2.10-WS-IBMWASJAVA-part2.zip
     app.server.websphere.fix.pack.was.zip.names=\
         8.5.5-WS-WAS-FP0000009-part1.zip,\
         8.5.5-WS-WAS-FP0000009-part2.zip

diff --git a/build-dist.xml b/build-dist.xml
@@ -2638,7 +2638,7 @@ and put it in ${app.server.parent.dir}. Then rerun this task.
 			  	</offering>
 
 			 	<offering
-			  		id='com.ibm.websphere.IBMJAVA.v71'
+			  		id='com.ibm.websphere.IBMJAVA.v80'
 			  		profile='IBM Websphere 8.5.5.0'>
 			  	</offering>
 			</install>
@@ -2670,7 +2670,7 @@ and put it in ${app.server.parent.dir}. Then rerun this task.
 
 				<exec dir="${app.server.websphere.dir}/bin" executable="sh">
 					<arg value="-c" />
-					<arg value="./managesdk.sh -enableProfileAll -sdkName 1.7.1_64 -enableServers" />
+					<arg value="./managesdk.sh -enableProfileAll -sdkName 1.8_64 -enableServers" />
 				</exec>
 			</then>
 			<elseif>
@@ -2683,7 +2683,7 @@ and put it in ${app.server.parent.dir}. Then rerun this task.
 
 					<exec dir="${app.server.websphere.dir}/bin" executable="cmd.exe">
 						<arg value="/c" />
-						<arg value="managesdk.bat -enableProfileAll -sdkName 1.7.1_64 -enableServers" />
+						<arg value="managesdk.bat -enableProfileAll -sdkName 1.8_64 -enableServers" />
 					</exec>
 				</then>
 			</elseif>