From 0055a460334ecd77e271ca05b78ae5a559b05d23 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 25 Aug 2016 11:46:16 +0300
Subject: [PATCH] Reintroduce variables used in OSGi manifests

Change-Id: I4c0d5cb06eea524b5514e963d8915fd917c7271d
---
 pom.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d6f6586888..18f4d20efc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,14 @@
 		<vaadin.gwt.version>2.8.0-rc2</vaadin.gwt.version>
 		<vaadin.plugin.version>8.0-SNAPSHOT</vaadin.plugin.version>
 
+		<!-- Used in OSGi manifests -->
+		<javax.validation.version>1.0.0.GA</javax.validation.version>
+		<jsoup.version>1.8.3</jsoup.version>
+		<javax.portlet.version>2.0</javax.portlet.version>
+		<vaadin.sass.version>0.9.13</vaadin.sass.version>
+		<!-- Note that this should be kept in sync with the class Constants -->
+		<atmosphere.runtime.version>2.4.5.vaadin1</atmosphere.runtime.version>
+
 		<!-- OSGi -->
 		<osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version>
 		<osgi.execution.environment>JavaSE-1.8</osgi.execution.environment>
@@ -126,7 +134,7 @@
 			<dependency>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-sass-compiler</artifactId>
-				<version>0.9.13</version>
+				<version>${vaadin.sass.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.carrotsearch</groupId>
@@ -151,8 +159,7 @@
 			<dependency>
 				<groupId>com.vaadin.external.atmosphere</groupId>
 				<artifactId>atmosphere-runtime</artifactId>
-				<!-- Note that this should be kept in sync with the class Constants -->
-				<version>2.4.5.vaadin1</version>
+				<version>${atmosphere.runtime.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.vaadin.external.atmosphere.client</groupId>
@@ -178,7 +185,7 @@
 			<dependency>
 				<groupId>javax.portlet</groupId>
 				<artifactId>portlet-api</artifactId>
-				<version>2.0</version>
+				<version>${javax.portlet.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.appengine</groupId>
@@ -188,7 +195,7 @@
 			<dependency>
 				<groupId>javax.validation</groupId>
 				<artifactId>validation-api</artifactId>
-				<version>1.0.0.GA</version>
+				<version>${javax.validation.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
@@ -198,7 +205,7 @@
 			<dependency>
 				<groupId>org.jsoup</groupId>
 				<artifactId>jsoup</artifactId>
-				<version>1.8.3</version>
+				<version>${jsoup.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
-- 
2.39.5