463462 - Bumps version of Gemini Web to 2.2.5.RELEASE (incl. Tomcat 7.0.56 and javax.websocket 1.1.0)
diff --git a/gradle.properties b/gradle.properties
index 3960c6d..e04031d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -134,7 +134,7 @@
geminiBlueprintVersion = 2.0.0.M02
geminiManagementVersion = 1.0.5.RELEASE
-geminiWebVersion = 2.2.2.RELEASE
+geminiWebVersion = 2.2.5.RELEASE
objectwebAsmVersion = 3.2.0.v200909071300
scannotationVersion = 1.0.2.v201205170710
@@ -217,7 +217,8 @@
javaxTransactionVersion = 1.1.1.v201105210645
# CQ6095 Bean Validation API Version: 1.0.0 GA (PB CQ3570)
javaxValidationVersion=1.0.0.GA_v201205091237
-javaxWebsocketVersion=1.0.0.v201312030745
+# Covered by Tomcat CQ
+javaxWebsocketVersion=1.1.0.v201401130840
javaxWsdlVersion=1.6.2.v201012040545
javaxWsRsVersion=1.1.1.v20101004-1200
javaxXmlRpcVersion=1.1.0.v201005080400
@@ -243,14 +244,14 @@
# jettyVersion = 8.1.1.v20120215 // Virgo Jetty Server?
jettyVersion = 8.1.14.v20131031
-# CQ8667 Apache Tomcat Version: 7.0.55 (PB Orbit CQ8537)
-apacheCatalinaVersion = 7.0.55.v201409050650
+# CQ9080 Apache Tomcat Version: 7.0.56 (PB Orbit CQ8933)
+apacheCatalinaVersion = 7.0.56.v201412180755
# TODO replaceWith apacheCatalinaVersion
-apacheCatalinaHaVersion = 7.0.55.v201409050650
+apacheCatalinaHaVersion = 7.0.56.v201412180755
# TODO replaceWith apacheCatalinaVersion
-apacheCatalinaTribesVersion = 7.0.55.v201409050650
+apacheCatalinaTribesVersion = 7.0.56.v201412180755
# TODO replaceWith apacheCatalinaVersion
-apacheJasperVersion = 7.0.55.v201409050650
+apacheJasperVersion = 7.0.56.v201412180755
eclipsejdtCoreCompilerBatchVersion = 3.10.0.v20140604-1726
diff --git a/packaging b/packaging
index 54f67ac..7123db9 160000
--- a/packaging
+++ b/packaging
@@ -1 +1 @@
-Subproject commit 54f67ac1cc8358eac73d7d3e203e0086bc85bdd1
+Subproject commit 7123db9b0f2e4d8b4cbec4d16da3d434dadc81c6
