Revision: 15473
Author: [email protected]
Date: Wed Nov 24 14:44:29 2010
Log: Update issue 2149
http://code.google.com/p/mobicents/source/detail?r=15473
Modified:
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/applications/pom.xml
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/pom.xml
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/applications/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/applications/pom.xml
Wed Nov 24 14:44:29 2010
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>annotations-api</artifactId>
+ <artifactId>tomcat-annotations-api</artifactId>
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
@@ -137,8 +137,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/pom.xml
Tue Oct 26 11:50:40 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/pom.xml
Wed Nov 24 14:44:29 2010
@@ -33,23 +33,23 @@
</dependency>
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-tomcat-jboss4</artifactId>
+ <artifactId>sip-servlets-tomcat-7</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<!-- j2ee dependencies -->
- <dependency>
+<!-- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
- </dependency>
+ </dependency> -->
<!-- j2ee dependencies -->
- <dependency>
+<!-- <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency>-->
<!-- logging dependency -->
<dependency>
@@ -117,24 +117,47 @@
<!-- Tomcat dependencies -->
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
+ <artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
+ <artifactId>tomcat-coyote</artifactId>
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>tomcat-jasper</artifactId>
<version>${tomcat.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <!-- org.eclipse.jdt not available on Maven Repos -->
+ <!-- see also: http://www.copperykeenclaws.com/embedding-tomcat-7/
-->
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>ecj</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Replace org.eclipse.jdt:ecj:jar:3.6 dependency which comes with
tomcat-jasper -->
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.5.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>comp.java.cafesip</groupId>
@@ -190,8 +213,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>