diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-01-09 13:41:30 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-01-09 13:41:30 +0200 |
| commit | 886a837d6d16216606dcb564c5450e1b6bf136d3 (patch) | |
| tree | cf7a38c71f8e982e1f5b26f32c1d10caac5cf05a /test/own-widget-set | |
| parent | 4fd968314f47338c0ea61025e6a22f036f8e725d (diff) | |
| download | vaadin-framework-886a837d6d16216606dcb564c5450e1b6bf136d3.tar.gz vaadin-framework-886a837d6d16216606dcb564c5450e1b6bf136d3.zip | |
Fix vaadin-test and all its submodules (#8076)
This patch applies following fixes:
* ContextMenu with correct version for Vaadin 8
* Correctly skip install plugin for test submodules
* Make widgetset-test-util a test depdendency, don't use test-jar
* Fix vaadin-test project structure and dependencies
* Clean up testutil pom
* Add README.md
Diffstat (limited to 'test/own-widget-set')
| -rw-r--r-- | test/own-widget-set/pom.xml | 11 | ||||
| -rw-r--r-- | test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/test/own-widget-set/pom.xml b/test/own-widget-set/pom.xml index 6ce65c868f..e6fd8f2907 100644 --- a/test/own-widget-set/pom.xml +++ b/test/own-widget-set/pom.xml @@ -14,14 +14,6 @@ <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-test-widget-set-testutil</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-test-widget-set-testutil</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> </dependency> </dependencies> <build> @@ -29,6 +21,7 @@ <plugin> <groupId>com.vaadin</groupId> <artifactId>vaadin-maven-plugin</artifactId> + <version>${vaadin.plugin.version}</version> <executions> <execution> <goals> @@ -42,4 +35,4 @@ </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml b/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml new file mode 100644 index 0000000000..ab3ae019c4 --- /dev/null +++ b/test/own-widget-set/src/main/resources/com/vaadin/test/ownwidgetset/OwnWidgetSet.gwt.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.7.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.7.0/distro-source/core/src/gwt-module.dtd"> +<module> + <inherits name="com.vaadin.DefaultWidgetSet" /> +</module> |