diff options
37 files changed, 73 insertions, 41 deletions
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF index ca2cbb33..e36b2ed1 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.customtask;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml index a097ce3a..d40d7c49 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF index ab409726..7107dd75 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.datatypes;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.examples.datatypes.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml index 0e79f38d..bc39c21a 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF index d3454175..2c934d5b 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.dynamic;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.examples.dynamic.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui.ide, diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml index d31fb2ba..592e19ce 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF index b9d83725..82396a85 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.modelreader;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Vendor: %providerName Export-Package: org.eclipse.bpmn2.modeler.examples.modelreader Require-Bundle: org.eclipse.ui.ide, diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml index 6f111385..68732db5 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/pom.xml b/examples/plugins/pom.xml index e1f02953..5b2f9c58 100644 --- a/examples/plugins/pom.xml +++ b/examples/plugins/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/pom.xml b/examples/pom.xml index 4f362ea9..21b35fc4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/examples/projects/pom.xml b/examples/projects/pom.xml index af59817f..77084e58 100644 --- a/examples/projects/pom.xml +++ b/examples/projects/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler.examples/feature.xml b/features/org.eclipse.bpmn2.modeler.examples/feature.xml index e2047f79..d5550a46 100644 --- a/features/org.eclipse.bpmn2.modeler.examples/feature.xml +++ b/features/org.eclipse.bpmn2.modeler.examples/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler.examples" label="BPMN2 Modeler - Examples" - version="1.4.3.qualifier" + version="1.5.0.qualifier" provider-name="%providerName"> <description> diff --git a/features/org.eclipse.bpmn2.modeler.examples/pom.xml b/features/org.eclipse.bpmn2.modeler.examples/pom.xml index d8038e3c..fefdc3b7 100644 --- a/features/org.eclipse.bpmn2.modeler.examples/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.examples/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml index ab0d8a3d..8263b427 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler.runtime.jboss" label="BPMN2 Modeler - jBPM Runtime Extension Feature" - version="1.4.3.qualifier" + version="1.5.0.qualifier" provider-name="%providerName"> <description url="http://jbpm.jboss.org/"> diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml index 64f2d9a8..3dcd0ccb 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml index 1de9d814..7b2b466b 100644 --- a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler/feature.xml b/features/org.eclipse.bpmn2.modeler/feature.xml index ce77fc57..5e302aae 100644 --- a/features/org.eclipse.bpmn2.modeler/feature.xml +++ b/features/org.eclipse.bpmn2.modeler/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler" label="BPMN2 Modeler - Diagram Editor" - version="1.4.3.qualifier" + version="1.5.0.qualifier" provider-name="%providerName"> <description url="https://www.eclipse.org/bpmn2-modeler/"> diff --git a/features/org.eclipse.bpmn2.modeler/pom.xml b/features/org.eclipse.bpmn2.modeler/pom.xml index 5bcf7f1f..f08bcdb8 100644 --- a/features/org.eclipse.bpmn2.modeler/pom.xml +++ b/features/org.eclipse.bpmn2.modeler/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/pom.xml b/features/pom.xml index 676a5b22..546bd73d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> <name>BPMN2 Modeler: Features Parent</name> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/parent/pom.xml b/parent/pom.xml index 571a3a3c..c63877d1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -8,7 +8,7 @@ <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>BPMN2 Modeler Parent</name> @@ -29,7 +29,7 @@ </licenses> <properties> - <tycho-version>0.26.0</tycho-version> + <tycho-version>1.1.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <BUILD_ALIAS>RC1</BUILD_ALIAS> <BUILD_NUMBER>1</BUILD_NUMBER> @@ -176,6 +176,33 @@ </build> </profile> <profile> + <id>platform-photon</id> + <activation> + <property> + <name>platform-version-name</name> + <value>photon</value> + </property> + </activation> + <properties> + <eclipse-site>http://download.eclipse.org/releases/photon</eclipse-site> + <platform-version>[4.8,5.0)</platform-version> + <platform-version-name>photon</platform-version-name> + <eclipse.orbit.url>http://download.eclipse.org/tools/orbit/S-builds/S20180504181223/repository</eclipse.orbit.url> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIThread>false</useUIThread> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>sign</id> <build> <plugins> @@ -256,7 +283,7 @@ <repository> <id>eclipse-bpel</id> - <url>http://download.eclipse.org/bpel/updates/oxygen/1.1.1</url> + <url>http://download.eclipse.org/bpel/updates/photon/1.1.2</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> diff --git a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF index 918b2804..4e07b2d7 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.core.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.emf.transaction, diff --git a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml index e28060e5..9db35ac1 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java index 79dadd8f..e1a9b66b 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java @@ -190,6 +190,11 @@ public class XMLConfigElement implements IConfigurationElement { public boolean isValid() { return valid; } + + @Override + public int getHandleId() { + return 0; + } public static class XMLExtension implements IExtension { diff --git a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF index 0569dfdf..5d707bd9 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.help;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.help.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml index 037e537f..d030ec75 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF index fc9d7f07..9fe632dc 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml index 016df08e..01d82eb3 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF index 9d14d8d6..9b703f45 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml index 4c5a5c3e..fcf7e7dd 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/pom.xml b/plugins/pom.xml index c50c9eab..69afbb4e 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> <name>BPMN2 Modeler: Plugins Parent</name> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <groupId>org.eclipse</groupId> <artifactId>org-eclipse-bpmn2-modeler</artifactId> <name>BPMN2 Modeler</name> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> <!-- must build parent BEFORE building the rest of this project diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF index c8946b19..27c325bc 100644 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core.tests;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Require-Bundle: org.eclipse.bpmn2.edit, org.eclipse.bpmn2.editor, org.eclipse.bpmn2.modeler.core, diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml index 12d6cb5c..9ce0643d 100644 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml +++ b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.tests</groupId> <artifactId>tests-parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.bpmn2.modeler.core.tests</artifactId> diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java index 70744017..89985c2e 100644 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java +++ b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java @@ -73,8 +73,8 @@ public class GatewayValidatorTest { twoFlows.add(flowTwo); twoFlows.add(flowThree); - when(eClass.getEStructuralFeature(anyString())).thenReturn(eFeature); - when(gateway.eClass()).thenReturn(eClass); + //when(eClass.getEStructuralFeature(anyString())).thenReturn(eFeature); + //when(gateway.eClass()).thenReturn(eClass); } diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF index d983b509..d921370b 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests;singleton:=true -Bundle-Version: 1.4.3.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml index 6406cc13..3e4a4395 100644 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml +++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.tests</groupId> <artifactId>tests-parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</artifactId> diff --git a/tests/pom.xml b/tests/pom.xml index 42c99537..46b06f4f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> |