Commit d1534b71 authored by Yann Mombrun's avatar Yann Mombrun

WEBLAB-1116 - Service parent move to Java 1.7

WEBLAB-291 - Add wagon-scp as maven-deploy-plugin dependency

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabServices/parent@3630 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 789054db
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.0.7.RELEASE</spring.version> <spring.version>3.0.7.RELEASE</spring.version>
<core.version>1.2.5</core.version> <core.version>1.2.5</core.version>
<cxf.version>2.6.3</cxf.version> <cxf.version>2.6.11</cxf.version>
<java.version>1.7</java.version>
</properties> </properties>
...@@ -363,6 +364,13 @@ ...@@ -363,6 +364,13 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version> <version>2.8.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.6</version>
</dependency>
</dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -414,8 +422,8 @@ ...@@ -414,8 +422,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.6</source> <source>${java.version}</source>
<target>1.6</target> <target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<showDeprecations>true</showDeprecations> <showDeprecations>true</showDeprecations>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment