summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-31 11:14:44 +0300
committerVaadin Code Review <review@vaadin.com>2016-03-31 13:48:52 +0000
commitbbd3549959ca6d7fbd9a78b85c5a6fa1121e00b8 (patch)
tree1b7647834f257190ccd8bad1de374cd2d24d9f49
parenta82561b309f62cae4bce105403343e0b73998e64 (diff)
downloadvaadin-framework-bbd3549959ca6d7fbd9a78b85c5a6fa1121e00b8.tar.gz
vaadin-framework-bbd3549959ca6d7fbd9a78b85c5a6fa1121e00b8.zip
Build vaadin-all with maven
Change-Id: I87aef5ee0b35ff8746a182192706f236afaef32d
-rw-r--r--.gitignore1
-rw-r--r--all/all-assembly-descriptor.xml24
-rw-r--r--all/build.xml142
-rw-r--r--all/ivy.xml38
-rw-r--r--all/pom.xml271
-rw-r--r--all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java (renamed from buildhelpers/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java)0
-rw-r--r--all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java (renamed from buildhelpers/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java)0
-rw-r--r--all/src/main/resources/WebContent/css/ie.css (renamed from buildhelpers/src/main/resources/WebContent/css/ie.css)0
-rw-r--r--all/src/main/resources/WebContent/css/styles.css (renamed from buildhelpers/src/main/resources/WebContent/css/styles.css)0
-rw-r--r--all/src/main/resources/WebContent/img/vaadin-logo.png (renamed from buildhelpers/src/main/resources/WebContent/img/vaadin-logo.png)bin3649 -> 3649 bytes
-rw-r--r--all/src/main/resources/WebContent/license.html (renamed from buildhelpers/src/main/resources/WebContent/license.html)0
-rw-r--r--all/src/main/resources/WebContent/licenses/OFL.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/OFL.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/cup-open-source-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/cup-open-source-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/google-bsd-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/google-bsd-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/jetty-web-container-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/jetty-web-container-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/new-bsd-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/new-bsd-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/ow2-asm-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/ow2-asm-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/the-json-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/the-json-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/the-mit-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/the-mit-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/the-mx4j-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/the-mx4j-license.txt)0
-rw-r--r--all/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt (renamed from buildhelpers/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt)0
-rw-r--r--all/src/main/resources/com/vaadin/buildhelpers/authormap.properties (renamed from buildhelpers/src/main/resources/com/vaadin/buildhelpers/authormap.properties)0
-rw-r--r--all/src/main/templates/release-notes.html (renamed from buildhelpers/src/main/templates/release-notes.html)0
-rw-r--r--build.xml2
-rw-r--r--buildhelpers/pom.xml135
-rw-r--r--pom.xml1
35 files changed, 298 insertions, 316 deletions
diff --git a/.gitignore b/.gitignore
index e93f78b267..e3909d5656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@ scripts/*.pyc
# build result folders
*/result
result
+all/target/
push/target/
shared/target/
server/target/
diff --git a/all/all-assembly-descriptor.xml b/all/all-assembly-descriptor.xml
new file mode 100644
index 0000000000..a514c5276f
--- /dev/null
+++ b/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>
diff --git a/all/build.xml b/all/build.xml
deleted file mode 100644
index ee29a5de49..0000000000
--- a/all/build.xml
+++ /dev/null
@@ -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>
diff --git a/all/ivy.xml b/all/ivy.xml
deleted file mode 100644
index 156588485f..0000000000
--- a/all/ivy.xml
+++ /dev/null
@@ -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>
diff --git a/all/pom.xml b/all/pom.xml
new file mode 100644
index 0000000000..e28323627e
--- /dev/null
+++ b/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>
diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
index cd85ca6a3f..cd85ca6a3f 100644
--- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
+++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
diff --git a/buildhelpers/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
index 0cd06890eb..0cd06890eb 100644
--- a/buildhelpers/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
+++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
diff --git a/buildhelpers/src/main/resources/WebContent/css/ie.css b/all/src/main/resources/WebContent/css/ie.css
index 4ddd2f51c8..4ddd2f51c8 100644
--- a/buildhelpers/src/main/resources/WebContent/css/ie.css
+++ b/all/src/main/resources/WebContent/css/ie.css
diff --git a/buildhelpers/src/main/resources/WebContent/css/styles.css b/all/src/main/resources/WebContent/css/styles.css
index 9bd03ae8bc..9bd03ae8bc 100644
--- a/buildhelpers/src/main/resources/WebContent/css/styles.css
+++ b/all/src/main/resources/WebContent/css/styles.css
diff --git a/buildhelpers/src/main/resources/WebContent/img/vaadin-logo.png b/all/src/main/resources/WebContent/img/vaadin-logo.png
index 4096aecbab..4096aecbab 100644
--- a/buildhelpers/src/main/resources/WebContent/img/vaadin-logo.png
+++ b/all/src/main/resources/WebContent/img/vaadin-logo.png
Binary files differ
diff --git a/buildhelpers/src/main/resources/WebContent/license.html b/all/src/main/resources/WebContent/license.html
index fe37813e57..fe37813e57 100644
--- a/buildhelpers/src/main/resources/WebContent/license.html
+++ b/all/src/main/resources/WebContent/license.html
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/OFL.txt b/all/src/main/resources/WebContent/licenses/OFL.txt
index f1a20ac1a8..f1a20ac1a8 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/OFL.txt
+++ b/all/src/main/resources/WebContent/licenses/OFL.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt b/all/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt
index d645695673..d645695673 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt
+++ b/all/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt b/all/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt
index 5cf7a215ec..5cf7a215ec 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt
+++ b/all/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/cup-open-source-license.txt b/all/src/main/resources/WebContent/licenses/cup-open-source-license.txt
index e14ea3019d..e14ea3019d 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/cup-open-source-license.txt
+++ b/all/src/main/resources/WebContent/licenses/cup-open-source-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt b/all/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt
index d2d1968d3a..d2d1968d3a 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt
+++ b/all/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt
index f97ef7272e..f97ef7272e 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt
+++ b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt
index f20c547bd0..f20c547bd0 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt
+++ b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/google-bsd-license.txt b/all/src/main/resources/WebContent/licenses/google-bsd-license.txt
index 705db579c9..705db579c9 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/google-bsd-license.txt
+++ b/all/src/main/resources/WebContent/licenses/google-bsd-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt b/all/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt
index f8ad5bc2ba..f8ad5bc2ba 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt
+++ b/all/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt b/all/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt
index bb5c29ab98..bb5c29ab98 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt
+++ b/all/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/jetty-web-container-license.txt b/all/src/main/resources/WebContent/licenses/jetty-web-container-license.txt
index 21d4ed3d0e..21d4ed3d0e 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/jetty-web-container-license.txt
+++ b/all/src/main/resources/WebContent/licenses/jetty-web-container-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt b/all/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt
index 7714141d15..7714141d15 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt
+++ b/all/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/new-bsd-license.txt b/all/src/main/resources/WebContent/licenses/new-bsd-license.txt
index 40db12f902..40db12f902 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/new-bsd-license.txt
+++ b/all/src/main/resources/WebContent/licenses/new-bsd-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/ow2-asm-license.txt b/all/src/main/resources/WebContent/licenses/ow2-asm-license.txt
index b8ed869a5c..b8ed869a5c 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/ow2-asm-license.txt
+++ b/all/src/main/resources/WebContent/licenses/ow2-asm-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt b/all/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt
index 0f63e3bfb0..0f63e3bfb0 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt
+++ b/all/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/the-json-license.txt b/all/src/main/resources/WebContent/licenses/the-json-license.txt
index 85380e76a7..85380e76a7 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/the-json-license.txt
+++ b/all/src/main/resources/WebContent/licenses/the-json-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/the-mit-license.txt b/all/src/main/resources/WebContent/licenses/the-mit-license.txt
index 764a44ba72..764a44ba72 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/the-mit-license.txt
+++ b/all/src/main/resources/WebContent/licenses/the-mit-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/the-mx4j-license.txt b/all/src/main/resources/WebContent/licenses/the-mx4j-license.txt
index 267787a201..267787a201 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/the-mx4j-license.txt
+++ b/all/src/main/resources/WebContent/licenses/the-mx4j-license.txt
diff --git a/buildhelpers/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt b/all/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt
index a5f52260b4..a5f52260b4 100644
--- a/buildhelpers/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt
+++ b/all/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt
diff --git a/buildhelpers/src/main/resources/com/vaadin/buildhelpers/authormap.properties b/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties
index 15b8ad2cba..15b8ad2cba 100644
--- a/buildhelpers/src/main/resources/com/vaadin/buildhelpers/authormap.properties
+++ b/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties
diff --git a/buildhelpers/src/main/templates/release-notes.html b/all/src/main/templates/release-notes.html
index 4286b3ace0..4286b3ace0 100644
--- a/buildhelpers/src/main/templates/release-notes.html
+++ b/all/src/main/templates/release-notes.html
diff --git a/build.xml b/build.xml
index 0c50b377b0..e68eb9e2dd 100644
--- a/build.xml
+++ b/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">
diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml
index 3fe7c0ab09..977f44dea4 100644
--- a/buildhelpers/pom.xml
+++ b/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>
@@ -52,68 +45,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>
<configuration>
@@ -126,14 +57,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.properties</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -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>
diff --git a/pom.xml b/pom.xml
index b373ed10f5..b656315530 100644
--- a/pom.xml
+++ b/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>