Merge pull request #15 from c0c0n3/omero-5.4-upgrade

Merge v1.2.0 functionality into master.

build.gradle

@@ -1,6 +1,6 @@
 allprojects {
     group = 'ome'
-    version = '1.1.0'
+    version = '1.2.0'
 
     repositories {
         mavenLocal()

components/cli/cli.gradle

@@ -14,14 +14,14 @@ repositories {
 }
 
 dependencies {
-    compile(group: 'ome', name: 'formats-gpl', version: '5.5.0'){
+    compile(group: 'ome', name: 'formats-gpl', version: '5.7.1'){
     }
-    compile(group: 'ome', name: 'formats-bsd', version: '5.5.0'){
+    compile(group: 'ome', name: 'formats-bsd', version: '5.7.1'){
     }
     compile(group: 'org.springframework.ldap', name: 'spring-ldap', version: '1.3.0.RELEASE', classifier: 'all'){
         exclude group: 'org.testng', module: 'testng'
     }
-    compile(group: 'omero', name: 'blitz', version: '5.3.2-ice36-b62') {
+    compile(group: 'omero', name: 'blitz', version: '5.4.0-ice36-b74') {
         exclude group: 'org.springframework.ldap', module: 'spring-ldap'
         exclude group: 'org.testng', module: 'testng'
         exclude group: 'hsqldb', module: 'hsqldb'

components/packager/packager.gradle

@@ -4,7 +4,7 @@ ext.dirs = new BuildDir(buildDir)
 ext.bundle = new ReleaseBundle(dirs, new ReleaseInfo(
                                 [ baseName:   'ome-smuggler'
                                 , version:    version
-                                , classifier: 'beta' // or '' when appropriate
+                                , classifier: '' // or 'beta' when appropriate
                                 ]))
 
 def serverJarFile() { toFile(project(':server').jar) }