Commit 193b6381 authored by Yann Mombrun's avatar Yann Mombrun

WEBLAB-1350 - New parent POM 1.2.8-SNAPSHOT using latest versions of internal...

WEBLAB-1350 - New parent POM 1.2.8-SNAPSHOT using latest versions of internal and external libraries.
WEBLAB-1179 - Add the pomFile parameter to install and deploy configuration to ensure reuse of existing pom.
Working on WEBLAB-1224. Add a variable for repositoryId and url. Test has to be conducted on webservice to ensure that it is taken into account.

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabServices/parent@4016 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 46287166
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
<groupId>org.ow2.weblab.services</groupId> <groupId>org.ow2.weblab.services</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>1.2.7-SNAPSHOT</version> <version>1.2.8-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WebLab Services Parent POM</name> <name>WebLab Services Parent POM</name>
<properties> <properties>
<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>4.2.1.RELEASE</spring.version>
<core.version>1.2.5</core.version> <core.version>1.2.8-SNAPSHOT</core.version>
<cxf.version>2.6.11</cxf.version> <cxf.version>3.1.2</cxf.version>
<java.version>1.7</java.version> <java.version>1.7</java.version>
</properties> </properties>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.ow2.weblab.core</groupId> <groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId> <artifactId>annotator</artifactId>
<version>1.2.8-SNAPSHOT</version> <version>${core.version}</version>
</dependency> </dependency>
...@@ -42,27 +42,22 @@ ...@@ -42,27 +42,22 @@
<dependency> <dependency>
<groupId>org.ow2.weblab.core.helpers</groupId> <groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId> <artifactId>rdf-helper-jena</artifactId>
<version>1.4.1</version> <version>1.5.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.weblab.core.helpers</groupId> <groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-structure</artifactId> <artifactId>rdf-helper-jena-structure</artifactId>
<version>1.4.3</version> <version>1.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>1.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.weblab.core.helpers</groupId> <groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>samples</artifactId> <artifactId>samples</artifactId>
<version>1.1.1</version> <version>1.2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.weblab.core.helpers</groupId> <groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>resource-validator</artifactId> <artifactId>resource-validator</artifactId>
<version>1.0.1</version> <version>1.1.0-SNAPSHOT</version>
</dependency> </dependency>
...@@ -70,7 +65,7 @@ ...@@ -70,7 +65,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
...@@ -80,7 +75,7 @@ ...@@ -80,7 +75,7 @@
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>2.3</version> <version>2.8.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
...@@ -90,12 +85,12 @@ ...@@ -90,12 +85,12 @@
<dependency> <dependency>
<groupId>org.apache.jena</groupId> <groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId> <artifactId>jena-core</artifactId>
<version>2.7.4</version> <version>2.13.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.jena</groupId> <groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId> <artifactId>jena-arq</artifactId>
<version>2.9.4</version> <version>2.13.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
...@@ -108,7 +103,7 @@ ...@@ -108,7 +103,7 @@
<dependency> <dependency>
<groupId>xml-apis</groupId> <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId> <artifactId>xml-apis</artifactId>
<version>1.3.04</version> <version>1.4.01</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xml-resolver</groupId> <groupId>xml-resolver</groupId>
...@@ -118,22 +113,22 @@ ...@@ -118,22 +113,22 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.9.0</version> <version>2.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<version>2.7.1</version> <version>2.7.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>serializer</artifactId> <artifactId>serializer</artifactId>
<version>2.7.1</version> <version>2.7.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>
<artifactId>activation</artifactId> <artifactId>activation</artifactId>
<version>1.1</version> <version>1.1.1</version>
</dependency> </dependency>
...@@ -148,6 +143,16 @@ ...@@ -148,6 +143,16 @@
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId> <artifactId>spring-aop</artifactId>
...@@ -332,12 +337,12 @@ ...@@ -332,12 +337,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version> <version>2.7</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -348,65 +353,59 @@ ...@@ -348,65 +353,59 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version> <version>2.10.3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version> <version>2.4</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.5</version> <version>2.6.1</version>
</plugin> </plugin>
<plugin> <plugin>
<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.2</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId> <artifactId>wagon-ssh</artifactId>
<version>2.6</version> <version>2.10</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.5.1</version> <version>2.5.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>2.6</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.3</version> <version>3.4</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version> <version>2.18.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>2.16</version> <version>2.18.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<!-- Further release are not compliant with Maven 3 -->
<version>1.7.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version> <version>2.5.5</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
...@@ -428,9 +427,7 @@ ...@@ -428,9 +427,7 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<showDeprecations>true</showDeprecations> <showDeprecations>true</showDeprecations>
<debug>true</debug> <optimize>true</optimize>
<optimize>false</optimize>
<verbose>true</verbose>
</configuration> </configuration>
<inherited>true</inherited> <inherited>true</inherited>
</plugin> </plugin>
...@@ -659,10 +656,8 @@ ...@@ -659,10 +656,8 @@
<goal>install-file</goal> <goal>install-file</goal>
</goals> </goals>
<configuration> <configuration>
<pomFile>pom.xml</pomFile>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>${project.artifactId}</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
</configuration> </configuration>
</execution> </execution>
...@@ -680,10 +675,10 @@ ...@@ -680,10 +675,10 @@
<goal>deploy-file</goal> <goal>deploy-file</goal>
</goals> </goals>
<configuration> <configuration>
<repositoryId>${weblab.repositoryId}</repositoryId>
<url>${weblab.url}</url>
<pomFile>pom.xml</pomFile>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>${project.artifactId}</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file> <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
</configuration> </configuration>
</execution> </execution>
...@@ -694,5 +689,4 @@ ...@@ -694,5 +689,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>
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