LRQA-32225 Update tcServer to 3.2.5

liferay · May 26, 2017 · 79334fd · 79334fd
1 parent 35ba04e
commit 79334fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/app.server.properties b/app.server.properties
@@ -151,7 +151,7 @@
 ## tc Server
 ##
 
-    app.server.tcserver.version=3.1.2
+    app.server.tcserver.version=3.2.5
     app.server.tcserver.dir=${app.server.parent.dir}/tc-server-${app.server.tcserver.version}
     app.server.tcserver.bin.dir=${app.server.tcserver.dir}/liferay/bin
     app.server.tcserver.classes.global.dir=${app.server.tcserver.dir}/liferay/lib
@@ -165,10 +165,10 @@
     app.server.tcserver.portal.context=ROOT
     app.server.tcserver.portal.dir=${app.server.tcserver.deploy.dir}/${app.server.tcserver.portal.context}
     app.server.tcserver.temp.dir=${app.server.tcserver.dir}/liferay/temp
-    app.server.tcserver.tomcat.version=8.0.26.B.RELEASE
+    app.server.tcserver.tomcat.version=8.5.13.B.RELEASE
     app.server.tcserver.work.dir=${app.server.tcserver.dir}/liferay/work
     app.server.tcserver.zip.name=pivotal-tc-server-developer-${app.server.tcserver.version}.RELEASE.zip
-    app.server.tcserver.zip.url=http://network.pivotal.io/products/pivotal-tcserver/releases/532/file_groups/317/${app.server.tcserver.zip.name}
+    app.server.tcserver.zip.url=http://network.pivotal.io/products/pivotal-tcserver/releases/4887/file_groups/579/${app.server.tcserver.zip.name}
 
 ##
 ## Tomcat

diff --git a/build-test-batch.xml b/build-test-batch.xml
@@ -1620,7 +1620,7 @@ app.server.type=@{app.server.type}]]></echo>
 		<run-functional-test app.server.type="resin" database.type="mysql" test.portal.log.assert="true" />
 	</target>
 
-	<target name="functional-smoke-tcserver31-mysql56-jdk8">
+	<target name="functional-smoke-tcserver32-mysql56-jdk8">
 		<run-functional-test app.server.type="tcserver" database.type="mysql" test.portal.log.assert="true" />
 	</target>
 
@@ -1688,7 +1688,7 @@ app.server.type=@{app.server.type}]]></echo>
 		<run-functional-test app.server.type="jboss" database.type="mysql" />
 	</target>
 
-	<target name="functional-upgrade-tcserver31-mysql56-jdk8">
+	<target name="functional-upgrade-tcserver32-mysql56-jdk8">
 		<run-functional-test app.server.type="tcserver" database.type="mysql" />
 	</target>
 

diff --git a/test.properties b/test.properties
@@ -582,6 +582,7 @@
     env.option.app.server.tcat70=TCat 7.0
     env.option.app.server.tcserver26=tc Server 2.6
     env.option.app.server.tcserver31=tc Server 3.1
+    env.option.app.server.tcserver32=tc Server 3.2
     env.option.app.server.tomcat60=Tomcat 6.0
     env.option.app.server.tomcat70=Tomcat 7.0
     env.option.app.server.tomcat80=Tomcat 8.0
@@ -1026,7 +1027,7 @@
         compile-jsp-jdk8,\
         functional-smoke-jboss70-mysql56-jdk8,\
         #functional-smoke-resin40-mysql56-jdk8,\
-        functional-smoke-tcserver31-mysql56-jdk8,\
+        functional-smoke-tcserver32-mysql56-jdk8,\
         functional-smoke-tomcat80-db2105-jdk8,\
         functional-smoke-tomcat80-mariadb100-jdk8,\
         functional-smoke-tomcat80-mysql56-jdk8,\
@@ -1040,7 +1041,7 @@
         functional-tomcat80-mysql56-jdk8,\
         functional-tomcat80-mysql56-jdk8-quarantine,\
         functional-upgrade-jboss70-mysql56-jdk8,\
-        #functional-upgrade-tcserver31-mysql56-jdk8,\
+        #functional-upgrade-tcserver32-mysql56-jdk8,\
         functional-upgrade-tomcat80-mariadb100-jdk8,\
         functional-upgrade-tomcat80-mysql56-jdk8,\
         functional-upgrade-tomcat80-oracle121-jdk8,\
@@ -1092,7 +1093,7 @@
 
     test.batch.run.property.query[functional-smoke-jboss70-mysql56-jdk8]=portal.smoke == true
     test.batch.run.property.query[functional-smoke-resin40-mysql56-jdk8]=portal.smoke == true
-    test.batch.run.property.query[functional-smoke-tcserver31-mysql56-jdk8]=portal.smoke == true
+    test.batch.run.property.query[functional-smoke-tcserver32-mysql56-jdk8]=portal.smoke == true
     test.batch.run.property.query[functional-smoke-tomcat80-db2105-jdk8]=portal.smoke == true
     test.batch.run.property.query[functional-smoke-tomcat80-mariadb100-jdk8]=portal.smoke == true
     test.batch.run.property.query[functional-smoke-tomcat80-mysql56-jdk8]=portal.smoke == true
@@ -1112,7 +1113,7 @@
     test.batch.run.property.query[legacy-functional-bundle-tomcat-postgresql94-jdk7]=legacy.database.dump == true
     test.batch.run.property.query[legacy-functional-bundle-tomcat-sybase160-jdk7]=legacy.database.dump == true
     test.batch.run.property.query[functional-upgrade-jboss70-mysql56-jdk8]=portal.upgrades == true
-    #test.batch.run.property.query[functional-upgrade-tcserver31-mysql56-jdk8]=portal.upgrades == true
+    #test.batch.run.property.query[functional-upgrade-tcserver32-mysql56-jdk8]=portal.upgrades == true
     test.batch.run.property.query[functional-upgrade-tomcat80-mariadb100-jdk8]=portal.upgrades == true
     test.batch.run.property.query[functional-upgrade-tomcat80-mysql56-jdk8]=portal.upgrades == true
     test.batch.run.property.query[functional-upgrade-tomcat80-oracle121-jdk8]=portal.upgrades == true