diff options
| author | olivier lamy <olamy@apache.org> | 2017-06-20 21:49:28 +1000 |
|---|---|---|
| committer | olivier lamy <olamy@apache.org> | 2017-06-20 21:49:28 +1000 |
| commit | 8d3f82a479b6eb2bf709b1831351e20309735683 (patch) | |
| tree | 9519d87a2f1b20e5b66c007c6ec710819d7ee969 /archiva-jetty | |
| parent | c6d882dfdc373010380f6aff3c36cc6404b2e942 (diff) | |
| download | archiva-8d3f82a479b6eb2bf709b1831351e20309735683.tar.gz archiva-8d3f82a479b6eb2bf709b1831351e20309735683.zip | |
[MRM-1956] Replace tomcat-jdbc pool with HikariCP
Signed-off-by: olivier lamy <olamy@apache.org>
Diffstat (limited to 'archiva-jetty')
| -rw-r--r-- | archiva-jetty/pom.xml | 16 | ||||
| -rw-r--r-- | archiva-jetty/src/main/conf/jetty.xml | 20 |
2 files changed, 14 insertions, 22 deletions
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index 33b00489c..36b95ae92 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -65,7 +65,11 @@ <version>${jettyVersion}</version> <scope>runtime</scope> </dependency> - + <dependency> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP</artifactId> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -81,16 +85,6 @@ <artifactId>ant</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jdbc</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - <scope>runtime</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml index b7e66d463..31c81822d 100644 --- a/archiva-jetty/src/main/conf/jetty.xml +++ b/archiva-jetty/src/main/conf/jetty.xml @@ -157,31 +157,29 @@ <New id="users" class="org.eclipse.jetty.plus.jndi.Resource"> <Arg>jdbc/users</Arg> <Arg> - <New class="org.apache.tomcat.jdbc.pool.DataSource"> + <New class="com.zaxxer.hikari.HikariDataSource"> <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set> - <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users;create=true</Set> + <Set name="jdbcUrl">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users;create=true</Set> <Set name="username">sa</Set> - <Set name="maxActive">20</Set> - <Set name="removeAbandoned">true</Set> - <Set name="logAbandoned">true</Set> - <Set name="initialSize">5</Set> - <Set name="testOnBorrow">true</Set> + <Set name="maximumPoolSize">20</Set> + <Set name="minimumIdle">5</Set> <!-- very rigourous sql query validation --> - <Set name="validationQuery">select 1</Set> + <!--Set name="connectionTestQuery">select 1</Set--> </New> </Arg> </New> + <!-- <New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource"> <Arg>jdbc/usersShutdown</Arg> <Arg> - <New class="org.apache.tomcat.jdbc.pool.DataSource"> + <New class="com.zaxxer.hikari.HikariDataSource"> <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set> - <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set> + <Set name="jdbcUrl">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set> <Set name="username">sa</Set> </New> </Arg> </New> - + --> </Configure> |