Merge branch 'master' into 'master'

fixed shared db altering issue

See merge request entgra/community-product!4

iot-core/pom.xml

@@ -33,8 +33,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.h2database.wso2</groupId>
-            <artifactId>h2-database-engine</artifactId>
+            <groupId>org.wso2.orbit.com.h2database</groupId>
+            <artifactId>h2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -117,19 +117,18 @@
                         </goals>
                         <configuration>
                             <target>
-                                <delete file="${basedir}/target/${wso2am}/repository/database/WSO2SHARED_DB.mv.db"/>
                                 <echo message="########### Create Device Management H2 Schema ###########" />
                                 <property name="db.dir" value="target/${wso2am}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=FALSE" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2SHARED_DB;DB_CLOSE_ON_EXIT=TRUE;LOCK_TIMEOUT=60000" />
 
-                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" onerror="continue">
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
                                     <classpath refid="maven.dependency.classpath" />
                                     <classpath refid="maven.compile.classpath" />
                                     <classpath refid="maven.runtime.classpath" />
 
-                                    <fileset file="${basedir}/target/${wso2am}/dbscripts/h2.sql" />
+                                    <fileset file="${basedir}/src/core/scripts/alter-h2-db.sql" />
                                 </sql>
                                 <echo message="##################### END ####################" />
                             </target>

iot-core/src/core/scripts/alter-h2-db.sql

@@ -0,0 +1 @@
+ALTER TABLE REG_PROPERTY ALTER COLUMN REG_VALUE VARCHAR(10000);

pom.xml

@@ -91,8 +91,8 @@
 
             <!--Orbit dependencies-->
             <dependency>
-                <groupId>com.h2database.wso2</groupId>
-                <artifactId>h2-database-engine</artifactId>
+                <groupId>org.wso2.orbit.com.h2database</groupId>
+                <artifactId>h2</artifactId>
                 <version>${orbit.h2.engine.version}</version>
             </dependency>
 
@@ -119,7 +119,7 @@
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!--Orbit versions-->
-        <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
+        <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
 
         <carbon.device.mgt.plugin.version>6.0.0-SNAPSHOT</carbon.device.mgt.plugin.version>