Introduce root pom.xml to ease building with maven

Change-Id: Ib1252575da642074441818fda0f3946df300aa64

diff --git a/ivysettings.xml b/ivysettings.xml
index 5502a5c3a555048a384ad8a1c7a635e3c8910ed4..0dae777b2cc383e5ee96e4c07d2641d2d3b6680a 100644 (file)
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -37,6 +37,8 @@
             resolver="vaadin-addons" />
         <module organisation="com.vaadin" name="vaadin-buildhelpers"
             resolver="build-temp" />
+        <module organisation="com.vaadin" name="vaadin-root"
+            resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-shared"
             resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-server"

diff --git a/pom.xml b/pom.xml
new file mode 100644 (file)
index 0000000..fd0548d
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>com.vaadin</groupId>
+               <artifactId>vaadin-parent</artifactId>
+               <version>1.0.0</version>
+       </parent>
+       <groupId>com.vaadin</groupId>
+       <artifactId>vaadin-root</artifactId>
+       <name>vaadin-root</name>
+       <packaging>pom</packaging>
+       <version>7.7.0-SNAPSHOT</version>
+
+       <properties>
+               <maven.compiler.source>1.6</maven.compiler.source>
+               <maven.compiler.target>1.6</maven.compiler.target>
+
+               <!-- Used version numbers for dependencies -->
+               <vaadin.sass.version>0.9.13</vaadin.sass.version>
+               <commons-io.version>2.4</commons-io.version>
+               <guava.version>16.0.1.vaadin1</guava.version>
+               <vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
+
+               <!-- Atmosphere versions -->
+               <atmosphere.runtime.version>2.2.7.vaadin1</atmosphere.runtime.version>
+               <atmosphere.js.version>2.2.6.vaadin4</atmosphere.js.version>
+       </properties>
+
+       <organization>
+               <name>Vaadin Ltd</name>
+       </organization>
+       <url>https://vaadin.com/</url>
+       <description>Vaadin Framework Root Pom</description>
+
+       <modules>
+               <module>shared</module>
+               <module>push</module>
+               <module>server</module>
+       </modules>
+
+</project>

diff --git a/push/pom.xml b/push/pom.xml
index 3bbdc931c5bddf80ad79963feddecfc6a0ce6abb..3b3325a803b49ea84ad29b9eed35bd3800f90604 100644 (file)
--- a/push/pom.xml
+++ b/push/pom.xml
@@ -4,17 +4,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.vaadin</groupId>
-        <artifactId>vaadin-parent</artifactId>
-        <version>1.0.0</version>
+        <artifactId>vaadin-root</artifactId>
+        <version>7.7.0-SNAPSHOT</version>
     </parent>
-    <groupId>com.vaadin</groupId>
     <artifactId>vaadin-push</artifactId>
     <name>Vaadin Push</name>
     <packaging>jar</packaging>
-    <version>7.7.0-SNAPSHOT</version>
     <properties>
-        <atmosphere.runtime.version>2.2.7.vaadin1</atmosphere.runtime.version>
-        <atmosphere.js.version>2.2.6.vaadin4</atmosphere.js.version>
+
     </properties>
     
     <organization>

diff --git a/server/pom.xml b/server/pom.xml
index 0c986a5b18265ed1ba19ea3a4dc289f470162092..7676f02de25d33b707921d2017fa884e7e8ab3d1 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -4,31 +4,19 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-parent</artifactId>
-               <version>1.0.0</version>
+               <artifactId>vaadin-root</artifactId>
+               <version>7.7.0-SNAPSHOT</version>
        </parent>
        <groupId>com.vaadin</groupId>
        <artifactId>vaadin-server</artifactId>
        <name>vaadin-server</name>
        <packaging>jar</packaging>
-       <version>7.7.0-SNAPSHOT</version>
-
-       <properties>
-               <maven.compiler.source>1.6</maven.compiler.source>
-               <maven.compiler.target>1.6</maven.compiler.target>
-               <!-- Used version numbers for dependencies -->
-               <vaadin.sass.version>0.9.13</vaadin.sass.version>
-               <commons-io.version>2.4</commons-io.version>
-               <guava.version>16.0.1.vaadin1</guava.version>
-               <!-- TODO: Move to Parent -->
-               <vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
-       </properties>
 
        <organization>
                <name>Vaadin Ltd</name>
        </organization>
        <url>https://vaadin.com/</url>
-       <description>Vaadin shared</description>
+       <description>Vaadin server</description>
 
        <dependencies>
                <!-- API DEPENDENCIES -->

diff --git a/shared/pom.xml b/shared/pom.xml
index f5e24086b6ad3ca94647bf57bda618ff3434e8bf..8941a3a8925d93ef7b0661570761503420dcb1d2 100644 (file)
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -4,24 +4,16 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-parent</artifactId>
-               <version>1.0.0</version>
+               <artifactId>vaadin-root</artifactId>
+               <version>7.7.0-SNAPSHOT</version>
        </parent>
-       <groupId>com.vaadin</groupId>
        <artifactId>vaadin-shared</artifactId>
        <name>vaadin-shared</name>
        <packaging>jar</packaging>
-       <version>7.7.0-SNAPSHOT</version>
 
        <properties>
-               <maven.compiler.source>1.6</maven.compiler.source>
-               <maven.compiler.target>1.6</maven.compiler.target>
-               <!-- Used version numbers for dependencies -->
                <flute.version>1.3.0.gg2</flute.version>
                <streamhtmlparser.version>0.0.10.vaadin1</streamhtmlparser.version>
-               <guava.version>16.0.1.vaadin1</guava.version>
-               <!-- TODO: Move to Parent -->
-               <vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
        </properties>
 
        <organization>
@@ -168,7 +160,7 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
@@ -183,7 +175,7 @@
                                        </archive>
                                </configuration>
                        </plugin>
-                       
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>