svn commit: r1842735 - in /turbine/fulcrum/trunk/security/torque: pom.xml schema/fulcrum-turbine-default-schema.xml schema/fulcrum-turbine-schema.xml src/test/fulcrum-turbine-default-schema.sql src/test/fulcrum-turbine-schema.sql

Wed, 03 Oct 2018 09:05:49 -0700 

Author: painter
Date: Wed Oct  3 16:05:28 2018
New Revision: 1842735

URL: http://svn.apache.org/viewvc?rev=1842735&view=rev
Log:
Use fulcrum yaafi, update hsqldb, VARBINARY requires size in later versions

Modified:
    turbine/fulcrum/trunk/security/torque/pom.xml
    
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
    turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
    
turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql
    turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql

Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1842735&r1=1842734&r2=1842735&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Wed Oct  3 16:05:28 2018
@@ -66,22 +66,23 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
-      <scope>test</scope>
-    </dependency>
+       <dependency>
+           <groupId>org.hsqldb</groupId>
+           <artifactId>hsqldb</artifactId>
+           <version>1.8.0.10</version>
+           <scope>test</scope>
+       </dependency>
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-testcontainer</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.turbine</groupId>
-      <artifactId>fulcrum-yaafi</artifactId>
-      <scope>test</scope>
-    </dependency>
+    <dependency>
+      <groupId>org.apache.fulcrum</groupId>
+      <artifactId>fulcrum-yaafi</artifactId>
+      <version>1.0.8-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>

Modified: 
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml?rev=1842735&r1=1842734&r2=1842735&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml 
(original)
+++ 
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml 
Wed Oct  3 16:05:28 2018
@@ -78,7 +78,7 @@
     <column name="FIRST_NAME" size="64" type="VARCHAR" javaName="FirstName"/>
     <column name="LAST_NAME" size="64" type="VARCHAR" javaName="LastName"/>
     <column name="EMAIL" size="64" type="VARCHAR" javaName="Email"/>
-    <column name="OBJECTDATA" type="VARBINARY" javaName="Objectdata"/>
+    <column name="OBJECTDATA" size="800" type="VARBINARY" 
javaName="Objectdata"/>
     <unique>
         <unique-column name="LOGIN_NAME"/>
     </unique>

Modified: 
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml?rev=1842735&r1=1842734&r2=1842735&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml 
(original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Wed 
Oct  3 16:05:28 2018
@@ -78,7 +78,7 @@
     <column name="FIRST_NAME" size="64" type="VARCHAR" javaName="FirstName"/>
     <column name="LAST_NAME" size="64" type="VARCHAR" javaName="LastName"/>
     <column name="EMAIL" size="64" type="VARCHAR" javaName="Email"/>
-    <column name="OBJECTDATA" type="VARBINARY" javaName="Objectdata"/>
+    <column name="OBJECTDATA" size="800" type="VARBINARY" 
javaName="Objectdata"/>
     <unique>
         <unique-column name="LOGIN_NAME"/>
     </unique>

Modified: 
turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql?rev=1842735&r1=1842734&r2=1842735&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql
 (original)
+++ 
turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-default-schema.sql
 Wed Oct  3 16:05:28 2018
@@ -70,7 +70,7 @@ CREATE TABLE TURBINE_USER
     FIRST_NAME VARCHAR(64),
     LAST_NAME VARCHAR(64),
     EMAIL VARCHAR(64),
-    OBJECTDATA VARBINARY,
+    OBJECTDATA VARBINARY(800),
     PRIMARY KEY(USER_ID),
     UNIQUE (LOGIN_NAME)
 );

Modified: 
turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql?rev=1842735&r1=1842734&r2=1842735&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql 
(original)
+++ turbine/fulcrum/trunk/security/torque/src/test/fulcrum-turbine-schema.sql 
Wed Oct  3 16:05:28 2018
@@ -70,7 +70,7 @@ CREATE TABLE FULCRUM_TURBINE_USER
     FIRST_NAME VARCHAR(64),
     LAST_NAME VARCHAR(64),
     EMAIL VARCHAR(64),
-    OBJECTDATA VARBINARY,
+    OBJECTDATA VARBINARY(800),
     PRIMARY KEY(USER_ID),
     UNIQUE (LOGIN_NAME)
 );

Reply via email to