Strabon

changeset 64:ec4719a2c580

Removed jars module. Runtime gathers all jars.
author Kostis Kyzirakos <kkyzir@di.uoa.gr>
date Mon Mar 19 21:55:40 2012 +0100 (2012-03-19)
parents a6217ca68b69
children 3eaccd928b81
files jars/pom.xml pom.xml runtime/pom.xml
line diff
     1.1 --- a/jars/pom.xml	Mon Mar 19 21:18:32 2012 +0100
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,135 +0,0 @@
     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/maven-v4_0_0.xsd">
     1.5 -
     1.6 -	<modelVersion>4.0.0</modelVersion>
     1.7 -
     1.8 -	<parent>
     1.9 -		<groupId>eu.earthobservatory</groupId>
    1.10 -		<artifactId>strabon</artifactId>
    1.11 -		<version>3.1.7-SNAPSHOT</version>
    1.12 -	</parent>
    1.13 -
    1.14 -	<artifactId>strabon-jars</artifactId>
    1.15 -
    1.16 -	<name>Strabon: Jars</name>
    1.17 -	<description>Strabon jars</description>
    1.18 -
    1.19 -	<properties>
    1.20 -		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    1.21 -		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
    1.22 -
    1.23 -		<aduna.appbase.version>3.11.0</aduna.appbase.version>
    1.24 -		<spring.version>2.5.6</spring.version>
    1.25 -	</properties>
    1.26 -
    1.27 -
    1.28 -	<dependencies>
    1.29 -		<dependency>
    1.30 -			<groupId>org.openrdf.sesame</groupId>
    1.31 -			<artifactId>sesame-queryalgebra-evaluation-spatial</artifactId>
    1.32 -		</dependency>
    1.33 -		<dependency>
    1.34 -			<groupId>eu.earthobservatory</groupId>
    1.35 -			<artifactId>strabon-runtime</artifactId>
    1.36 -		</dependency>
    1.37 -		<dependency>
    1.38 -			<groupId>org.openrdf.sesame</groupId>
    1.39 -			<artifactId>sesame-sail-postgis</artifactId>
    1.40 -		</dependency>
    1.41 -		<dependency>
    1.42 -			<groupId>org.openrdf.sesame</groupId>
    1.43 -			<artifactId>sesame-sail-monetdb</artifactId>
    1.44 -		</dependency>
    1.45 -		<dependency>
    1.46 -			<groupId>org.openrdf.sesame</groupId>
    1.47 -			<artifactId>sesame-sail-generaldb</artifactId>
    1.48 -		</dependency>
    1.49 -	</dependencies>
    1.50 -
    1.51 -	<build>
    1.52 -		<pluginManagement>
    1.53 -			<plugins>
    1.54 -				<!-- FIXME: version 2.2-beta-2 causes a lot problems -->
    1.55 -				<plugin>
    1.56 -					<groupId>org.apache.maven.plugins</groupId>
    1.57 -					<artifactId>maven-assembly-plugin</artifactId>
    1.58 -					<version>2.2-beta-1</version>
    1.59 -				</plugin>
    1.60 -				<plugin>
    1.61 -					<groupId>org.eclipse.m2e</groupId>
    1.62 -					<artifactId>lifecycle-mapping</artifactId>
    1.63 -					<version>1.0.0</version>
    1.64 -					<configuration>
    1.65 -						<lifecycleMappingMetadata>
    1.66 -							<pluginExecutions>
    1.67 -								<pluginExecution>
    1.68 -									<pluginExecutionFilter>
    1.69 -										<groupId>org.apache.maven.plugins</groupId>
    1.70 -										<artifactId>maven-dependency-plugin</artifactId>
    1.71 -										<versionRange>[2.3,)</versionRange>
    1.72 -										<goals>
    1.73 -											<goal>copy-dependencies</goal>
    1.74 -										</goals>
    1.75 -									</pluginExecutionFilter>
    1.76 -									<action>
    1.77 -										<ignore />
    1.78 -									</action>
    1.79 -								</pluginExecution>
    1.80 -							</pluginExecutions>
    1.81 -						</lifecycleMappingMetadata>
    1.82 -					</configuration>
    1.83 -				</plugin>
    1.84 -			</plugins>
    1.85 -		</pluginManagement>
    1.86 -
    1.87 -		<plugins>
    1.88 -			<plugin>
    1.89 -				<groupId>org.apache.maven.plugins</groupId>
    1.90 -				<artifactId>maven-compiler-plugin</artifactId>
    1.91 -				<configuration>
    1.92 -					<source>1.6</source>
    1.93 -					<target>1.6</target>
    1.94 -					<encoding>utf8</encoding>
    1.95 -				</configuration>
    1.96 -			</plugin>
    1.97 -			<plugin>
    1.98 -				<groupId>org.apache.maven.plugins</groupId>
    1.99 -				<artifactId>maven-dependency-plugin</artifactId>
   1.100 -				<version>2.3</version>
   1.101 -				<executions>
   1.102 -					<execution>
   1.103 -						<id>copy-dependencies</id>
   1.104 -						<phase>package</phase>
   1.105 -						<goals>
   1.106 -							<goal>copy-dependencies</goal>
   1.107 -						</goals>
   1.108 -						<configuration>
   1.109 -							<outputDirectory>${project.build.directory}</outputDirectory>
   1.110 -							<overWriteReleases>false</overWriteReleases>
   1.111 -							<overWriteSnapshots>false</overWriteSnapshots>
   1.112 -							<overWriteIfNewer>true</overWriteIfNewer>
   1.113 -						</configuration>
   1.114 -					</execution>
   1.115 -				</executions>
   1.116 -			</plugin>
   1.117 -
   1.118 -			<plugin>
   1.119 -				<groupId>org.apache.maven.plugins</groupId>
   1.120 -				<artifactId>maven-jar-plugin</artifactId>
   1.121 -				<version>2.4</version>
   1.122 -			<configuration>
   1.123 -				<skipIfEmpty>true</skipIfEmpty>
   1.124 -			</configuration>
   1.125 -			<executions>
   1.126 -				<execution>
   1.127 -					<goals>
   1.128 -						<goal>test-jar</goal>
   1.129 -					</goals>
   1.130 -				</execution>
   1.131 -			</executions>
   1.132 -			</plugin>
   1.133 -
   1.134 -
   1.135 -		</plugins>
   1.136 -	</build>
   1.137 -</project>
   1.138 -
     2.1 --- a/pom.xml	Mon Mar 19 21:18:32 2012 +0100
     2.2 +++ b/pom.xml	Mon Mar 19 21:55:40 2012 +0100
     2.3 @@ -25,7 +25,6 @@
     2.4  		<module>monetdb</module>
     2.5  		<module>generaldb</module>
     2.6  		<module>resultio</module>
     2.7 -		<module>jars</module>
     2.8  	</modules>
     2.9  
    2.10  	<properties>
    2.11 @@ -343,11 +342,10 @@
    2.12  	<build>
    2.13  		<pluginManagement>
    2.14  			<plugins>
    2.15 -				<!-- FIXME: version 2.2-beta-2 causes a lot problems -->
    2.16  				<plugin>
    2.17  					<groupId>org.apache.maven.plugins</groupId>
    2.18  					<artifactId>maven-assembly-plugin</artifactId>
    2.19 -					<version>2.2-beta-1</version>
    2.20 +					<version>2.3</version>
    2.21  				</plugin>
    2.22  			</plugins>
    2.23  		</pluginManagement>
     3.1 --- a/runtime/pom.xml	Mon Mar 19 21:18:32 2012 +0100
     3.2 +++ b/runtime/pom.xml	Mon Mar 19 21:55:40 2012 +0100
     3.3 @@ -314,5 +314,91 @@
     3.4  			</dependency>
     3.5  			-->
     3.6  	</dependencies>
     3.7 +
     3.8 +<build>
     3.9 +		<pluginManagement>
    3.10 +			<plugins>
    3.11 +				<!-- FIXME: version 2.2-beta-2 causes a lot problems -->
    3.12 +				<plugin>
    3.13 +					<groupId>org.apache.maven.plugins</groupId>
    3.14 +					<artifactId>maven-assembly-plugin</artifactId>
    3.15 +					<version>2.2-beta-1</version>
    3.16 +				</plugin>
    3.17 +				<plugin>
    3.18 +					<groupId>org.eclipse.m2e</groupId>
    3.19 +					<artifactId>lifecycle-mapping</artifactId>
    3.20 +					<version>1.0.0</version>
    3.21 +					<configuration>
    3.22 +						<lifecycleMappingMetadata>
    3.23 +							<pluginExecutions>
    3.24 +								<pluginExecution>
    3.25 +									<pluginExecutionFilter>
    3.26 +										<groupId>org.apache.maven.plugins</groupId>
    3.27 +										<artifactId>maven-dependency-plugin</artifactId>
    3.28 +										<versionRange>[2.3,)</versionRange>
    3.29 +										<goals>
    3.30 +											<goal>copy-dependencies</goal>
    3.31 +										</goals>
    3.32 +									</pluginExecutionFilter>
    3.33 +									<action>
    3.34 +										<ignore />
    3.35 +									</action>
    3.36 +								</pluginExecution>
    3.37 +							</pluginExecutions>
    3.38 +						</lifecycleMappingMetadata>
    3.39 +					</configuration>
    3.40 +				</plugin>
    3.41 +			</plugins>
    3.42 +		</pluginManagement>
    3.43 +
    3.44 +		<plugins>
    3.45 +			<plugin>
    3.46 +				<groupId>org.apache.maven.plugins</groupId>
    3.47 +				<artifactId>maven-compiler-plugin</artifactId>
    3.48 +				<version>2.3.2</version>
    3.49 +				<configuration>
    3.50 +					<source>1.6</source>
    3.51 +					<target>1.6</target>
    3.52 +					<encoding>utf8</encoding>
    3.53 +				</configuration>
    3.54 +			</plugin>
    3.55 +			<plugin>
    3.56 +				<groupId>org.apache.maven.plugins</groupId>
    3.57 +				<artifactId>maven-dependency-plugin</artifactId>
    3.58 +				<version>2.4</version>
    3.59 +				<executions>
    3.60 +					<execution>
    3.61 +						<id>copy-dependencies</id>
    3.62 +						<phase>package</phase>
    3.63 +						<goals>
    3.64 +							<goal>copy-dependencies</goal>
    3.65 +						</goals>
    3.66 +						<configuration>
    3.67 +							<outputDirectory>${project.build.directory}</outputDirectory>
    3.68 +							<overWriteReleases>false</overWriteReleases>
    3.69 +							<overWriteSnapshots>false</overWriteSnapshots>
    3.70 +							<overWriteIfNewer>true</overWriteIfNewer>
    3.71 +						</configuration>
    3.72 +					</execution>
    3.73 +				</executions>
    3.74 +			</plugin>
    3.75 +
    3.76 +			<plugin>
    3.77 +				<groupId>org.apache.maven.plugins</groupId>
    3.78 +				<artifactId>maven-jar-plugin</artifactId>
    3.79 +				<version>2.4</version>
    3.80 +				<configuration>
    3.81 +					<skipIfEmpty>true</skipIfEmpty>
    3.82 +				</configuration>
    3.83 +				<executions>
    3.84 +					<execution>
    3.85 +						<goals>
    3.86 +							<goal>test-jar</goal>
    3.87 +						</goals>
    3.88 +					</execution>
    3.89 +				</executions>
    3.90 +			</plugin>
    3.91 +		</plugins>
    3.92 +	</build>
    3.93  </project>
    3.94