diff options
| -rw-r--r-- | build/build.properties | 6 | ||||
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/build/build.properties b/build/build.properties index 82378c6dac..df8e6e77a8 100644 --- a/build/build.properties +++ b/build/build.properties @@ -10,10 +10,8 @@ snapshot.repository.url=http://oss.sonatype.org/content/repositories/vaadin-snap # These are required when compiling WebContent/VAADIN/widgetsets (and also # Java server-side classes). -# Using special -noservlet packages to be able to use a different version of -# the servlet specification than what the GWT JARs include. -lib-gwt-dev=${gwt-dir}/gwt-dev-noservlet.jar -lib-gwt-user=${gwt-dir}/gwt-user-noservlet.jar +lib-gwt-dev=${gwt-dir}/gwt-dev.jar +lib-gwt-user=${gwt-dir}/gwt-user.jar # FIXME: Should use ${gwt-version-dependencies} lib-gwt-validation=${gwt-dir}/validation-api-1.0.0.GA.jar lib-gwt-validation-src=${gwt-dir}/validation-api-1.0.0.GA-sources.jar diff --git a/build/build.xml b/build/build.xml index 897955ebb2..d1ba53bbba 100644 --- a/build/build.xml +++ b/build/build.xml @@ -786,7 +786,7 @@ <tstamp> <format property="nightly.date" pattern="yyyyMMdd"/> </tstamp> - <property name="version.full" value="${version}.${build.tag}-${nightly.date}-c${build.number}"/> + <property name="version.full" value="${version}.${build.tag}-${nightly.date}-${build.number}"/> <echo>Version will be: ${version.full}</echo> diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html index 5561fd37cb..ed92afe378 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html +++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html @@ -19,7 +19,7 @@ <tr> <td>assertValue</td> <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormat::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[0]</td> - <td>1. tammikuuta 2010 0:00:00 UTC+2</td> + <td>1. tammikuuta 2010 klo 0.00.00</td> </tr> </tbody></table> |