Commit f89dfc60 authored by Christophe Demarey's avatar Christophe Demarey

Remove frascati.version property beacause it breaks maven-release-plugin and...

Remove frascati.version property beacause it breaks maven-release-plugin and it is not useful. It's better to use project.version instead.
parent fef93c82
......@@ -60,7 +60,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-fractal</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Apache commons CLI required library to use FraSCAti factories. -->
......
......@@ -50,7 +50,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -56,14 +56,14 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-bpel</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- For JUnit testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -68,7 +68,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</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>
......
......@@ -87,13 +87,13 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -92,14 +92,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>
......@@ -107,7 +107,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-runtime-factory</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
......
......@@ -92,14 +92,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>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- BeanShell Scripting Engine. -->
......
......@@ -63,7 +63,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -72,7 +72,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -51,14 +51,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>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -50,7 +50,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -63,7 +63,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. -->
......@@ -80,7 +80,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -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>
......
......@@ -48,7 +48,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -43,7 +43,7 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -43,7 +43,7 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -51,21 +51,21 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-sca</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <frascati:implementation.osgi> with Eclipse Equinox. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-equinox</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- For testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......@@ -94,17 +94,17 @@
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-client</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-server</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
......
......@@ -51,21 +51,21 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-sca</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Support for <frascati:implementation.osgi> with Apache Felix. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-osgi-felix</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- For testing. -->
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......@@ -94,17 +94,17 @@
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-client</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-server</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
......
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-osgi-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -49,7 +49,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</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>
......
......@@ -69,7 +69,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- BeanShell Scripting Engine. -->
......@@ -147,7 +147,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -49,7 +49,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-http</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -91,7 +91,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-spring</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- ===== -->
......@@ -101,7 +101,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -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>
......
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.ow2.frascati.upnp</groupId>
<artifactId>frascati-binding-upnp</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......
......@@ -49,7 +49,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -62,7 +62,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -51,7 +51,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- BeanShell Scripting Engine. -->
......
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
......
......@@ -75,7 +75,7 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>ohloh-proxy-standalone</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
......@@ -92,14 +92,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>
<artifactId>frascati-assembly-factory-jdk6</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
......
......@@ -75,7 +75,7 @@
<dependency>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>ohloh-proxy-standalone</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<exclusions>
<!-- Exclude Apache CXF Transport HTTP Jetty as unneeded. -->
<exclusion>
......@@ -94,14 +94,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>
......
......@@ -83,7 +83,7 @@
<plugin>
<groupId>org.ow2.frascati.mojo</groupId>
<artifactId>frascati-compiler-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<executions>
<execution>
<id>compile-composite</id>
......@@ -151,7 +151,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-runtime-factory</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<!-- scope is provided to allow to compile examples but -->
<!-- to avoid to put FraSCAti systematically into generated WAR/ZIP/etc. -->
<scope>provided</scope>
......@@ -160,7 +160,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-api</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<!-- scope is provided to allow to compile FraSCAti Explorer plugins of examples but -->
<!-- to avoid to put FraSCAti Explorer systematically into generated WAR/ZIP/etc. -->
<scope>provided</scope>
......@@ -215,7 +215,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
......@@ -244,13 +244,13 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Add OW2 FraSCAti Explorer FScript plugin -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-fscript-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
......@@ -294,7 +294,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-fscript-console</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
......@@ -322,12 +322,12 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-fscript-console</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-fscript-plugin</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
......@@ -340,7 +340,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-explorer-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.frascati</groupId>
......@@ -351,7 +351,7 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-assembly-factory-jdk6</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -50,34 +50,34 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</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>
<!-- FraSCAti FScript -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-fscript-core</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<!-- OW2 FraSCAti Script Implementation. -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-implementation-script</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -52,13 +52,13 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -63,13 +63,13 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-binding-rest</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -62,13 +62,13 @@
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-interface-wsdl</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
......
......@@ -63,7 +63,7 @@
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${frascati.version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
...