Commit f6a83d06 authored by Philippe Merle's avatar Philippe Merle

Third try to resolve an issue for releasing FraSCAti.

* Replaced all <version>${frascati.version}</version> by <version>${project.version}</version>.
* Removed the <frascati.version> properties.
parent b09c7437
......@@ -49,9 +49,6 @@ examples/pom.xml properties
The examples/pom.xml file defines the following FraSCAti properties:
- frascati.version:
The current version of FraSCAti.
- config.directory:
The directory where configuration files are present.
By default, it is the examples/ directory.
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti Examples: BPEL Parent
*
* Copyright (c) 2010-2012 Inria, University of Lille 1
* Copyright (c) 2010-2013 Inria, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-bpel</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -46,7 +46,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rmi</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -52,7 +52,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -88,7 +88,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -88,14 +88,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Include in the war the FraSCAti Explorer. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
......@@ -103,7 +103,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-runtime-factory</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
......
......@@ -88,14 +88,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-servlet-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Include in the war the FraSCAti Runtime Factory. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-runtime-factory</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
......
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-beanshell</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -72,7 +72,7 @@
<dependency>
<groupId>org.ow2.frascati.gcs</groupId>
<artifactId>frascati-binding-jgroups</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -100,7 +100,7 @@
<dependency>
<groupId>org.ow2.frascati.native</groupId>
<artifactId>frascati-interface-native</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -66,7 +66,7 @@
<dependency>
<groupId>org.ow2.frascati.native</groupId>
<artifactId>frascati-binding-jna</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -53,14 +53,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <sca:binding.ws> -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -59,21 +59,21 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <binding.ws>. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for intent WS-DiscoveryLoadBalancing. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf-ws-discovery</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -59,14 +59,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <binding.ws>. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -52,14 +52,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for Apache CXF ImplicitQueryParamIntent and Jackson intents. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf-jaxrs-jackson</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-authentication</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -59,7 +59,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -55,7 +55,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-fractal</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Implementation of Fractal components. -->
......
......@@ -47,7 +47,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -62,7 +62,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-compiler-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</plugin>
<plugin>
......@@ -89,14 +89,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-jms</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Interface WSDL Module. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -59,7 +59,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -58,7 +58,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -47,7 +47,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -49,7 +49,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-jsonrpc</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -49,7 +49,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -50,7 +50,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-metamodel-oasis-csa</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -43,7 +43,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-concierge</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-equinox</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-felix</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-jboss</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -44,7 +44,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-knopflerfish</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -52,14 +52,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Apache CXF Binding Intents. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -47,7 +47,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rmi</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -62,7 +62,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-membrane-scaPrimitiveWithState</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -54,35 +54,35 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-beanshell</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Script Implementation with Groovy. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-groovy</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Script Implementation with JavaScript. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-javascript</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Script Implementation with JRuby. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-jruby</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Script Implementation with Jython. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-jython</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -45,17 +45,17 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-servlet-cxf</artifactId>
<version>1.5-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-runtime-factory</artifactId>
<version>1.5-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>frascati-helloworld-servlet</artifactId>
<version>1.5-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -47,7 +47,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-http</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -82,7 +82,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-spring</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -47,7 +47,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-contribution-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>frascati-contribution</id>
......
......@@ -50,7 +50,7 @@
<dependency>
<groupId>org.ow2.frascati.upnp</groupId>
<artifactId>frascati-binding-upnp</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-velocity</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
......@@ -49,19 +49,19 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-widget</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-http</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -69,19 +69,19 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <interface.wsdl>. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Apache CXF Binding Intents. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
......@@ -80,19 +80,19 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <interface.wsdl>. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Apache CXF Binding Intents. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
......@@ -60,19 +60,19 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <interface.wsdl>. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Apache CXF Binding Intents. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
......@@ -60,19 +60,19 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-ws</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <interface.wsdl>. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Apache CXF Binding Intents. -->
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-intent-apache-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-xquery</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -64,7 +64,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script-beanshell</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -61,7 +61,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -88,14 +88,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-servlet-cxf</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Include in the war the FraSCAti Assembly Factory for JDK6. -->
<dependency>
<groupId>org.ow2.frascati</groupId>