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/addon-using-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/addon-using-own-widget-set')
3 files changed, 5 insertions, 12 deletions
diff --git a/test/addon-using-own-widget-set/pom.xml b/test/addon-using-own-widget-set/pom.xml index fc52e47f4f..de1014b964 100644 --- a/test/addon-using-own-widget-set/pom.xml +++ b/test/addon-using-own-widget-set/pom.xml @@ -14,19 +14,11 @@ <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> - <dependency> - <groupId>com.vaadin.addon</groupId> <artifactId>vaadin-context-menu</artifactId> - <version>0.7.4</version> + <version>${contextmenu.version}</version> </dependency> </dependencies> @@ -36,6 +28,7 @@ <plugin> <groupId>com.vaadin</groupId> <artifactId>vaadin-maven-plugin</artifactId> + <version>${vaadin.plugin.version}</version> <executions> <execution> <goals> @@ -49,4 +42,4 @@ </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/test/addon-using-own-widget-set/src/main/java/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSetUI.java b/test/addon-using-own-widget-set/src/main/java/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSetUI.java index 15efad2295..65a62bb8cb 100644 --- a/test/addon-using-own-widget-set/src/main/java/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSetUI.java +++ b/test/addon-using-own-widget-set/src/main/java/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSetUI.java @@ -2,9 +2,9 @@ package com.vaadin.test.addonusingownwidgetset; import javax.servlet.annotation.WebServlet; -import com.vaadin.addon.contextmenu.ContextMenu; import com.vaadin.annotations.VaadinServletConfiguration; import com.vaadin.annotations.Widgetset; +import com.vaadin.contextmenu.ContextMenu; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinServlet; import com.vaadin.test.widgetset.AbstractTestWidgetSetUI; diff --git a/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml b/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml index 26be42e65b..f4c197b138 100644 --- a/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml +++ b/test/addon-using-own-widget-set/src/main/resources/com/vaadin/test/addonusingownwidgetset/AddonUsingOwnWidgetSet.gwt.xml @@ -3,5 +3,5 @@ <module> <inherits name="com.vaadin.DefaultWidgetSet" /> - <inherits name="com.vaadin.addon.contextmenu.WidgetSet" /> + <inherits name="com.vaadin.contextmenu.WidgetSet" /> </module> |