Change-Id: Ie9281ff5e9805be89942bf3ca8259740f49e15abtags/7.1.0
@@ -11,7 +11,6 @@ | |||
<classpathentry kind="src" path="uitest/src"/> | |||
<classpathentry kind="src" path="buildhelpers/src"/> | |||
<classpathentry kind="src" path="shared/src"/> | |||
<classpathentry kind="src" path="push/src"/> | |||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> | |||
<attributes> | |||
<attribute name="owner.project.facets" value="java"/> |
@@ -13,7 +13,7 @@ | |||
<property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" /> | |||
<!-- Keep the version number in sync with ivy.xml --> | |||
<property name="atmosphere.version" value="1.0.12" /> | |||
<property name="atmosphere.version" value="1.0.13" /> | |||
<property name="jquery.version" value="1.7.2" /> | |||
<path id="classpath.compile.custom" /> | |||
@@ -62,7 +62,6 @@ | |||
<antcall target="common.sources.jar"> | |||
<reference torefid="extra.jar.includes" refid="jar.includes" /> | |||
</antcall> | |||
<antcall target="common.javadoc.jar" /> | |||
<antcall target="common.publish-local" /> | |||
</target> | |||
@@ -28,7 +28,7 @@ | |||
<!-- Atmosphere --> | |||
<!-- Keep the version number in sync with build.xml --> | |||
<dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.12" | |||
<dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.13" | |||
conf="build,ide,test -> default"> | |||
</dependency> | |||
</dependencies> |
@@ -65,11 +65,11 @@ public interface Constants { | |||
+ " Widgetset version: %s\n" | |||
+ "================================================================="; | |||
static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.12"; | |||
static final String REQUIRED_ATMOSPHERE_VERSION = "1.0.13"; | |||
static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" | |||
+ "=================================================================\n" | |||
+ "Vaadin depends on Atomsphere {0} but version {1} was found.\n" | |||
+ "Vaadin depends on Atmosphere {0} but version {1} was found.\n" | |||
+ "This might cause compatibility problems if push is used.\n" | |||
+ "================================================================="; | |||
@@ -42,5 +42,5 @@ public class PushConstants implements Serializable { | |||
* The character used to mark message boundaries when messages may be split | |||
* into multiple fragments. | |||
*/ | |||
public static final char MESSAGE_DELIMITER = '\0'; | |||
public static final char MESSAGE_DELIMITER = '|'; | |||
} |