Strabon

changeset 60:2b5e399f7bb0

Modified various pom.xml to get rid of warnings when compiling with Maven 3
author Kostis Kyzirakos <kkyzir@di.uoa.gr>
date Mon Mar 19 20:43:30 2012 +0100 (2012-03-19)
parents 7c2f5562a99b
children 5a6948d2bfc5
files generaldb/pom.xml jars/pom.xml monetdb/pom.xml pom.xml postgis/pom.xml runtime/pom.xml
line diff
     1.1 --- a/generaldb/pom.xml	Fri Mar 16 18:09:01 2012 +0200
     1.2 +++ b/generaldb/pom.xml	Mon Mar 19 20:43:30 2012 +0100
     1.3 @@ -80,27 +80,20 @@
     1.4  		</dependency>
     1.5  
     1.6  		<dependency>
     1.7 -			<groupId>junit</groupId>
     1.8 -			<artifactId>junit</artifactId>
     1.9 -		</dependency>
    1.10 -
    1.11 -		<dependency>
    1.12  			<groupId>postgresql</groupId>
    1.13  			<artifactId>postgresql</artifactId>
    1.14  			<scope>provided</scope>
    1.15  		</dependency>
    1.16   		
    1.17 -	    <dependency>
    1.18 -	      <groupId>junit</groupId>
    1.19 -	      <artifactId>junit</artifactId>
    1.20 -	      <version>4.7</version>
    1.21 -	      <scope>test</scope>
    1.22 -	    </dependency>
    1.23 +                <dependency>
    1.24 +                        <groupId>junit</groupId>
    1.25 +                        <artifactId>junit</artifactId>
    1.26 +                        <scope>test</scope>
    1.27 +                </dependency>
    1.28  	    
    1.29 -	    <dependency>
    1.30 -		  <groupId>net.sf</groupId>
    1.31 -		  <artifactId>log4jdbc4</artifactId>
    1.32 -		  <version>1.2</version>
    1.33 +		<dependency>
    1.34 +			<groupId>net.sf</groupId>
    1.35 +			<artifactId>log4jdbc4</artifactId>
    1.36  		</dependency>
    1.37  	    
    1.38  	</dependencies>
     2.1 --- a/jars/pom.xml	Fri Mar 16 18:09:01 2012 +0200
     2.2 +++ b/jars/pom.xml	Mon Mar 19 20:43:30 2012 +0100
     2.3 @@ -111,6 +111,24 @@
     2.4  					</execution>
     2.5  				</executions>
     2.6  			</plugin>
     2.7 +
     2.8 +			<plugin>
     2.9 +				<groupId>org.apache.maven.plugins</groupId>
    2.10 +				<artifactId>maven-jar-plugin</artifactId>
    2.11 +				<version>2.4</version>
    2.12 +			<configuration>
    2.13 +				<skipIfEmpty>true</skipIfEmpty>
    2.14 +			</configuration>
    2.15 +			<executions>
    2.16 +				<execution>
    2.17 +					<goals>
    2.18 +						<goal>test-jar</goal>
    2.19 +					</goals>
    2.20 +				</execution>
    2.21 +			</executions>
    2.22 +			</plugin>
    2.23 +
    2.24 +
    2.25  		</plugins>
    2.26  	</build>
    2.27  </project>
     3.1 --- a/monetdb/pom.xml	Fri Mar 16 18:09:01 2012 +0200
     3.2 +++ b/monetdb/pom.xml	Mon Mar 19 20:43:30 2012 +0100
     3.3 @@ -86,27 +86,21 @@
     3.4  		<dependency>
     3.5  			<groupId>junit</groupId>
     3.6  			<artifactId>junit</artifactId>
     3.7 +			<scope>test</scope>
     3.8 +		</dependency>
     3.9 +	    
    3.10 +		<dependency>
    3.11 +			<groupId>monetdb</groupId>
    3.12 +			<artifactId>jdbcclient</artifactId>
    3.13 +			<version>3.4.0</version>
    3.14  		</dependency>
    3.15  
    3.16 - 		
    3.17 -	    <dependency>
    3.18 -	      <groupId>junit</groupId>
    3.19 -	      <artifactId>junit</artifactId>
    3.20 -	      <version>4.7</version>
    3.21 -	      <scope>test</scope>
    3.22 -	    </dependency>
    3.23 -	    
    3.24 -	    <dependency>
    3.25 -	    	<groupId>monetdb</groupId>
    3.26 -	    	<artifactId>jdbcclient</artifactId>
    3.27 -	    	<version>3.4.0</version>
    3.28 -	    </dependency>
    3.29 -	    <!--
    3.30 -	    <dependency>
    3.31 -	    	<groupId>net.sf</groupId>
    3.32 -	    	<artifactId>log4jdbc3</artifactId>
    3.33 -	    	<version>1.2beta2</version>
    3.34 -	    </dependency>
    3.35 -	    -->
    3.36 +		<!--
    3.37 +		<dependency>
    3.38 +		    	<groupId>net.sf</groupId>
    3.39 +		    	<artifactId>log4jdbc3</artifactId>
    3.40 +	    		<version>1.2beta2</version>
    3.41 +		</dependency>
    3.42 +		-->
    3.43  	</dependencies>
    3.44  </project>
     4.1 --- a/pom.xml	Fri Mar 16 18:09:01 2012 +0200
     4.2 +++ b/pom.xml	Mon Mar 19 20:43:30 2012 +0100
     4.3 @@ -36,6 +36,8 @@
     4.4  		<slf4j.version>1.6.1</slf4j.version>
     4.5  		<spring.version>2.5.6</spring.version>
     4.6  		<geotools.version>2.7.4</geotools.version>
     4.7 +                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     4.8 +                <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
     4.9  	</properties>
    4.10  
    4.11  	<dependencyManagement>
    4.12 @@ -103,12 +105,6 @@
    4.13  
    4.14  			<dependency>
    4.15  				<groupId>org.openrdf.sesame</groupId>
    4.16 -				<artifactId>sesame-queryalgebra-evaluation</artifactId>
    4.17 -				<version>${sesame.version}</version>
    4.18 -			</dependency>
    4.19 -
    4.20 -			<dependency>
    4.21 -				<groupId>org.openrdf.sesame</groupId>
    4.22  				<artifactId>sesame-queryparser-api</artifactId>
    4.23  				<version>${sesame.version}</version>
    4.24  			</dependency>
    4.25 @@ -335,6 +331,13 @@
    4.26  				<version>${slf4j.version}</version>
    4.27  			</dependency>
    4.28  
    4.29 +	                <dependency>
    4.30 +        	                <groupId>net.sf</groupId>
    4.31 +                	        <artifactId>log4jdbc4</artifactId>
    4.32 +                        	<version>1.2</version>
    4.33 +	                </dependency>
    4.34 +
    4.35 +
    4.36  		</dependencies>
    4.37  	</dependencyManagement>
    4.38  
    4.39 @@ -354,6 +357,7 @@
    4.40  			<plugin>
    4.41  				<groupId>org.apache.maven.plugins</groupId>
    4.42  				<artifactId>maven-compiler-plugin</artifactId>
    4.43 +				<version>2.3.2</version>
    4.44  				<configuration>
    4.45  					<source>1.6</source>
    4.46  					<target>1.6</target>
    4.47 @@ -380,6 +384,7 @@
    4.48  			<plugin>
    4.49  				<groupId>org.apache.maven.plugins</groupId>
    4.50  				<artifactId>maven-javadoc-plugin</artifactId>
    4.51 +				<version>2.8.1</version>
    4.52  				<configuration>
    4.53  					<source>1.6</source>
    4.54  					<encoding>utf8</encoding>
     5.1 --- a/postgis/pom.xml	Fri Mar 16 18:09:01 2012 +0200
     5.2 +++ b/postgis/pom.xml	Mon Mar 19 20:43:30 2012 +0100
     5.3 @@ -84,29 +84,23 @@
     5.4  		</dependency>
     5.5  
     5.6  		<dependency>
     5.7 -			<groupId>junit</groupId>
     5.8 -			<artifactId>junit</artifactId>
     5.9 -		</dependency>
    5.10 -
    5.11 -		<dependency>
    5.12  			<groupId>postgresql</groupId>
    5.13  			<artifactId>postgresql</artifactId>
    5.14  			<scope>provided</scope>
    5.15  		</dependency>
    5.16  		
    5.17 - 		
    5.18 -	    <dependency>
    5.19 -	      <groupId>junit</groupId>
    5.20 -	      <artifactId>junit</artifactId>
    5.21 -	      <version>4.7</version>
    5.22 -	      <scope>test</scope>
    5.23 -	    </dependency>
    5.24 -	<!--
    5.25 -	    <dependency>
    5.26 -	    	<groupId>net.sf</groupId>
    5.27 -	    	<artifactId>log4jdbc3</artifactId>
    5.28 -	    	<version>1.2beta2</version>
    5.29 -	    </dependency>
    5.30 -	-->
    5.31 + 		<dependency>
    5.32 +			<groupId>junit</groupId>
    5.33 +			<artifactId>junit</artifactId>
    5.34 +			<scope>test</scope>
    5.35 +		</dependency>
    5.36 +
    5.37 +		<!--
    5.38 +		<dependency>
    5.39 +			<groupId>net.sf</groupId>
    5.40 +			<artifactId>log4jdbc3</artifactId>
    5.41 +			<version>1.2beta2</version>
    5.42 +		</dependency>
    5.43 +		-->
    5.44  	</dependencies>
    5.45  </project>
     6.1 --- a/runtime/pom.xml	Fri Mar 16 18:09:01 2012 +0200
     6.2 +++ b/runtime/pom.xml	Mon Mar 19 20:43:30 2012 +0100
     6.3 @@ -165,13 +165,12 @@
     6.4  				<artifactId>gt-opengis</artifactId>
     6.5  			</dependency>
     6.6  
     6.7 -		<!-- Aduna Appbase -->
     6.8 +			<!-- Aduna Appbase -->
     6.9  			<dependency>
    6.10  				<groupId>info.aduna.appbase</groupId>
    6.11  				<artifactId>aduna-appbase</artifactId>
    6.12  				<version>${aduna.appbase.version}</version>
    6.13  				<type>pom</type>
    6.14 -				<scope>import</scope>
    6.15  			</dependency>
    6.16  
    6.17  			<!-- Aduna Commons -->