Strabon

changeset 266:8d6b0628e37a

revert endpoint/pom.xml
author George Garbis <ggarbis@di.uoa.gr>
date Fri Jun 08 17:52:30 2012 +0300 (2012-06-08)
parents 05b7ddbd273e
children e9480d82ab2f
files endpoint/pom.xml
line diff
     1.1 --- a/endpoint/pom.xml	Fri Jun 08 15:49:34 2012 +0300
     1.2 +++ b/endpoint/pom.xml	Fri Jun 08 17:52:30 2012 +0300
     1.3 @@ -1,36 +1,32 @@
     1.4  <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/xsd/maven-4.0.0.xsd">
     1.5  	<modelVersion>4.0.0</modelVersion>
     1.6  
     1.7 -	<groupId>eu.earthobservatory</groupId>
     1.8 +	<parent>
     1.9 +		<groupId>eu.earthobservatory</groupId>
    1.10 +		<artifactId>strabon</artifactId>
    1.11 +		<version>3.1.10-SNAPSHOT</version>
    1.12 +	</parent>
    1.13 +
    1.14  	<artifactId>strabon-endpoint</artifactId>
    1.15 -	<version>0.0.11-SNAPSHOT</version>
    1.16  	<packaging>war</packaging>
    1.17  
    1.18 -	<name>strabon-endpoint</name>
    1.19 +	<name>StrabonEndpoint</name>
    1.20 +	<description>An endpoint for Strabon</description>
    1.21  
    1.22  	<properties>
    1.23 -                <eu.earthobservatory.version>3.1.7</eu.earthobservatory.version>
    1.24  		<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
    1.25 -		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    1.26 -		<sesame.version>2.6.3</sesame.version>
    1.27 -		<aduna.appbase.version>3.5.0</aduna.appbase.version>
    1.28 -		<slf4j.version>1.6.1</slf4j.version>
    1.29 -		<spring.version>2.5.6</spring.version>
    1.30 -		<geotools.version>2.6.6</geotools.version>
    1.31  	</properties>
    1.32  
    1.33  	<dependencies>
    1.34  		<dependency>
    1.35  			<groupId>javax</groupId>
    1.36  			<artifactId>javaee-web-api</artifactId>
    1.37 -			<version>6.0</version>
    1.38  			<scope>provided</scope>
    1.39  		</dependency>
    1.40  
    1.41  		<dependency>
    1.42  			<groupId>eu.earthobservatory</groupId>
    1.43  			<artifactId>strabon-runtime</artifactId>
    1.44 -			<version>${eu.earthobservatory.version}</version>
    1.45  			<type>jar</type>
    1.46  			<scope>compile</scope>
    1.47  		</dependency>
    1.48 @@ -39,31 +35,26 @@
    1.49  		<dependency>
    1.50  			<groupId>org.geotools.xsd</groupId>
    1.51  			<artifactId>gt-xsd-kml</artifactId>
    1.52 -			<version>${geotools.version}</version>
    1.53  		</dependency>
    1.54  
    1.55  		<dependency>
    1.56  			<groupId>org.geotools</groupId>
    1.57  			<artifactId>gt-xml</artifactId>
    1.58 -			<version>${geotools.version}</version>
    1.59  		</dependency>
    1.60  
    1.61  		<dependency>
    1.62  			<groupId>org.geotools</groupId>
    1.63  			<artifactId>gt-epsg-hsql</artifactId>
    1.64 -			<version>${geotools.version}</version>
    1.65  		</dependency>
    1.66  		<dependency>
    1.67  			<groupId>org.geotools</groupId>
    1.68  			<artifactId>gt-shapefile</artifactId>
    1.69 -			<version>${geotools.version}</version>
    1.70  		</dependency>
    1.71  
    1.72  		<!-- Testing: JUnit -->
    1.73  		<dependency>
    1.74  			<groupId>junit</groupId>
    1.75  			<artifactId>junit</artifactId>
    1.76 -			<version>4.7</version>
    1.77  			<scope>test</scope>
    1.78  		</dependency>
    1.79  
    1.80 @@ -72,14 +63,12 @@
    1.81  		<dependency>
    1.82  			<groupId>postgresql</groupId>
    1.83  			<artifactId>postgresql</artifactId>
    1.84 -			<version>9.0-801.jdbc3</version>
    1.85  		</dependency>
    1.86  
    1.87  		<!-- Spring framework -->
    1.88  		<dependency>
    1.89  			<groupId>org.springframework</groupId>
    1.90  			<artifactId>spring-webmvc</artifactId>
    1.91 -			<version>2.5.1</version>
    1.92  			<exclusions>
    1.93  				<exclusion>
    1.94  					<groupId>commons-logging</groupId>
    1.95 @@ -90,7 +79,6 @@
    1.96  		<dependency>
    1.97  			<groupId>org.springframework</groupId>
    1.98  			<artifactId>spring-aop</artifactId>
    1.99 -			<version>2.5.1</version>
   1.100  			<exclusions>
   1.101  				<exclusion>
   1.102  					<groupId>commons-logging</groupId>
   1.103 @@ -98,32 +86,28 @@
   1.104  				</exclusion>
   1.105  			</exclusions>
   1.106  		</dependency>
   1.107 -		
   1.108 +
   1.109  		<dependency>
   1.110 -				<groupId>org.apache.cxf</groupId>
   1.111 -				<artifactId>cxf-rt-frontend-jaxws</artifactId>
   1.112 -				<version>2.2.5</version>
   1.113 -			</dependency>
   1.114 -			<dependency>
   1.115 -				<groupId>org.apache.cxf</groupId>
   1.116 -				<artifactId>cxf-rt-transports-http</artifactId>
   1.117 -				<version>2.2.5</version>
   1.118 -			</dependency>
   1.119 -			<dependency>
   1.120 -				<groupId>org.apache.cxf</groupId>
   1.121 -				<artifactId>cxf-rt-transports-http-jetty</artifactId>
   1.122 -				<version>2.2.5</version>
   1.123 -			</dependency>
   1.124 +			<groupId>org.apache.cxf</groupId>
   1.125 +			<artifactId>cxf-rt-frontend-jaxws</artifactId>
   1.126 +		</dependency>
   1.127  
   1.128 -			<dependency>
   1.129 -				<groupId>commons-validator</groupId>
   1.130 -				<artifactId>commons-validator</artifactId>
   1.131 -				<version>1.3.1</version>
   1.132 -			</dependency>
   1.133 +		<dependency>
   1.134 +			<groupId>org.apache.cxf</groupId>
   1.135 +			<artifactId>cxf-rt-transports-http</artifactId>
   1.136 +		</dependency>
   1.137 +
   1.138 +		<dependency>
   1.139 +			<groupId>org.apache.cxf</groupId>
   1.140 +			<artifactId>cxf-rt-transports-http-jetty</artifactId>
   1.141 +		</dependency>
   1.142 +
   1.143 +		<dependency>
   1.144 +			<groupId>commons-validator</groupId>
   1.145 +			<artifactId>commons-validator</artifactId>
   1.146 +		</dependency>
   1.147  	</dependencies>
   1.148  
   1.149 -
   1.150 -
   1.151  	<build>
   1.152  		<plugins>
   1.153  			<plugin>
   1.154 @@ -168,7 +152,7 @@
   1.155  								<include>beans.xml</include>
   1.156  							</includes>
   1.157  						</resource>
   1.158 -						
   1.159 +
   1.160  						<resource>
   1.161  							<targetPath>/</targetPath>
   1.162  							<directory>${basedir}/WebContent</directory>
   1.163 @@ -177,7 +161,7 @@
   1.164  								<include>store.jsp</include>
   1.165  							</includes>
   1.166  						</resource>
   1.167 -						
   1.168 +
   1.169  						<resource>
   1.170  							<targetPath>/</targetPath>
   1.171  							<directory>${basedir}/WebContent</directory>
   1.172 @@ -186,22 +170,25 @@
   1.173  							</includes>
   1.174  						</resource>
   1.175  					</webResources>
   1.176 -					<!-- 
   1.177 -					<archive>
   1.178 -						<manifest>
   1.179 -							<addClasspath>true</addClasspath>
   1.180 -						</manifest>
   1.181 -					</archive>
   1.182 -					 -->
   1.183 +					<!-- <archive> <manifest> <addClasspath>true</addClasspath> </manifest> 
   1.184 +						</archive> -->
   1.185  				</configuration>
   1.186  			</plugin>
   1.187 +			<!-- <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> 
   1.188 +				<version>1.0.0</version> <configuration> <lifecycleMappingMetadata> <pluginExecutions> 
   1.189 +				<pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> 
   1.190 +				<artifactId>maven-dependency-plugin</artifactId> <versionRange>[2.1,)</versionRange> 
   1.191 +				<goals> <goal>copy-dependencies</goal> </goals> </pluginExecutionFilter> 
   1.192 +				<action> <ignore /> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> 
   1.193 +				</configuration> </plugin> -->
   1.194  			<plugin>
   1.195  				<groupId>org.apache.maven.plugins</groupId>
   1.196  				<artifactId>maven-dependency-plugin</artifactId>
   1.197 -				<version>2.1</version>
   1.198 +				<version>2.4</version>
   1.199  				<executions>
   1.200  					<execution>
   1.201 -						<phase>validate</phase>
   1.202 +						<!-- <phase>validate</phase> -->
   1.203 +						<phase>package</phase>
   1.204  						<goals>
   1.205  							<goal>copy</goal>
   1.206  						</goals>
   1.207 @@ -228,81 +215,58 @@
   1.208  					<autoVersionSubmodules>true</autoVersionSubmodules>
   1.209  				</configuration>
   1.210  			</plugin>
   1.211 +			<plugin>
   1.212 +				<groupId>org.apache.tomcat.maven</groupId>
   1.213 +				<artifactId>tomcat7-maven-plugin</artifactId>
   1.214 +				<executions>
   1.215 +					<execution>
   1.216 +						<id>tomcat-run</id>
   1.217 +						<goals>
   1.218 +							<goal>exec-war-only</goal>
   1.219 +						</goals>
   1.220 +						<phase>package</phase>
   1.221 +						<configuration>
   1.222 +							<enableNaming>true</enableNaming>
   1.223 +						</configuration>
   1.224 +					</execution>
   1.225 +				</executions>
   1.226 +			</plugin>
   1.227  		</plugins>
   1.228 +
   1.229 +		<pluginManagement>
   1.230 +			<plugins>
   1.231 +				<!-- <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> 
   1.232 +					<version>1.0.0</version> <configuration> <lifecycleMappingMetadata> <pluginExecutions> 
   1.233 +					<pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> 
   1.234 +					<artifactId>maven-dependency-plugin</artifactId> <versionRange>[2.3,)</versionRange> 
   1.235 +					<goals> <goal>copy-dependencies</goal> </goals> </pluginExecutionFilter> 
   1.236 +					<action> <ignore /> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> 
   1.237 +					</configuration> </plugin> -->
   1.238 +				<plugin>
   1.239 +					<groupId>org.eclipse.m2e</groupId>
   1.240 +					<artifactId>lifecycle-mapping</artifactId>
   1.241 +					<version>1.0.0</version>
   1.242 +					<configuration>
   1.243 +						<lifecycleMappingMetadata>
   1.244 +							<pluginExecutions>
   1.245 +								<pluginExecution>
   1.246 +									<pluginExecutionFilter>
   1.247 +										<groupId>org.apache.maven.plugins</groupId>
   1.248 +										<artifactId>maven-dependency-plugin</artifactId>
   1.249 +										<versionRange>[2.1,)</versionRange>
   1.250 +										<goals>
   1.251 +											<goal>copy-dependencies</goal>
   1.252 +										</goals>
   1.253 +									</pluginExecutionFilter>
   1.254 +									<action>
   1.255 +										<ignore />
   1.256 +									</action>
   1.257 +								</pluginExecution>
   1.258 +							</pluginExecutions>
   1.259 +						</lifecycleMappingMetadata>
   1.260 +					</configuration>
   1.261 +				</plugin>
   1.262 +			</plugins>
   1.263 +		</pluginManagement>
   1.264  	</build>
   1.265 -	<scm>
   1.266 -		<connection>scm:hg:http://hg.strabon.di.uoa.gr/StrabonEndpoint/</connection>
   1.267 -		<developerConnection>scm:hg:ssh://hg.strabon.di.uoa.gr///opt/hg/StrabonEndpoint/</developerConnection>
   1.268 -		<url>http://hg.strabon.di.uoa.gr/StrabonEndpoint/</url>
   1.269 -	</scm>
   1.270 -
   1.271 -	<repositories>
   1.272 -		<repository>
   1.273 -			<releases>
   1.274 -				<enabled>true</enabled>
   1.275 -			</releases>
   1.276 -			<snapshots>
   1.277 -				<enabled>false</enabled>
   1.278 -			</snapshots>
   1.279 -			<id>strabon</id>
   1.280 -			<name>Strabon - maven repository</name>
   1.281 -			<url>http://maven.strabon.di.uoa.gr/content/repositories/releases</url>
   1.282 -		</repository>
   1.283 -                <repository>
   1.284 -                        <releases>
   1.285 -                                <enabled>false</enabled>
   1.286 -                        </releases>
   1.287 -                        <snapshots>
   1.288 -                                <enabled>true</enabled>
   1.289 -                        </snapshots>
   1.290 -                        <id>strabon.snapshot</id>
   1.291 -                        <name>Strabon - maven repository - snapshots</name>
   1.292 -                        <url>http://maven.strabon.di.uoa.gr/content/repositories/snapshots</url>
   1.293 -                </repository>
   1.294 -
   1.295 -
   1.296 -		<repository>
   1.297 -			<releases>
   1.298 -				<enabled>true</enabled>
   1.299 -			</releases>
   1.300 -			<snapshots>
   1.301 -				<enabled>false</enabled>
   1.302 -			</snapshots>
   1.303 -			<id>aduna-opensource.releases</id>
   1.304 -			<name>Aduna Open Source - Maven releases</name>
   1.305 -			<url>http://repo.aduna-software.org/maven2/releases</url>
   1.306 -		</repository>
   1.307 -		<repository>
   1.308 -			<releases>
   1.309 -				<enabled>false</enabled>
   1.310 -			</releases>
   1.311 -			<snapshots>
   1.312 -				<enabled>true</enabled>
   1.313 -			</snapshots>
   1.314 -			<id>aduna-opensource.snapshots</id>
   1.315 -			<name>Aduna Open Source - Maven snapshots</name>
   1.316 -			<url>http://repo.aduna-software.org/maven2/snapshots</url>
   1.317 -		</repository>
   1.318 -		<repository>
   1.319 -			<snapshots>
   1.320 -				<enabled>true</enabled>
   1.321 -			</snapshots>
   1.322 -			<id>opengeo</id>
   1.323 -			<name>OpenGeo Maven Repository</name>
   1.324 -			<url>http://download.osgeo.org/webdav/geotools/</url>
   1.325 -		</repository>
   1.326 -	</repositories>
   1.327 -
   1.328 -	<distributionManagement>
   1.329 -		<repository>
   1.330 -			<id>strabon</id>
   1.331 -			<name>Strabon maven repo</name>
   1.332 -			<url>http://maven.strabon.di.uoa.gr/content/repositories/releases</url>
   1.333 -		</repository>
   1.334 -		<snapshotRepository>
   1.335 -			<id>strabon.snapshot</id>
   1.336 -			<name>Strabon maven repo</name>
   1.337 -			<url>http://maven.strabon.di.uoa.gr/content/repositories/snapshots</url>
   1.338 -		</snapshotRepository>
   1.339 -	</distributionManagement>
   1.340  </project>