Merge pull request #66 from ozoneplatform/java-8

Upgrading to Grails 2.4.2

.travis.yml

@@ -1,10 +1,10 @@
 language: groovy
 
 jdk:
-- oraclejdk8
+  - oraclejdk8
 
 env:
-  - GRAILS_VERSION=2.4.0
+  - GRAILS_VERSION=2.4.2
 
 before_install:
 - rm -rf ~/.sdkman

application.properties

@@ -1,12 +1,12 @@
 #Grails Metadata file
-#Mon Aug 24 13:18:39 PDT 2015
+#Wed Nov 04 14:34:48 EST 2015
 app.base.majorVersion=7
 app.base.prefix=OWF
 app.base.prevMajorVersion=7
 app.base.prevVersion=7.16.1
 app.base.sprint=
 app.base.version=7.17.0
-app.grails.version=2.4.0
+app.grails.version=2.4.2
 app.name=owf-server
 app.notice=${app.notice.ga}
 app.notice.alpha=This is an Alpha version and has not been fully tested. Any data entered into this system may be lost. An upgrade to the final release will not be provided. To report any bugs, please send an email to [email protected].

build.xml

@@ -227,10 +227,10 @@
         <mkdir dir="${staging.dir}/${owf.security.module}" />
         <mkdir dir="${staging.dir}/etc/tools" />
 
-        <ant antfile="build.xml" dir="${basedir}/tools/TestDbConversion"/>
+<!--         <ant antfile="build.xml" dir="${basedir}/tools/TestDbConversion"/>
         <zip destfile="${basedir}/tools/dbvalidation.zip" >
             <zipfileset dir="${basedir}/tools/TestDbConversion/target" includes="**/*" filemode="744" />
-        </zip>
+        </zip> -->
 
         <copy todir="${staging.dir}/etc/tools" includeEmptyDirs="false">
             <fileset dir="tools">

grails-app/conf/BuildConfig.groovy

@@ -164,7 +164,7 @@ grails.project.dependency.resolution = {
     }
     plugins {
         compile ':database-migration:1.4.0'
-        compile ':hibernate:3.6.10.12'
+        compile ':hibernate:3.6.10.14'
         compile 'org.ozoneplatform:ozone-appconfig:0.9'
         compile 'org.ozoneplatform:ozone-auditing:1.2.1'
         compile 'org.ozoneplatform:ozone-messaging:1.19'

grails-app/migrations/changelog.groovy

@@ -5,7 +5,7 @@ import grails.util.Holders as CH
 databaseChangeLog = {
 
     //versions for which there are DB changes
-    def versions = ['3.7.0', '3.8.0', '4.0.0', '5.0.0', '6.0.0', '7.0.0', '7.2.0', '7.3.0', '7.10.0', '7.15.1', '7.16.0']
+    def versions = ['3.7.0', '3.8.0', '4.0.0', '5.0.0', '6.0.0', '7.0.0', '7.2.0', '7.3.0', '7.10.0', '7.15.1', '7.16.0', '7.16.1']
 
     // On MS SQL Server, we use numeric(19, 0) for the person id, but we use bigint everywhere else. Use this property like:
     // 	    column(name: "edited_by_id", type: '${owf.personIdType}')

grails-app/migrations/changelog_4.0.0.groovy

@@ -199,7 +199,8 @@ databaseChangeLog = {
   changeSet(author: "owf", id: "4.0.0-5", dbms: "postgresql", context: "sampleData, 4.0.0-sampleData") {
       comment(text="deleting old sample data")
 
-      delete(tableName: "role_people")
+      // DEPRECATED delete as of 7.16.1 where role_people table is removed.
+      // delete(tableName: "role_people")
       delete(tableName: "role")
       delete(tableName: "requestmap")
       delete(tableName: "preference")
@@ -220,7 +221,8 @@ databaseChangeLog = {
     changeSet(author: "owf", id: "4.0.0-5", dbms: "h2,mysql,mssql,oracle", context: "sampleData, 4.0.0-sampleData") {
       comment(text="deleting old sample data")
 
-      delete(tableName: "role_people")
+      // DEPRECATED delete as of 7.16.1 where role_people table is removed.
+      // delete(tableName: "role_people")
       delete(tableName: "role")
       delete(tableName: "requestmap")
       delete(tableName: "preference")
@@ -241,7 +243,8 @@ databaseChangeLog = {
   changeSet(author: "owf", id: "4.0.0-5", dbms: "hsqldb", context: "sampleData, 4.0.0-sampleData") {
       comment(text="deleting old sample data")
 
-      delete(tableName: "role_people")
+      // DEPRECATED delete as of 7.16.1 where role_people table is removed.
+      // delete(tableName: "role_people")
       //for some reason hsqldb will fail if the role table is not all caps
       delete(tableName: "ROLE")
       delete(tableName: "requestmap")
@@ -3059,32 +3062,29 @@ databaseChangeLog = {
 //      SET IDENTITY_INSERT [dbo].[role_people] ON
 //    """)
 //  }
-  changeSet(author: "owf", id: "4.0.0-31", context: "sampleData, 4.0.0-sampleData") {
-      comment(text="insert new sample data")
-    insert(tableName: "role_people") {
-        column(name: "role_id", valueNumeric: "26")
-
-        column(name: "person_id", valueNumeric: "2")
-    }
-
-    insert(tableName: "role_people") {
-        column(name: "role_id", valueNumeric: "26")
-
-        column(name: "person_id", valueNumeric: "3")
-    }
-
-    insert(tableName: "role_people") {
-        column(name: "role_id", valueNumeric: "26")
-
-        column(name: "person_id", valueNumeric: "28")
-    }
 
-    insert(tableName: "role_people") {
-        column(name: "role_id", valueNumeric: "27")
+// DEPRECATED changeset don't use reuse this exact id,contect,dbms combo again
+//  changeSet(author: "owf", id: "4.0.0-31", context: "sampleData, 4.0.0-sampleData") {
+//      comment(text="insert new sample data")
+//    insert(tableName: "role_people") {
+//        column(name: "role_id", valueNumeric: "26")
+//
+//        column(name: "person_id", valueNumeric: "2")
+//    }
+//    insert(tableName: "role_people") {
+//        column(name: "role_id", valueNumeric: "26")
+//        column(name: "person_id", valueNumeric: "3")
+//    }
+//    insert(tableName: "role_people") {
+//        column(name: "role_id", valueNumeric: "26")
+//        column(name: "person_id", valueNumeric: "28")
+//    }
+//    insert(tableName: "role_people") {
+//        column(name: "role_id", valueNumeric: "27")
+//        column(name: "person_id", valueNumeric: "1")
+//    }
+//  }
 
-        column(name: "person_id", valueNumeric: "1")
-    }
-  }
 // DEPRECATED changeset don't use reuse this exact id,context,dbms combo again
 // changeSet(author: "owf", id: "4.0.0-32", dbms:"mssql", context: "sampleData, 4.0.0-sampleData") {
 //      comment(text="allow identity inserts")

grails-app/migrations/changelog_7.16.1.groovy

@@ -6,7 +6,7 @@ databaseChangeLog = {
         """)
     }
 
-    changeSet(author: 'owf', id: '7.16.1-1', dbms: 'mysql, hsqldb, oracle, mssql, postgresql', context: 'create, upgrade, 7.16.1') {
+    changeSet(author: 'owf', id: '7.16.1-1', dbms: 'mysql, oracle, mssql, postgresql', context: 'create, upgrade, 7.16.1') {
         insert(tableName: "role") {
             column(name: "authority", value: "ROLE_USER")
             column(name: "description", value: "User Role")
@@ -22,11 +22,20 @@ databaseChangeLog = {
         }
     }
 
-    changeSet(author: "owf", id: "7.16.1-2", dbms:"mssql", context: "create, upgrade, 7.16.1") {
-        comment(text="allow role inserts")
-        sql ( text = """
-            SET IDENTITY_INSERT [dbo].[role] OFF
-        """)
+    changeSet(author: 'owf', id: '7.16.1-1', dbms: 'hsqldb', context: 'create, upgrade, 7.16.1') {
+        insert(tableName: "ROLE") {
+            column(name: "authority", value: "ROLE_USER")
+            column(name: "description", value: "User Role")
+            column(name: "id", value: "26")
+            column(name: "version", value: "2")
+        }
+
+        insert(tableName: "ROLE") {
+            column(name: "authority", value: "ROLE_ADMIN")
+            column(name: "description", value: "Admin Role")
+            column(name: "id", value: "27")
+            column(name: "version", value: "1")
+        }
     }
 
     changeSet(author: 'owf', id: "7.16.1-2", context: "create, 7.16.1", dbms: 'postgresql') {

grails-app/migrations/changelog_7.17.0.groovy

@@ -0,0 +1,23 @@
+databaseChangeLog = {
+
+  changeSet(author: "owf", id: "7.17.0-1", context: "sampleData, 7.17.0-sampleData") {
+      comment(text="insert new sample data")
+    insert(tableName: "person_role") {
+        column(name: "role_id", valueNumeric: "26")
+        column(name: "person_authorities_id", valueNumeric: "2")
+    }
+    insert(tableName: "person_role") {
+        column(name: "role_id", valueNumeric: "26")
+        column(name: "person_authorities_id", valueNumeric: "3")
+    }
+    insert(tableName: "person_role") {
+        column(name: "role_id", valueNumeric: "26")
+        column(name: "person_authorities_id", valueNumeric: "28")
+    }
+    insert(tableName: "person_role") {
+        column(name: "role_id", valueNumeric: "27")
+        column(name: "person_authorities_id", valueNumeric: "1")
+    }
+  }
+
+}