Author: brett
Date: Wed Sep 20 06:33:10 2006
New Revision: 448201
URL: http://svn.apache.org/viewvc?view=rev&rev=448201
Log:
upgrade derby
Modified:
maven/archiva/trunk/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Modified: maven/archiva/trunk/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/pom.xml?view=diff&rev=448201&r1=448200&r2=448201
==============================================================================
--- maven/archiva/trunk/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-webapp/pom.xml Wed Sep 20 06:33:10 2006
@@ -201,7 +201,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.2.1</version>
+ <version>10.1.3.1</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
Modified: maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/jetty-env.xml?view=diff&rev=448201&r1=448200&r2=448201
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/jetty-env.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/jetty-env.xml Wed Sep 20 06:33:10
2006
@@ -8,6 +8,7 @@
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
<Set name="DatabaseName">target/database</Set>
+ <Set name="user">sa</Set>
<Set name="createDatabase">create</Set>
</New>
</Arg>
@@ -17,6 +18,7 @@
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
<Set name="DatabaseName">target/database</Set>
+ <Set name="user">sa</Set>
<Set name="shutdownDatabase">shutdown</Set>
</New>
</Arg>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=448201&r1=448200&r2=448201
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Wed Sep 20 06:33:10 2006
@@ -177,15 +177,11 @@
<value>true</value>
</property>
<property>
- <name>org.jpox.autoStartMechanism</name>
- <value>SchemaTable</value>
- </property>
- <property>
- <name>org.jpox.autoStartMechanismMode</name>
- <value>Ignored</value>
+ <name>org.jpox.validateTables</name>
+ <value>false</value>
</property>
<property>
- <name>org.jpox.validateTables</name>
+ <name>org.jpox.validateColumns</name>
<value>false</value>
</property>
<property>
