Build vaadin-client with maven

Change-Id: I36c426086a2b957f6f738d17470c499a01ddac3b

.classpath

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="server/src/test/java"/>
-	<classpathentry kind="src" path="client/tests/src"/>
+	<classpathentry kind="src" path="client/src/test/java"/>
 	<classpathentry kind="src" path="shared/src/test/java"/>
-	<classpathentry kind="src" path="client/src"/>
+	<classpathentry kind="src" path="client/src/main/java"/>
 	<classpathentry kind="src" path="server/src/main/java"/>
 	<classpathentry kind="src" path="client-compiler/src"/>
 	<classpathentry kind="src" path="client-compiler/tests/src"/>

.gitignore

@@ -87,6 +87,7 @@ result
 push/target/
 shared/target/
 server/target/
+client/target/
 
 .sass-cache
 phantomjsdriver.log

client-compiled/ivy.xml

@@ -24,7 +24,7 @@
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="compile-module-> default" />
         <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="compile-module-> build" />
+            rev="${vaadin.version}" conf="compile-module-> default" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"
             rev="${vaadin.version}" conf="compile-module-> build" />
     </dependencies>

client-compiler/ivy.xml

@@ -25,7 +25,7 @@
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="build,test" />
+            rev="${vaadin.version}" conf="build,test -> default" />
         <dependency org="com.vaadin" name="vaadin-sass-compiler"
             rev="${vaadin.sass.version}" conf="build,ide->default">
             <!-- remove cssparser override once sass-compiler is updated -->

client/build.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-client" basedir="." default="publish-local">
-    <description>
-        Compiles build helpers used when building other
-        modules.
-    </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-client" />
-    <property name="module.symbolic" value="com.vaadin.client" />
-    <property name="result.dir" value="result" />
-
-    <path id="classpath.compile.custom">
-        <!-- Could possibly compile GWT files also here to verify that a) 
-            the same dependencies are used and b) all dependencies have been declared -->
-        <fileset file="${gwt.user.jar}" />
-        <fileset file="${gwt.elemental.jar}" />
-    </path>
-    <path id="classpath.test.custom" />
-
-    <target name="jar">
-        <property name="jar.file"
-            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-        <antcall target="common.jar">
-            <reference refid="client.gwt.includes" torefid="extra.jar.includes" />
-        </antcall>
-        <jar destfile="${jar.file}" update="true">
-            <manifest>
-                <attribute name="Vaadin-Package-Version"
-                    value="1" />
-                <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
-            </manifest>
-        </jar>
-        <!-- Hack to add validation dependency with source classifier -->
-        <property name="pom.xml"
-            location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-        <copy file="${pom.xml}" tofile="${temp.pom}">
-            <filterchain>
-                <replacestring from="  &lt;/dependencies&gt;"
-                    to="    &lt;dependency&gt;
-               &lt;groupId&gt;javax.validation&lt;/groupId&gt;
-               &lt;artifactId&gt;validation-api&lt;/artifactId&gt;
-               &lt;version&gt;1.0.0.GA&lt;/version&gt;
-               &lt;scope&gt;compile&lt;/scope&gt;
-               &lt;classifier&gt;sources&lt;/classifier&gt;
-             &lt;/dependency&gt;
-  &lt;/dependencies&gt;" />
-            </filterchain>
-        </copy>
-        <move file="${temp.pom}" tofile="${pom.xml}" />
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <reference torefid="extra.jar.includes" refid="client.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>

client/ivy.xml

@@ -8,43 +8,13 @@
         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 defaultconf="build" defaultconfmapping="build,ide->default">
-        <!-- API DEPENDENCIES -->
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,test->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build,test->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- gwt-user dependencies -->
-        <dependency org="org.w3c.css" name="sac" rev="1.3" />
-
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test->default" />
-
-        <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build->default,sources" />
+    <dependencies defaultconf="build" defaultconfmapping="ide->default">
 
         <!-- Testing dependencies -->
         <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="test,ide-> default" />
+            conf="ide-> default" />
 
     </dependencies>
 

client/pom.xml

@@ -0,0 +1,218 @@
+<?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-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-client</artifactId>
+	<name>vaadin-client</name>
+	<packaging>jar</packaging>
+
+	<organization>
+		<name>Vaadin Ltd</name>
+	</organization>
+	<url>https://vaadin.com/</url>
+	<description>Vaadin client</description>
+
+	<dependencies>
+		<!-- LIBRARY DEPENDENCIES (compile time) -->
+		<!-- Project modules -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-shared</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-sass-compiler</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- gwt-user dependencies -->
+		<dependency>
+			<groupId>org.w3c.css</groupId>
+			<artifactId>sac</artifactId>
+			<version>1.3</version>
+		</dependency>
+
+		<!-- Bean Validation API -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${javax.validation.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${javax.validation.version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+
+		<!-- Testing dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>3.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Needed GWT dependencies. Required parts are packaged to jar -->
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-elemental</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<!-- 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</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-user</artifactId>
+									<excludes>
+										META-INF/**,
+										**/*.gwtar,
+										com/google/gwt/*/server/**,
+										com/google/gwt/*/shared/**,
+										com/google/gwt/*/*/shared/**,
+										com/google/web/bindery/*/shared/**,
+										com/google/gwt/user/client/rpc/IsSerializable.*,
+										com/google/gwt/thirdparty/streamhtmlparser/**,
+										org/w3c/**,
+										javax/servlet/**
+									</excludes>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-elemental</artifactId>
+									<excludes>META-INF/**</excludes>
+								</artifactItem>
+							</artifactItems>
+							<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/resources</directory>
+									<filtering>false</filtering>
+								</resource>
+								<resource>
+									<directory>src/main/java</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}"</Export-Package>
+					</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>
+						<manifestEntries>
+							<Vaadin-Package-Version>1</Vaadin-Package-Version>
+							<Vaadin-Widgetsets>com.vaadin.DefaultWidgetSet</Vaadin-Widgetsets>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>