You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/22 04:38:58 UTC
svn commit: r1544405 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-policies/
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/
archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-...
Author: olamy
Date: Fri Nov 22 03:38:58 2013
New Revision: 1544405
URL: http://svn.apache.org/r1544405
Log:
use last ehcache 2.7.4
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=1544405&r1=1544404&r2=1544405&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml Fri Nov 22 03:38:58 2013
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1544405&r1=1544404&r2=1544405&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml Fri Nov 22 03:38:58 2013
@@ -50,7 +50,6 @@
<jaxrs:providers>
<ref bean="jsonProvider"/>
-
<ref bean="authenticationInterceptor#rest"/>
<ref bean="permissionInterceptor#rest"/>
<ref bean="archivaRestServiceExceptionMapper"/>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1544405&r1=1544404&r2=1544405&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Fri Nov 22 03:38:58 2013
@@ -663,7 +663,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
+ <artifactId>ehcache</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1544405&r1=1544404&r2=1544405&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Fri Nov 22 03:38:58 2013
@@ -303,4 +303,17 @@
-->
<!-- END SNIPPET: jcr-location -->
+ <!--
+
+ <bean class="org.apache.sirona.spring.BeanNameMonitoringAutoProxyCreator">
+ <property name="beanNames">
+ <list>
+ <value>Default**</value>
+ <value>**#rest</value>
+ <value>**#default</value>
+ </list>
+ </property>
+ </bean>
+ -->
+
</beans>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1544405&r1=1544404&r2=1544405&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Nov 22 03:38:58 2013
@@ -68,7 +68,7 @@
<maven.indexer.version>5.1.1</maven.indexer.version>
<wagon.version>2.5</wagon.version>
<redback.version>2.2-SNAPSHOT</redback.version>
- <redback.cache.version>2.1</redback.cache.version>
+ <redback.cache.version>2.2-SNAPSHOT</redback.cache.version>
<redback.quartz.version>2.0</redback.quartz.version>
<redback.registry.version>2.1</redback.registry.version>
<redback.spring-utils.version>2.0</redback.spring-utils.version>
@@ -1498,8 +1498,8 @@
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.6.6</version>
+ <artifactId>ehcache</artifactId>
+ <version>2.7.4</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -1601,7 +1601,7 @@
<exclude>com.google.code.atinject:atinject</exclude>
<exclude>org.codehaus.plexus.cache:plexus-cache-api</exclude>
<exclude>org.codehaus.plexus.cache:plexus-cache-ehcache</exclude>
- <exclude>net.sf.ehcache:ehcache</exclude>
+ <exclude>net.sf.ehcache:ehcache-core</exclude>
<exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude>
<exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude>
<exclude>org.codehaus.plexus:plexus-taskqueue</exclude>