Revision: 85814cf70725 Author: Jean Deruelle <[email protected]> Date: Wed Aug 1 06:21:28 2012 Log: Fix version issue
http://code.google.com/p/sipservlets/source/detail?r=85814cf70725 Modified: /management/sip-servlets-management/pom.xml ======================================= --- /management/sip-servlets-management/pom.xml Wed Aug 1 05:59:25 2012 +++ /management/sip-servlets-management/pom.xml Wed Aug 1 06:21:28 2012 @@ -4,11 +4,7 @@ <parent> <groupId>org.mobicents.servlet.sip</groupId> <artifactId>sip-servlets-bootstrap</artifactId> -<<<<<<< HEAD <version>6.1.2-TelScale-SNAPSHOT</version> -======= - <version>1.8.0-SNAPSHOT</version> ->>>>>>> issue-136 <relativePath>../../pom.xml</relativePath> </parent> @@ -149,46 +145,31 @@ <dependency> <groupId>org.mobicents.servlet.sip</groupId> <artifactId>sip-servlets-spec</artifactId> -<<<<<<< HEAD <version>6.1.2-TelScale-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mobicents.servlet.sip</groupId> <artifactId>sip-servlets-client</artifactId> -======= ->>>>>>> issue-136 - <version>1.8.0-SNAPSHOT</version> + <version>6.1.2-TelScale-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mobicents.servlet.sip</groupId> <artifactId>sip-servlets-annotations</artifactId> -<<<<<<< HEAD <version>6.1.2-TelScale-SNAPSHOT</version> -======= - <version>1.8.0-SNAPSHOT</version> ->>>>>>> issue-136 <scope>provided</scope> </dependency> <dependency> <groupId>org.mobicents.servlet.sip</groupId> <artifactId>sip-servlets-impl</artifactId> -<<<<<<< HEAD <version>6.1.2-TelScale-SNAPSHOT</version> -======= - <version>1.8.0-SNAPSHOT</version> ->>>>>>> issue-136 <scope>provided</scope> </dependency> <dependency> <groupId>org.mobicents.servlet.sip</groupId> <artifactId>sip-servlets-application-router</artifactId> -<<<<<<< HEAD <version>6.1.2-TelScale-SNAPSHOT</version> -======= - <version>1.8.0-SNAPSHOT</version> ->>>>>>> issue-136 <scope>provided</scope> </dependency> <dependency>
