Update to 2019-06 M1
* Update dependencies
** Keep using old Orbit because of Batik 1.8
* Remove no longer supported 32 bit platforms for Linux and Windows
* Update Tyco version to 1.4.0
* Update JBoss Tycho Plugins version to 1.1.0
* Adapt test for plugin wizard to new UI
Change-Id: Ibaa8e05937cf063acd20f4334afeec7870c4a825
diff --git a/parent/pom.xml b/parent/pom.xml
index d9d9ff3..2b39099 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -10,17 +10,17 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>0.24.0</tycho-version>
+ <tycho-version>1.4.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
- <jboss-tycho-plugins-version>0.22.0</jboss-tycho-plugins-version>
+ <jboss-tycho-plugins-version>1.1.0</jboss-tycho-plugins-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <platform-site>http://download.eclipse.org/releases/2018-09/201809191000/</platform-site>
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/</orbit-site>
- <gef-site>http://download.eclipse.org/releases/2018-09/201809191000/</gef-site>
- <emf-site>http://download.eclipse.org/releases/2018-09/201809191000/</emf-site>
- <emf-transactions-site>http://download.eclipse.org/releases/2018-09/201809191000/</emf-transactions-site>
- <emf-validation-site>http://download.eclipse.org/releases/2018-09/201809191000/</emf-validation-site>
- <swtbot-site>http://download.eclipse.org/releases/2018-09/201809191000/</swtbot-site>
+ <platform-site>http://download.eclipse.org/eclipse/updates/4.11/R-4.11-201903070500/</platform-site>
+ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/</orbit-site>
+ <gef-site>http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952</gef-site>
+ <emf-site>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201904050820/</emf-site>
+ <emf-transactions-site>http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/</emf-transactions-site>
+ <emf-validation-site>http://download.eclipse.org/modeling/emf/validation/updates/releases/R201812070911/</emf-validation-site>
+ <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.7.0/</swtbot-site>
<license-site>http://download.eclipse.org/cbi/updates/license/</license-site>
</properties>
@@ -218,21 +218,11 @@
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
diff --git a/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters b/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters
index d06812e..c7b0c09 100644
--- a/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters
+++ b/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters
@@ -43,6 +43,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/AddFeatureForPattern.java" type="org.eclipse.graphiti.pattern.AddFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.AddFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.AddFeatureForPattern"/>
@@ -57,6 +62,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/CreateConnectionFeatureForPattern.java" type="org.eclipse.graphiti.pattern.CreateConnectionFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.CreateConnectionFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.CreateConnectionFeatureForPattern"/>
@@ -71,6 +81,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/CreateFeatureForPattern.java" type="org.eclipse.graphiti.pattern.CreateFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.CreateFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.CreateFeatureForPattern"/>
@@ -85,6 +100,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/DeleteFeatureForPattern.java" type="org.eclipse.graphiti.pattern.DeleteFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.DeleteFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.DeleteFeatureForPattern"/>
@@ -99,6 +119,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/DirectEditingFeatureForPattern.java" type="org.eclipse.graphiti.pattern.DirectEditingFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.DirectEditingFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.DirectEditingFeatureForPattern"/>
@@ -183,6 +208,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/LayoutFeatureForPattern.java" type="org.eclipse.graphiti.pattern.LayoutFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.LayoutFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.LayoutFeatureForPattern"/>
@@ -197,6 +227,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/MoveShapeFeatureForPattern.java" type="org.eclipse.graphiti.pattern.MoveShapeFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.MoveShapeFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.MoveShapeFeatureForPattern"/>
@@ -211,6 +246,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/ReconnectionFeatureForPattern.java" type="org.eclipse.graphiti.pattern.ReconnectionFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.ReconnectionFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.ReconnectionFeatureForPattern"/>
@@ -231,6 +271,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/RemoveFeatureForPattern.java" type="org.eclipse.graphiti.pattern.RemoveFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.RemoveFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.RemoveFeatureForPattern"/>
@@ -245,6 +290,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/ResizeShapeFeatureForPattern.java" type="org.eclipse.graphiti.pattern.ResizeShapeFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.ResizeShapeFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.ResizeShapeFeatureForPattern"/>
@@ -259,6 +309,11 @@
</filter>
</resource>
<resource path="src/org/eclipse/graphiti/pattern/UpdateFeatureForPattern.java" type="org.eclipse.graphiti.pattern.UpdateFeatureForPattern">
+ <filter comment="Removed deprecated methods" id="337682486">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.pattern.UpdateFeatureForPattern"/>
+ </message_arguments>
+ </filter>
<filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.graphiti.pattern.UpdateFeatureForPattern"/>
diff --git a/tests/org.eclipse.graphiti.bot.tests/AllBotTests.launch b/tests/org.eclipse.graphiti.bot.tests/AllBotTests.launch
index b285ce4..9fccd3c 100644
--- a/tests/org.eclipse.graphiti.bot.tests/AllBotTests.launch
+++ b/tests/org.eclipse.graphiti.bot.tests/AllBotTests.launch
@@ -31,12 +31,11 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.graphiti.bot.tests.GFTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.graphiti.bot.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=256m -Dfile.encoding=UTF-8 -Dosgi.requiredJavaVersion=1.8"/>
<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
diff --git a/tests/org.eclipse.graphiti.bot.tests/pom.xml b/tests/org.eclipse.graphiti.bot.tests/pom.xml
index 4d0b4b8..54370e5 100644
--- a/tests/org.eclipse.graphiti.bot.tests/pom.xml
+++ b/tests/org.eclipse.graphiti.bot.tests/pom.xml
@@ -49,17 +49,17 @@
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.graphiti.sdk.plus.feature</id>
- <versionRange>0.13.0</versionRange>
+ <versionRange>0.16.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.graphiti.feature.examples</id>
- <versionRange>0.13.0</versionRange>
+ <versionRange>0.16.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.graphiti.feature.tools</id>
- <versionRange>0.13.0</versionRange>
+ <versionRange>0.16.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
@@ -75,9 +75,6 @@
<useUIHarness>true</useUIHarness>
<!-- Set UIThread to true for UI Tests that do not use SWTBot -->
<useUIThread>false</useUIThread>
- <product>org.eclipse.platform.ide</product>
- <argLine>${ui.test.vmargs}</argLine>
- <application>org.eclipse.ui.ide.workbench</application>
</configuration>
</plugin>
</plugins>
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/PluginWizardTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/PluginWizardTests.java
index 821e58c..ab23c36 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/PluginWizardTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/PluginWizardTests.java
@@ -78,6 +78,9 @@
bot.checkBoxInGroup("Options", 0).deselect();
bot.button("Next >").click();
+ // Enable template table
+ bot.checkBox("Create a plug-in using one of the templates").select();
+
// Select Graphiti extension
bot.table().select("Plug-in with a Graphiti Editor");
bot.button("Next >").click();
