Strabon

diff pom.xml @ 121:036ab5c5d2c0

"merge"
author Konstantina Mpereta <grad1110@di.uoa.gr>
date Thu Apr 19 14:18:00 2012 +0300 (2012-04-19)
parents b2667f7bc051 54b1e8b253b3
children fe416921b9ac
line diff
     1.1 --- a/pom.xml	Thu Apr 19 14:04:35 2012 +0300
     1.2 +++ b/pom.xml	Thu Apr 19 14:18:00 2012 +0300
     1.3 @@ -1,11 +1,10 @@
     1.4 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     1.5 -	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     1.6 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     1.7  
     1.8  	<modelVersion>4.0.0</modelVersion>
     1.9  
    1.10  	<groupId>eu.earthobservatory</groupId>
    1.11  	<artifactId>strabon</artifactId>
    1.12 -	<version>3.1.8-SNAPSHOT</version>
    1.13 +	<version>3.1.9-SNAPSHOT</version>
    1.14  	<packaging>pom</packaging>
    1.15  
    1.16  	<parent>
    1.17 @@ -30,7 +29,7 @@
    1.18  	</modules>
    1.19  
    1.20  	<properties>
    1.21 -                <eu.earthobservatory.version>${project.version}</eu.earthobservatory.version>
    1.22 +                <eu.earthobservatory.version>3.1.9-SNAPSHOT</eu.earthobservatory.version>
    1.23  		<sesame.version>2.6.3</sesame.version>
    1.24  		<aduna.appbase.version>3.5.0</aduna.appbase.version>
    1.25  		<slf4j.version>1.6.1</slf4j.version>
    1.26 @@ -473,6 +472,15 @@
    1.27  					<artifactId>maven-assembly-plugin</artifactId>
    1.28  					<version>2.3</version>
    1.29  				</plugin>
    1.30 +				
    1.31 +				<!-- The following plugin is for being able to run tomcat6/7:run -->
    1.32 +				<!--
    1.33 +				<plugin>
    1.34 +					<groupId>org.apache.tomcat.maven</groupId>
    1.35 +					<artifactId>tomcat7-maven-plugin</artifactId>
    1.36 +					<version>2.0-SNAPSHOT</version>
    1.37 +				</plugin>
    1.38 +				-->
    1.39  			</plugins>
    1.40  		</pluginManagement>
    1.41  
    1.42 @@ -519,6 +527,23 @@
    1.43  
    1.44  	<!-- <pluginRepositories> <pluginRepository> <id>elca-services</id> <url>http://el4.elca-services.ch/el4j/maven2repository</url> 
    1.45  		<releases> <enabled>true</enabled> </releases> </pluginRepository> </pluginRepositories> -->
    1.46 +	
    1.47 +	<pluginRepositories>
    1.48 +		<!-- The following repository is for being able to run tomcat7:run -->
    1.49 +		<!-- 
    1.50 +		<pluginRepository>
    1.51 +			<id>apache.snapshots</id>
    1.52 +			<name>Apache Snapshots</name>
    1.53 +			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
    1.54 +			<releases>
    1.55 +				<enabled>false</enabled>
    1.56 +			</releases>
    1.57 +			<snapshots>
    1.58 +				<enabled>true</enabled>
    1.59 +			</snapshots>
    1.60 +		</pluginRepository>
    1.61 +		-->
    1.62 +	</pluginRepositories>
    1.63  
    1.64  	<scm>
    1.65  		<connection>scm:hg:ssh://hg.strabon.di.uoa.gr//opt/hg/Strabon/</connection>