updated CUBA to 6.5.5

mariodavid · Jun 28, 2017 · 13afff9 · 13afff9
1 parent 6220356
commit 13afff9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 
 buildscript {
-    ext.cubaVersion = '6.4.2'
+    ext.cubaVersion = '6.5.5'
     repositories {
         maven {
             url 'https://repo.cuba-platform.com/content/groups/work'
@@ -14,8 +14,6 @@ buildscript {
     dependencies {
         classpath "com.haulmont.gradle:cuba-plugin:$cubaVersion"
 
-        classpath "com.haulmont.cuba:cuba-global:$cubaVersion"
-
 
         classpath 'net.saliman:gradle-cobertura-plugin:2.3.2'
     }
@@ -46,6 +44,11 @@ cuba {
     }
 }
 
+dependencies {
+    appComponent("com.haulmont.cuba:cuba-global:$cubaVersion")
+}
+
+
 def hsql = 'org.hsqldb:hsqldb:2.2.9'
 
 allprojects {

diff --git a/...e/src/de/diedavids/cuba/runtimediagnose/diagnose/DiagnoseFileValidationServiceBean.groovy b/...e/src/de/diedavids/cuba/runtimediagnose/diagnose/DiagnoseFileValidationServiceBean.groovy
@@ -35,7 +35,7 @@ class DiagnoseFileValidationServiceBean implements DiagnoseFileValidationService
         }
         else {
             diagnoseFileValidation.type = DiagnoseWizardResultType.WARNING
-            diagnoseFileValidation.message = "Application wrong ($expectedAppName)"
+            diagnoseFileValidation.message = "Application wrong ($manifestAppName)"
         }
         diagnoseFileValidation
     }

diff --git a/modules/web/src/de/diedavids/cuba/runtimediagnose/web-spring.xml b/modules/web/src/de/diedavids/cuba/runtimediagnose/web-spring.xml
@@ -6,8 +6,8 @@
     <!-- Annotation-based beans -->
     <context:component-scan base-package="de.diedavids.cuba.runtimediagnose"/>
     <bean class="com.haulmont.cuba.web.sys.remoting.WebRemoteProxyBeanCreator">
-        <property name="clusterInvocationSupport"
-                  ref="cuba_clusterInvocationSupport"/>
+        <property name="serverSelector"
+                  ref="cuba_ServerSelector"/>
         <property name="remoteServices">
             <map>
                 <entry key="ddcrd_SqlConsoleService"