diff options
author | Olivier Lamy <olamy@apache.org> | 2011-06-28 22:19:30 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2011-06-28 22:19:30 +0000 |
commit | d7f0f916366c1a60b3ea4b2e6392fe3cdd85aa85 (patch) | |
tree | c28fb2ac0dbb07b57b4e9b5bd280a4e6f89683fd /archiva-modules/archiva-web/archiva-webapp/pom.xml | |
parent | a5c5d53fa11f7706ccafec757e386b33c7d3ac99 (diff) | |
download | archiva-d7f0f916366c1a60b3ea4b2e6392fe3cdd85aa85.tar.gz archiva-d7f0f916366c1a60b3ea4b2e6392fe3cdd85aa85.zip |
[MRM-1478] Enable DB caching
Submitted by Maria Catherine Tan
patch applied with modifications
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1140869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp/pom.xml')
-rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index f33940dba..afb20eca4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -358,6 +358,20 @@ <scope>test</scope> <version>${struts.version}</version> </dependency> + <dependency> + <groupId>jpox</groupId> + <artifactId>jpox-ehcache</artifactId> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>ehcache</groupId> + <artifactId>ehcache</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <resources> @@ -399,7 +413,7 @@ <tasks> <mkdir dir="${basedir}/target/archiva/WEB-INF/"/> <copy todir="${basedir}/target/archiva/WEB-INF/"> - <fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml"/> + <fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml,**/ehcache.xml"/> </copy> </tasks> </configuration> @@ -530,25 +544,6 @@ <artifactId>derby</artifactId> <version>10.1.3.1</version> </dependency> - <!-- Enable the following if you want JSP 2.0 or JVM version < 1.5 <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <version>1.0.1</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <type>jar</type> - </dependency> - --> </dependencies> </plugin> <plugin> |