Build vaadin-all with maven

Change-Id: I87aef5ee0b35ff8746a182192706f236afaef32d

.gitignore

@@ -84,6 +84,7 @@ scripts/*.pyc
 # build result folders
 */result
 result
+all/target/
 push/target/
 shared/target/
 server/target/

all/all-assembly-descriptor.xml

@@ -0,0 +1,24 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>bin</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory />
+			<useProjectArtifact>false</useProjectArtifact>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+	</dependencySets>
+	<fileSets>
+		<fileSet>
+			<outputDirectory />
+			<directory>${webcontent.dir}</directory>
+		</fileSet>
+	</fileSets>
+</assembly>

all/build.xml

@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-all" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
-    <description>
-        Compiles a zip containing all jars + dependencies
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-all" />
-    <property name="result.dir" value="result" />
-    <property name="javadoc.jar"
-        location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" />
-    <property name="temp.dir" location="${result.dir}/temp" />
-    <property name="temp.deps.dir" value="${temp.dir}/lib" />
-    <property name="javadoc.temp.dir" location="${result.dir}/javadoc-temp" />
-    <property name="zip.file"
-        location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
-
-    <path id="classpath.javadoc">
-        <fileset dir="${temp.deps.dir}" includes="*.jar">
-        </fileset>
-    </path>
-    <target name="fetch.module.and.dependencies">
-        <fail unless="module" message="No 'module' parameter given" />
-
-        <ivy:cachepath pathid="module.and.deps" inline="true"
-            organisation="com.vaadin" module="vaadin-${module}"
-            revision="${vaadin.version}" />
-        <copy todir="${temp.dir}" flatten="true">
-            <path refid="module.and.deps" />
-        </copy>
-    </target>
-
-    <target name="unzip.to.javadoctemp">
-        <property name="file"
-            location="${temp.dir}/vaadin-${module}-${vaadin.version}.jar" />
-        <unzip src="${file}" dest="${javadoc.temp.dir}" />
-    </target>
-
-    <target name="javadoc" depends="copy-jars">
-        <antcontrib:if>
-            <isset property="nojavadoc" />
-            <then>
-                <jar file="${javadoc.jar}" compress="true">
-                    <!-- <fileset dir="${common.jarfiles.dir}" /> -->
-                </jar>
-            </then>
-            <else>
-                <!-- Unpack all source files to javadoc.temp.dir -->
-                <antcontrib:foreach list="${modules.producing.jar}"
-                    target="unzip.to.javadoctemp" param="module" />
-
-                <property name="javadoc.dir" location="${result.dir}/javadoc" />
-                <property name="title" value="Vaadin ${vaadin.version} API" />
-                <javadoc maxmemory="1024m" destdir="${javadoc.dir}"
-                    author="true" version="true" use="true" windowtitle="${title}"
-                    encoding="utf-8" stylesheetfile="javadoc.css">
-                    <packageset dir="${javadoc.temp.dir}">
-                        <!-- TODO Javadoc throws ClassCastException if this 
-                            is included (#9660) -->
-                        <exclude
-                            name="com/google/gwt/uibinder/elementparsers" />
-                    </packageset>
-                    <doctitle>&lt;h1>${title}&lt;/h1></doctitle>
-                    <!-- <header><![CDATA[<script type="text/javascript" 
-                        src=".html-style/style.js"></script>]]></header> -->
-                    <bottom>${javadoc.bottom}</bottom>
-                    <link offline="true"
-                        href="http://docs.oracle.com/javase/6/docs/api/"
-                        packagelistLoc="build/javadoc/j2se-1.6.0" />
-                    <link offline="true"
-                        href="http://java.sun.com/j2ee/1.4/docs/api/"
-                        packagelistLoc="build/javadoc/j2ee-1.4" />
-                    <classpath refid="classpath.javadoc" />
-                </javadoc>
-
-                <!-- Create a javadoc jar -->
-                <jar file="${javadoc.jar}" compress="true">
-                    <fileset dir="${javadoc.dir}" />
-                    <!-- <fileset dir="${common.jarfiles.dir}" /> -->
-                </jar>
-            </else>
-        </antcontrib:if>
-    </target>
-
-    <target name="copy-jars">
-        <delete dir="${temp.dir}" />
-        <antcontrib:foreach list="${modules.producing.jar}"
-            target="fetch.module.and.dependencies" param="module" />
-        <!-- All jars are now in temp.dir. Still need to separate vaadin 
-            and deps -->
-        <move todir="${temp.deps.dir}">
-            <fileset dir="${temp.dir}">
-                <exclude name="vaadin-*-${vaadin.version}.*" />
-                <exclude name="vaadin-*-${vaadin.version}-*.*" />
-            </fileset>
-        </move>
-
-
-    </target>
-    <target name="zip" depends="copy-jars, javadoc">
-        <zip destfile="${zip.file}">
-            <fileset dir="${temp.dir}">
-                <!-- Avoid conflicts with servlet and portlet API. They are 
-                    provided by the container -->
-                <exclude name="**/servlet-api*" />
-                <exclude name="**/portlet-api*" />
-                <exclude name="**/portal-service-*" />
-                <!-- Buildhelpers should not even get here ... -->
-                <exclude name="*buildhelpers*" />
-                <!-- Zip users should not need javadoc, sources or pom files -->
-                <exclude name="*.pom" />
-                <exclude name="*-javadoc.jar" />
-                <exclude name="*-sources.jar" />
-            </fileset>
-            <!-- <fileset dir="${common.jarfiles.dir}" /> -->
-            <fileset dir="${result.dir}/..">
-                <include name="README.TXT" />
-            </fileset>
-            <!-- Do not include javadoc jar in zip as it is huge (> 40MB) 
-                and most people do not need it. -->
-        </zip>
-    </target>
-
-    <target name="publish-local" depends="zip">
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-    <target name="checkstyle">
-        <!-- Checkstyle is handled by all separate modules -->
-    </target>
-    <target name="test" depends="checkstyle">
-        <!-- No tests for this zip.. -->
-    </target>
-
-</project>

all/ivy.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-all" revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-    </configurations>
-    <publications>
-        <artifact type="zip" ext="zip" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-    </publications>
-    <dependencies defaultconf="build">
-        <!-- API DEPENDENCIES -->
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-client-compiled"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-widgets" rev="${vaadin.version}" />
-
-    </dependencies>
-
-</ivy-module>

all/pom.xml

@@ -0,0 +1,271 @@
+<?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>
+	<artifactId>vaadin-all</artifactId>
+	<name>vaadin-all</name>
+	<packaging>pom</packaging>
+
+	<properties>
+		<relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file>
+		<relnotes.authors.file>${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html</relnotes.authors.file>
+		<webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir>
+		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
+	</properties>
+
+	<organization>
+		<name>Vaadin Ltd</name>
+	</organization>
+	<url>https://vaadin.com/</url>
+	<description>Vaadin All package</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-shared</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-push</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-themes</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client-compiler</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client-compiled</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-widgets</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- Release Notes -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<phase>initialize</phase>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter-release-notes</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<loadfile property="release-notes-tickets" srcFile="${relnotes.tickets.file}"
+									failonerror="false" />
+								<loadfile property="release-notes-authors" srcFile="${relnotes.authors.file}"
+									failonerror="false" />
+								<copy todir="${webcontent.dir}">
+									<fileset dir="src/main/templates/">
+										<patternset>
+											<include name="release-notes.html" />
+										</patternset>
+									</fileset>
+									<filterchain>
+										<expandproperties />
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="version" value="${project.version}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="version-minor"
+												value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="builddate" value="${maven.build.timestamp}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="release-notes-tickets" value="${release-notes-tickets}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="release-notes-authors" value="${release-notes-authors}" />
+										</replacetokens>
+									</filterchain>
+								</copy>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- vaadin-all zip -->
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+					<appendAssemblyId>false</appendAssemblyId>
+					<descriptors>
+						<descriptor>all-assembly-descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
+
+			<!-- Skip install and deploy -->
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			
+			<!-- Release notes helpers and resources -->
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>resources</id>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- TODO: Combination javadocs -->
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>release</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>1.4.0</version>
+						<executions>
+							<execution>
+								<id>fetch-release-notes-tickets</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<classpathScope>compile</classpathScope>
+									<executable>${java.home}/bin/java</executable>
+									<arguments>
+										<argument>-Dvaadin.version=${project.version}</argument>
+										<argument>-classpath</argument>
+										<classpath />
+
+										<argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets</argument>
+									</arguments>
+									<outputFile>${relnotes.tickets.file}</outputFile>
+								</configuration>
+							</execution>
+							<execution>
+								<id>fetch-release-notes-authors</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<classpathScope>compile</classpathScope>
+									<executable>${java.home}/bin/java</executable>
+									<arguments>
+										<argument>-Dvaadin.version=${project.version}</argument>
+										<argument>-classpath</argument>
+										<classpath />
+
+										<argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors</argument>
+									</arguments>
+									<outputFile>${relnotes.authors.file}</outputFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>

build.xml

@@ -27,7 +27,7 @@
 		<path id="build-path">
 			<!--    <path location="buildhelpers/build.xml" /> -->
 			<path refid="ivy.build.path" />
-			<path location="all/build.xml" />
+			<!-- <path location="all/build.xml" /> -->
 		</path>
 	</target>
 	<target name="clean" depends="buildorder">

buildhelpers/pom.xml

@@ -12,13 +12,6 @@
 	<name>vaadin-buildhelpers</name>
 	<packaging>jar</packaging>
 
-	<properties>
-		<relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file>
-		<relnotes.authors.file>${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html</relnotes.authors.file>
-		<webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir>
-		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
-	</properties>
-
 	<organization>
 		<name>Vaadin Ltd</name>
 	</organization>
@@ -51,68 +44,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<phase>initialize</phase>
-						<id>parse-version</id>
-						<goals>
-							<goal>parse-version</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>filter-release-notes</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<loadfile property="release-notes-tickets" srcFile="${relnotes.tickets.file}"
-									failonerror="false" />
-								<loadfile property="release-notes-authors" srcFile="${relnotes.authors.file}"
-									failonerror="false" />
-								<copy todir="${webcontent.dir}">
-									<fileset dir="src/main/templates/">
-										<patternset>
-											<include name="release-notes.html" />
-										</patternset>
-									</fileset>
-									<filterchain>
-										<expandproperties />
-										<replacetokens begintoken="@" endtoken="@">
-											<token key="version" value="${project.version}" />
-										</replacetokens>
-										<replacetokens begintoken="@" endtoken="@">
-											<token key="version-minor"
-												value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}" />
-										</replacetokens>
-										<replacetokens begintoken="@" endtoken="@">
-											<token key="builddate" value="${maven.build.timestamp}" />
-										</replacetokens>
-										<replacetokens begintoken="@" endtoken="@">
-											<token key="release-notes-tickets" value="${release-notes-tickets}" />
-										</replacetokens>
-										<replacetokens begintoken="@" endtoken="@">
-											<token key="release-notes-authors" value="${release-notes-authors}" />
-										</replacetokens>
-									</filterchain>
-								</copy>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -125,14 +56,6 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**/*.properties</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<configuration>
@@ -141,62 +64,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>release</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.4.0</version>
-						<executions>
-							<execution>
-								<id>fetch-release-notes-tickets</id>
-								<phase>process-classes</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<classpathScope>compile</classpathScope>
-									<executable>${java.home}/bin/java</executable>
-									<arguments>
-										<argument>-Dvaadin.version=${project.version}</argument>
-										<argument>-classpath</argument>
-										<classpath />
-
-										<argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets</argument>
-									</arguments>
-									<outputFile>${relnotes.tickets.file}</outputFile>
-								</configuration>
-							</execution>
-							<execution>
-								<id>fetch-release-notes-authors</id>
-								<phase>process-classes</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<classpathScope>compile</classpathScope>
-									<executable>${java.home}/bin/java</executable>
-									<arguments>
-										<argument>-Dvaadin.version=${project.version}</argument>
-										<argument>-classpath</argument>
-										<classpath />
-
-										<argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors</argument>
-									</arguments>
-									<outputFile>${relnotes.authors.file}</outputFile>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>

pom.xml

@@ -60,6 +60,7 @@
 	<description>Vaadin Framework Root Pom</description>
 
 	<modules>
+		<module>all</module>
 		<module>buildhelpers</module>
 		<module>bom</module>
 		<module>shared</module>