Commit 66944c91 authored by Christophe Demarey's avatar Christophe Demarey

pom refactoring.

parent ecd7f06b
......@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......
......@@ -36,7 +36,7 @@
<repositories>
<repository>
<id>maven2-repository.dev.java.net</id>
<id>download.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
......
......@@ -42,6 +42,44 @@
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
<build>
<pluginManagement>
<plugins>
<!-- Build the Web Application archive. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
</archive>
</configuration>
</plugin>
<!-- type 'mvn jetty:run' to launch this war with Jetty. -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<!-- Here is the path where the war is deployed. -->
<contextPath>/counter-rest</contextPath>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<!-- Here is the port where Jetty is deployed. -->
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
<module>client</module>
......
......@@ -98,32 +98,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
</archive>
</configuration>
</plugin>
<!-- type 'mvn jetty:run' to launch this war with Jetty. -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<!-- Here is the path where the war is deployed. -->
<contextPath>/counter-rest</contextPath>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<!-- Here is the port where Jetty is deployed. -->
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
</configuration>
</plugin>
</plugins>
</build>
......
......@@ -98,32 +98,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
</archive>
</configuration>
</plugin>
<!-- type 'mvn jetty:run' to launch this war with Jetty. -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<!-- Here is the path where the war is deployed. -->
<contextPath>/counter-rest</contextPath>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<!-- Here is the port where Jetty is deployed. -->
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
</configuration>
</plugin>
</plugins>
</build>
......
......@@ -57,7 +57,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......@@ -66,8 +65,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -33,6 +33,7 @@
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>1.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OW2 FraSCAti Examples: Testing module</name>
......@@ -48,7 +49,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
......@@ -53,8 +53,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -53,8 +53,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -54,9 +54,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
......
......@@ -51,14 +51,10 @@
<repositories>
<repository>
<id>java.net-m2-repository</id>
<id>download.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
</repository>
<repository>
<id>maven-snapshot.ow2.org</id>
<name>OW2 Central Repository</name>
<url>http://maven.ow2.org/maven2-snapshot/</url>
</repository>
</repositories>
<dependencies>
......@@ -137,8 +133,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -55,7 +55,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......
......@@ -51,9 +51,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
......
......@@ -57,7 +57,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......@@ -66,20 +65,20 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swing-layout</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
</dependencies>
</project>
......@@ -37,24 +37,27 @@
<name>OW2 FraSCAti Examples</name>
<parent>
<groupId>org.ow2.frascati</groupId>
<artifactId>parent</artifactId>
<version>1.2-SNAPSHOT</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<logging.conf.file>../../../distribution/standalone/src/main/conf/logging.properties</logging.conf.file>
</properties>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<build>
<defaultGoal>package</defaultGoal>
<plugins>
<!-- ===== -->
<!-- Build -->
<!-- ===== -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
......@@ -66,73 +69,9 @@
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
<!-- ========= -->
<!-- Reporting -->
<!-- ========= -->
<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/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>
<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>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
......@@ -150,13 +89,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>objectweb-release</id>
<url>http://maven.ow2.org/maven2</url>
</repository>
</repositories>
<!-- ======== -->
<!-- Profiles -->
<!-- ======== -->
......
......@@ -53,8 +53,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......@@ -65,8 +64,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......@@ -65,9 +64,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.frascati.examples.test</groupId>
<artifactId>frascati-test</artifactId>
......
......@@ -57,7 +57,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
</plugin>
</plugins>
</build>
......@@ -66,8 +65,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -248,7 +248,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<version>4.6</version>
<scope>test</scope>
</dependency>
......
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