aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorManolo Carrasco <manolo@vaadin.com>2016-07-19 12:50:47 +0200
committerManolo Carrasco <manolo@vaadin.com>2016-07-19 12:50:47 +0200
commitdec6787bda853a4ded558c6c545b9d5c24d188e7 (patch)
tree6fdf1b093e0d211dcb1fffc2b695e157d2fba798 /pom.xml
parent45f92ac0e09749e994af190149581aa5542a536f (diff)
parent5aee23ed30ae1cffce205888acd6ea76e599a46c (diff)
downloadvaadin-framework-feature/elements.tar.gz
vaadin-framework-feature/elements.zip
Merge branch 'master' into feature/elementsfeature/elements
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml15
1 files changed, 14 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index c6059ad8af..5f5eac095d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<!-- Atmosphere versions -->
<!-- Note that this should be kept in sync with the class Constants -->
<atmosphere.runtime.version>2.2.9.vaadin2</atmosphere.runtime.version>
- <atmosphere.js.version>2.2.13.vaadin3</atmosphere.js.version>
+ <atmosphere.js.version>2.2.13.vaadin5</atmosphere.js.version>
<!-- Dependency unpack directory -->
<dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
@@ -232,6 +232,19 @@
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<executions>