Strabon

diff pom.xml @ 127:4fc7c28159aa

merge
author Kostis Kyzirakos <kkyzir@di.uoa.gr>
date Fri May 04 14:08:23 2012 +0300 (2012-05-04)
parents fe416921b9ac 719afbe293ba
children 6945f58b1619
line diff
     1.1 --- a/pom.xml	Fri Apr 20 15:01:47 2012 +0300
     1.2 +++ b/pom.xml	Fri May 04 14:08:23 2012 +0300
     1.3 @@ -487,13 +487,11 @@
     1.4  				</plugin>
     1.5  				
     1.6  				<!-- The following plugin is for being able to run tomcat6/7:run -->
     1.7 -				<!--
     1.8  				<plugin>
     1.9  					<groupId>org.apache.tomcat.maven</groupId>
    1.10  					<artifactId>tomcat7-maven-plugin</artifactId>
    1.11  					<version>2.0-SNAPSHOT</version>
    1.12  				</plugin>
    1.13 -				-->
    1.14  			</plugins>
    1.15  		</pluginManagement>
    1.16  
    1.17 @@ -543,7 +541,6 @@
    1.18  	
    1.19  	<pluginRepositories>
    1.20  		<!-- The following repository is for being able to run tomcat7:run -->
    1.21 -		<!-- 
    1.22  		<pluginRepository>
    1.23  			<id>apache.snapshots</id>
    1.24  			<name>Apache Snapshots</name>
    1.25 @@ -555,7 +552,6 @@
    1.26  				<enabled>true</enabled>
    1.27  			</snapshots>
    1.28  		</pluginRepository>
    1.29 -		-->
    1.30  	</pluginRepositories>
    1.31  
    1.32  	<scm>