Migrate vaadin-shared build to maven

Change-Id: I4ddc5050874faeb091740ac5ab4f9cafecf5696b

.gitignore

@@ -1,10 +1,11 @@
+# Eclipse
+.classpath
+.project
+.settings
 
 # /
-/.classpath
 /.cvsignore
-/.project
 /.tomcatplugin
-/.settings
 /work
 /.gwt-cache
 /.externalToolBuilders
@@ -84,6 +85,7 @@ scripts/*.pyc
 */result
 result
 push/target/
+shared/target/
 
 .sass-cache
-phantomjsdriver.log
+phantomjsdriver.log

build/ide.xml

@@ -34,7 +34,7 @@
             <path refid="gwt.deps" />
             <path refid="uitest.deps" />
             <path location="server/src" />
-            <path location="shared/src" />
+            <path location="shared/src/main/java" />
             <path location="uitest/src" />
             <path location="client/src" />
         </path>

client-compiler/ivy.xml

@@ -21,7 +21,7 @@
     </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build" />
+            rev="${vaadin.version}" conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="build" />
         <dependency org="com.vaadin" name="vaadin-client"

client/ivy.xml

@@ -25,7 +25,7 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,test->build">
+            rev="${vaadin.version}" conf="build,test->default">
             <exclude type="pom" conf="test" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-server"

ivysettings.xml

@@ -38,7 +38,7 @@
         <module organisation="com.vaadin" name="vaadin-buildhelpers"
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-shared"
-            resolver="build-temp" />
+            resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-server"
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-client"

server/ivy.xml

@@ -51,7 +51,7 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,test->build">
+            rev="${vaadin.version}" conf="build,test->default">
             <exclude type="pom" conf="test" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"

shared/build.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-shared" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        The shared module containing classes used by both server and client.
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-shared" />
-    <property name="module.symbolic" value="com.vaadin.shared" />
-    <property name="result.dir" location="result" />
-    <property name="src.filtered" location="${result.dir}/filtered-src" />
-    <property name="src" location="${src.filtered}" />
-    <path id="classpath.compile.custom">
-        <fileset file="${gwt.elemental.jar}" />
-    </path>
-    <path id="classpath.test.custom" />
-
-    <target name="jar">
-        <property name="shared.osgi.import"
-            value="com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
-        <property name="shared.osgi.require-bundle"
-            value="com.google.gwt.thirdparty.guava;bundle-version=&quot;16.0.1.vaadin1&quot;" />
-        <delete dir="${src.filtered}" />
-        <!-- Update version in Version.java -->
-        <copy todir="${src.filtered}">
-            <fileset dir="src">
-            </fileset>
-            <filterchain>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="VERSION" value="${vaadin.version}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-
-        <antcall target="common.jar">
-            <param name="import-package" value="${shared.osgi.import}" />
-            <param name="require-bundle" value="${shared.osgi.require-bundle}" />
-            <reference refid="shared.gwt.includes" torefid="extra.jar.includes" />
-            <param name="osgi.extra.package.prefixes" value="elemental" />
-        </antcall>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <reference torefid="extra.jar.includes" refid="shared.gwt.includes" />
-        </antcall>
-        <antcall target="common.javadoc.jar" />
-
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <antcall target="common.test.run" />
-    </target>
-
-</project>

shared/ivy.xml

@@ -8,28 +8,17 @@
         revision="${vaadin.version}" />
 
     <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="test" />
     </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
+    
     <dependencies>
         <dependency org="com.vaadin.external.flute" name="flute"
-            rev="1.3.0.gg2" conf="build,ide,test->default" />
+            rev="1.3.0.gg2" conf="ide->default" />
         <dependency org="com.vaadin.external.streamhtmlparser"
             name="streamhtmlparser-jsilver" rev="0.0.10.vaadin1"
-            conf="build,ide,test->default" />
+            conf="ide->default" />
         <dependency org="com.vaadin.external.google" name="guava"
-            rev="16.0.1.vaadin1" conf="build,ide,test->default" />
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
-
+            rev="16.0.1.vaadin1" conf="ide->default" />
     </dependencies>
 
 </ivy-module>

shared/pom.xml

@@ -0,0 +1,195 @@
+<?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-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>
+		<name>Vaadin Ltd</name>
+	</organization>
+	<url>https://vaadin.com/</url>
+	<description>Vaadin shared</description>
+
+	<dependencies>
+		<!-- Actual dependencies -->
+		<dependency>
+			<groupId>com.vaadin.external.flute</groupId>
+			<artifactId>flute</artifactId>
+			<version>${flute.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.streamhtmlparser</groupId>
+			<artifactId>streamhtmlparser-jsilver</artifactId>
+			<version>${streamhtmlparser.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.google</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+
+		<!-- Needed GWT dependencies. Required parts are packaged to jar -->
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-elemental</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- Generated Version.java -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>templating-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>filter-sources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Copy needed GWT dependencies to package -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
+				<executions>
+					<execution>
+						<id>unpack-dependencies</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>unpack-dependencies</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-elemental</artifactId>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-user</artifactId>
+								</artifactItem>
+							</artifactItems>
+							<includes>elemental/json/**,elemental/util/Array*,elemental/util/Can*,elemental/util/Map*,com/google/gwt/*/shared/**,com/google/gwt/*/*/shared/**,com/google/web/bindery/*/shared/**,com/google/gwt/user/client/rpc/IsSerializable.*</includes>
+							<outputDirectory>${project.build.directory}/classes</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- Copy .java files to package -->
+					<execution>
+						<id>copy-sources</id>
+						<!-- here the phase you need -->
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/classes</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/java</directory>
+									<filtering>false</filtering>
+								</resource>
+								<resource>
+									<directory>${project.build.directory}/generated-sources/java-templates</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}",elemental.*;version="${project.version}"</Export-Package>
+						<Import-Package>com.google.gwt.thirdparty.streamhtmlparser;version="${streamhtmlparser.version}",
+							com.google.gwt.thirdparty.streamhtmlparser.impl;version="${streamhtmlparser.version}",
+							com.google.gwt.thirdparty.streamhtmlparser.util;version="${streamhtmlparser.version}",
+							org.w3c.flute.parser;version="${flute.version}",
+							org.w3c.flute.parser.selectors;version="${flute.version}",
+							org.w3c.flute.util;version="${flute.version}"</Import-Package>
+						<Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}"</Require-Bundle>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

shared/src/com/vaadin/shared/Version.java → shared/src/main/java-templates/com/vaadin/shared/Version.java

@@ -47,10 +47,10 @@ public class Version implements Serializable {
 
     /* Initialize version numbers from string replaced by build-script. */
     static {
-        if ("@VERSION@".equals("@" + "VERSION" + "@")) {
+        if ("${vaadin.version}".equals("${" + "vaadin.version" + "}")) {
             VERSION = "9.9.9.INTERNAL-DEBUG-BUILD";
         } else {
-            VERSION = "@VERSION@";
+            VERSION = "${vaadin.version}";
         }
         final String[] digits = VERSION.split("\\.", 4);
         VERSION_MAJOR = Integer.parseInt(digits[0]);