Commit cf179eec authored by Christophe Demarey's avatar Christophe Demarey
Browse files

pom refactoring.

parent ab0bcaea
......@@ -34,6 +34,15 @@
<version>1.2-SNAPSHOT</version>
</parent>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
<spoon.maven-plugin.version>0.7.1</spoon.maven-plugin.version>
<spoon.core.version>1.4.2</spoon.core.version>
</properties>
<!-- ============= -->
<!-- Dependencies -->
<!-- ============= -->
......@@ -58,17 +67,6 @@
<artifactId>fractal-explorer</artifactId>
</dependency>
<!-- Force the xerces version to the latest (API incompatibility) -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
</dependency>
<!-- Fraclet annotations -->
<dependency>
<groupId>org.objectweb.fractal.fraclet.java</groupId>
......@@ -99,22 +97,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<!-- Process Fraclet annotations with Spoon. -->
<plugin>
<groupId>net.sf.alchim</groupId>
<artifactId>spoon-maven-plugin</artifactId>
<version>0.7.1</version>
<version>${spoon.maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>fr.inria.gforge.spoon</groupId>
<artifactId>spoon-core</artifactId>
<version>1.4.2</version>
<version>${spoon.core.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.fraclet.java</groupId>
......
......@@ -74,21 +74,20 @@
<!-- ====== -->
<build>
<plugins>
<!-- Compile with java 1.5 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
<!-- ========= -->
<!-- Profiles -->
<!-- ========= -->
<profiles>
<profile>
<id>explorer</id>
......
......@@ -42,7 +42,6 @@
<fractal-explorer.version>1.1.4</fractal-explorer.version>
<xerces.version>2.9.1</xerces.version>
<beanshell.version>2.0b4</beanshell.version>
<fraclet.version>3.2.1</fraclet.version>
<truezip.version>6.6</truezip.version>
<frascati-explorer.adl.file>org.ow2.frascati.explorer.FrascatiExplorer</frascati-explorer.adl.file>
<frascati-explorer.archi.adl.file>org.ow2.frascati.explorer.FrascatiExplorerFractalView</frascati-explorer.archi.adl.file>
......@@ -52,221 +51,99 @@
<!-- Dependencies -->
<!-- ============= -->
<dependencyManagement>
<dependencies>
<!-- <dependency>-->
<!-- <groupId>org.ow2.frascati.examples</groupId>-->
<!-- <artifactId>helloworld-rmi-server</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.ow2.frascati.examples</groupId>-->
<!-- <artifactId>helloworld-rmi-client</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- Fractal Explorer -->
<dependency>
<groupId>org.objectweb.fractal.fractalexplorer</groupId>
<artifactId>fractal-explorer</artifactId>
<version>${fractal-explorer.version}</version>
<exclusions>
<!-- Use fractal-util >= 1.1.2
(FractalExplorer relies on fractal-adl 2.2 that relies on fractal-util 1.0) -->
<exclusion>
<groupId>org.objectweb.fractal</groupId>
<artifactId>fractal-util</artifactId>
</exclusion>
<!-- Use a fractal-adl version >= 2.3.1 (Get the possibility to name arguments) -->
<exclusion>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>fractal-adl</artifactId>
</exclusion>
<!-- Don't use a too old version of xerces (API incompatibility) -->
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<!-- Use an asm version >= 3.0 -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<!-- Fractal RMI unused by FraSCAti. -->
<exclusion>
<groupId>org.objectweb.fractal.fractalrmi</groupId>
<artifactId>fractal-rmi</artifactId>
</exclusion>
<!-- Fractal ADL Dumper unused by FraSCAti. -->
<exclusion>
<groupId>org.objectweb.fractal.fractaladl.dumper</groupId>
<artifactId>dumper</artifactId>
</exclusion>
<!-- Bugged version of ow_trace -->
<exclusion>
<groupId>org.objectweb.util.misc</groupId>
<artifactId>ow-trace</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependencyManagement>
<dependencies>
<!-- Fractal Explorer -->
<dependency>
<groupId>org.objectweb.fractal.fractalexplorer</groupId>
<artifactId>fractal-explorer</artifactId>
<version>${fractal-explorer.version}</version>
<exclusions>
<!-- Use fractal-util >= 1.1.2
(FractalExplorer relies on fractal-adl 2.2 that relies on fractal-util 1.0) -->
<exclusion>
<groupId>org.objectweb.fractal</groupId>
<artifactId>fractal-util</artifactId>
</exclusion>
<!-- Use a fractal-adl version >= 2.3.1 (Get the possibility to name arguments) -->
<exclusion>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>fractal-adl</artifactId>
</exclusion>
<!-- Don't use a too old version of xerces (API incompatibility) -->
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<!-- Use an asm version >= 3.0 -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<!-- Fractal RMI unused by FraSCAti. -->
<exclusion>
<groupId>org.objectweb.fractal.fractalrmi</groupId>
<artifactId>fractal-rmi</artifactId>
</exclusion>
<!-- Fractal ADL Dumper unused by FraSCAti. -->
<exclusion>
<groupId>org.objectweb.fractal.fractaladl.dumper</groupId>
<artifactId>dumper</artifactId>
</exclusion>
<!-- Bugged version of ow_trace -->
<exclusion>
<groupId>org.objectweb.util.misc</groupId>
<artifactId>ow-trace</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Force the xerces version to the latest (API incompatibility) -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>${beanshell.version}</version>
</dependency>
<!-- Truezip -->
<dependency>
<groupId>de.schlichtherle.io</groupId>
<artifactId>truezip</artifactId>
<version>${truezip.version}</version>
</dependency>
<!-- Force the xerces version to the latest (API incompatibility) -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</dependency>
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>${beanshell.version}</version>
</dependency>
<!-- Fraclet annotations -->
<dependency>
<groupId>org.objectweb.fractal.fraclet.java</groupId>
<artifactId>fraclet-annotations</artifactId>
<version>${fraclet.version}</version>
</dependency>
<!-- FraSCAti -->
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Truezip -->
<dependency>
<groupId>de.schlichtherle.io</groupId>
<artifactId>truezip</artifactId>
<version>${truezip.version}</version>
</dependency>
<!-- FraSCAti Script -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-fscript</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.objectweb.fractal.fscript</groupId>
<artifactId>fscript-console</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-rmi-server</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
<!-- ======================= -->
<!-- Distribution Management -->
<!-- ======================= -->
<distributionManagement>
<repository>
<id>ow2.org</id>
<name>OW2 Central Repository</name>
<url>scp://forge.objectweb.org/var/lib/gforge/chroot/home/groups/maven/htdocs/maven2</url>
</repository>
<snapshotRepository>
<id>frascati.ow2.org</id>
<name>OW2 FraSCAti Central Repository</name>
<url>scp://forge.objectweb.org/var/lib/gforge/chroot/home/groups/maven/htdocs/maven2-snapshot/</url>
</snapshotRepository>
</distributionManagement>
<!-- ============= -->
<!-- Repositories -->
<!-- ============= -->
<repositories>
<repository>
<id>ow2-repo</id>
<name>OW2 Repository</name>
<url>http://maven.objectweb.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>OW-Snapshot</id>
<name>ObjectWeb Snapshot Repository</name>
<url>http://maven.objectweb.org/maven2-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<!-- ==========-->
<!-- Reporting -->
<!-- ========= -->
<build>
<plugins>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>create-html-docs</id>
<goals>
<goal>generate-html</goal>
</goals>
<phase>pre-site</phase>
<configuration>
<!-- This copies content (images, etc) for the HTML version -->
<preProcess>
<copy todir="target/docbkx/html/images">
<fileset dir="src/docbkx/images" />
</copy>
<copy todir="target/docbkx/html/css" file="${project.basedir}/../ow2-style.css" />
</preProcess>
<!-- Any parameters specific to HTML version go here -->
<htmlStylesheet>css/ow2-style.css</htmlStylesheet>
<imgSrcPath>./</imgSrcPath>
</configuration>
</execution>
<execution>
<id>create-pdf-docs</id>
<goals>
<goal>generate-pdf</goal>
</goals>
<phase>pre-site</phase>
<configuration>
<!-- Any parameters specific to the PDF version go here -->
<imgSrcPath>file:///${basedir}/src/docbkx/</imgSrcPath>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.docbook</groupId>
<artifactId>docbook-xml</artifactId>
<version>4.4</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<!-- Any parameters common to both HTML and PDF go here -->
<xincludeSupported>true</xincludeSupported>
</configuration>
</plugin>
</plugins>
</build>
<!-- FraSCAti -->
<dependency>
<groupId>org.ow2.frascati.factory</groupId>
<artifactId>frascati-af-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<!-- FraSCAti Script -->
<dependency>
<groupId>org.ow2.frascati</groupId>
<artifactId>frascati-fscript</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.objectweb.fractal.fscript</groupId>
<artifactId>fscript-console</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.frascati.examples</groupId>
<artifactId>helloworld-rmi-server</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
<!-- ========= -->
<!-- Profiles -->
......@@ -362,10 +239,4 @@
<module>fscript-plugin</module>
</modules>
<scm>
<connection>scm:svn:svn://svn.forge.objectweb.org/svnroot/frascati/tags/FRASCATI_EXPLORER_1_1</connection>
<developerConnection>scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/frascati/tags/FRASCATI_EXPLORER_1_1</developerConnection>
<url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/frascati/tags/FRASCATI_EXPLORER_1_1</url>
</scm>
</project>
......@@ -40,31 +40,6 @@
<!-- Dependencies -->
<!-- ============= -->
<dependencyManagement>
<dependencies>
<!-- Force the fractal-util version to 1.1.2 -->
<dependency>
<groupId>org.objectweb.fractal</groupId>
<artifactId>fractal-util</artifactId>
<version>1.1.2</version>
</dependency>
<!-- Force the fractal-adl version to 2.3.1
(Get the possibility to name arguments) -->
<dependency>
<groupId>org.objectweb.fractal.fractaladl</groupId>
<artifactId>fractal-adl</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- FraSCAti -->
<dependency>
......@@ -83,12 +58,10 @@
<artifactId>fscript-console</artifactId>
</dependency>
<!-- Test -->
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -104,58 +77,14 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-debug</artifactId>
<version>${project.version}</version>
<groupId>org.ow2.frascati.intent</groupId>
<artifactId>frascati-debug</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<!-- ======================= -->
<!-- Distribution Management -->
<!-- ======================= -->
<distributionManagement>
<repository>
<id>ow2.org</id>
<name>OW2 Central Repository</name>
<url>scp://forge.objectweb.org/var/lib/gforge/chroot/home/groups/maven/htdocs/maven2</url>
</repository>
<snapshotRepository>
<id>frascati.ow2.org</id>
<name>OW2 FraSCAti Central Repository</name>
<url>scp://forge.objectweb.org/var/lib/gforge/chroot/home/groups/maven/htdocs/maven2-snapshot/</url>
</snapshotRepository>
</distributionManagement>
<!-- ============= -->
<!-- Repositories -->
<!-- ============= -->
<repositories>
<repository>
<id>ow2-repo</id>
<name>OW2 Repository</name>
<url>http://maven.objectweb.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>OW-Snapshot</id>
<name>ObjectWeb Snapshot Repository</name>
<url>http://maven.objectweb.org/maven2-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<!-- ====== -->
<!-- Build -->
<!-- ====== -->
......@@ -167,10 +96,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
......
......@@ -197,6 +197,42 @@
<module>fscript</module>
</modules>
<!-- ============= -->
<!-- Repositories -->
<!-- ============= -->
<repositories>
<repository>
<id>OW2-release</id>
<name>OW2 release repository</name>
<url>http://maven.objectweb.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>OW2-snapshot</id>
<name>OW2 snapshot repository</name>
<url>http://maven.objectweb.org/maven2-snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<!-- ============= -->
<!-- Properties -->
<!-- ============= -->
<properties>
<fscript.version>2.1.1</fscript.version>
<fraclet.version>3.2.1</fraclet.version>
</properties>
<!-- ======================= -->
<!-- Dependencies management -->
<!-- ======================= -->
......@@ -208,18 +244,56 @@
-->
<dependencyManagement>
<dependencies>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
<!-- FScript -->
<dependency>
<groupId>org.objectweb.fractal.fscript</groupId>
<artifactId>fscript</artifactId>
<version>2.1.1</version>
<version>${fscript.version}</version>
</dependency>
<dependency>
<groupId>org.objectweb.fractal.fscript</groupId>
<artifactId>fscript-console</artifactId>
<version>2.1.1</version>
<version>${fscript.version}</version>
</dependency>
<!-- Fraclet annotations -->
<dependency>
<groupId>org.objectweb.fractal.fraclet.java</groupId>
<artifactId>fraclet-annotations</artifactId>
<version>${fraclet.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- ================= -->
<!-- Plugin management -->
<!-- ================= -->
<build>
<pluginManagement>
<plugins>
<!-- Compile with java 1.5 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</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