Author: olamy
Date: Wed Jan 8 22:20:16 2014
New Revision: 1556661
URL: http://svn.apache.org/r1556661
Log:
last tomcat version 7.0.50
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1556661&r1=1556660&r2=1556661&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Wed Jan 8 22:20:16 2014
@@ -387,6 +387,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1556661&r1=1556660&r2=1556661&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Wed
Jan 8 22:20:16 2014
@@ -370,28 +370,29 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat7Version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
- <version>${tomcat7Version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat7Version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat7Version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert-core</artifactId>
<scope>test</scope>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1556661&r1=1556660&r2=1556661&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Jan 8 22:20:16 2014
@@ -102,7 +102,7 @@
<plexus-expression-evaluator.version>2.0</plexus-expression-evaluator.version>
<plexus-utils.version>3.0.15</plexus-utils.version>
<asfTomcatMavenPluginVersion>2.2</asfTomcatMavenPluginVersion>
- <tomcat7Version>7.0.47</tomcat7Version>
+ <tomcat7Version>7.0.50</tomcat7Version>
<release.preparationGoals>clean install</release.preparationGoals>
</properties>
@@ -134,6 +134,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat7Version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>${tomcat7Version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>${tomcat7Version}</version>
