upgrade derby

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@448201 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 515df07ebc5a25a75f6fdc6a903256751ae89de9..85568741b35e10090499804f08ad8ff381461c76 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -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>

diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-webapp/src/jetty-env.xml
index 91e2f9a17ba5376190c8251810b3169bbaa4f1b5..09d573d9f6a856bf473426628f56f76e2fa5ada9 100644 (file)
--- a/archiva-webapp/src/jetty-env.xml
+++ b/archiva-webapp/src/jetty-env.xml
@@ -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>

diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index ad2f054037840884e55cc6cd67c2cdcd1b4f04ad..263f0dc9a2b813cbfd5d03fdfce1767b8b05c44b 100644 (file)
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -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>