diff options
| author | Brett Porter <brett@apache.org> | 2006-09-20 13:33:10 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2006-09-20 13:33:10 +0000 |
| commit | bff86a70886a2e828bbce57bb09d0c50447fd673 (patch) | |
| tree | f588eda088f266294e5b86a0521dea9919e7ef5d /archiva-webapp | |
| parent | 3a9ddca3d70e3af53b16f3a9f793f6fafd68eb16 (diff) | |
| download | archiva-bff86a70886a2e828bbce57bb09d0c50447fd673.tar.gz archiva-bff86a70886a2e828bbce57bb09d0c50447fd673.zip | |
upgrade derby
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@448201 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-webapp')
| -rw-r--r-- | archiva-webapp/pom.xml | 2 | ||||
| -rw-r--r-- | archiva-webapp/src/jetty-env.xml | 2 | ||||
| -rw-r--r-- | archiva-webapp/src/main/resources/META-INF/plexus/application.xml | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml index 515df07eb..85568741b 100644 --- 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 91e2f9a17..09d573d9f 100644 --- 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 ad2f05403..263f0dc9a 100644 --- 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> |