Fix build problems
diff --git a/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF
index cf650b0..7777b50 100644
--- a/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpmn2.edit;singleton:=true
-Bundle-Version: 1.2.0.Final
+Bundle-Version: 1.2.1.Final
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.bpmn2.provider.Bpmn2EditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/org.eclipse.bpmn2.edit/pom.xml b/org.eclipse.bpmn2.edit/pom.xml
index 5da3854..13ce3e5 100644
--- a/org.eclipse.bpmn2.edit/pom.xml
+++ b/org.eclipse.bpmn2.edit/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>bpmn2-parent</artifactId>
<groupId>org.eclipse.bpmn2</groupId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<artifactId>org.eclipse.bpmn2.edit</artifactId>
diff --git a/org.eclipse.bpmn2.edit/src/org/eclipse/bpmn2/provider/Bpmn2ItemProviderAdapterFactory.java b/org.eclipse.bpmn2.edit/src/org/eclipse/bpmn2/provider/Bpmn2ItemProviderAdapterFactory.java
index 978d8a5..8ba0c40 100644
--- a/org.eclipse.bpmn2.edit/src/org/eclipse/bpmn2/provider/Bpmn2ItemProviderAdapterFactory.java
+++ b/org.eclipse.bpmn2.edit/src/org/eclipse/bpmn2/provider/Bpmn2ItemProviderAdapterFactory.java
@@ -43,8 +43,8 @@
* <!-- end-user-doc -->
* @generated
*/
-public class Bpmn2ItemProviderAdapterFactory extends Bpmn2AdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class Bpmn2ItemProviderAdapterFactory extends Bpmn2AdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
diff --git a/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF
index 22e51b0..f415185 100644
--- a/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpmn2.editor;singleton:=true
-Bundle-Version: 1.2.0.Final
+Bundle-Version: 1.2.1.Final
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.bpmn2.presentation.Bpmn2EditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/org.eclipse.bpmn2.editor/pom.xml b/org.eclipse.bpmn2.editor/pom.xml
index 56b0052..5e02679 100644
--- a/org.eclipse.bpmn2.editor/pom.xml
+++ b/org.eclipse.bpmn2.editor/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>bpmn2-parent</artifactId>
<groupId>org.eclipse.bpmn2</groupId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<artifactId>org.eclipse.bpmn2.editor</artifactId>
diff --git a/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/feature.xml b/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/feature.xml
index 9c23503..39743f9 100644
--- a/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/feature.xml
+++ b/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.bpmn2.feature"
label="BPMN2 Metamodel"
- version="1.2.0.Final"
+ version="1.2.1.Final"
provider-name="Eclipse.org">
<description url="https://www.eclipse.org/modeling/mdt/?project=bpmn2">
diff --git a/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/pom.xml b/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/pom.xml
index 392989a..5ccdd0b 100644
--- a/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/pom.xml
+++ b/org.eclipse.bpmn2.features/org.eclipse.bpmn2.feature/pom.xml
@@ -17,12 +17,12 @@
<parent>
<groupId>org.eclipse.bpmn2</groupId>
<artifactId>org.eclipse.bpmn2.features</artifactId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<groupId>org.eclipse.bpmn2.features</groupId>
<artifactId>org.eclipse.bpmn2.feature</artifactId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
<packaging>eclipse-feature</packaging>
<name>BPMN 2.0 Metamodel Feature</name>
<description>BPMN 2.0 Metamodel Feature</description>
diff --git a/org.eclipse.bpmn2.features/pom.xml b/org.eclipse.bpmn2.features/pom.xml
index a8dfa2c..9a31c8d 100644
--- a/org.eclipse.bpmn2.features/pom.xml
+++ b/org.eclipse.bpmn2.features/pom.xml
@@ -4,13 +4,13 @@
<parent>
<artifactId>bpmn2-parent</artifactId>
<groupId>org.eclipse.bpmn2</groupId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<groupId>org.eclipse.bpmn2</groupId>
<artifactId>org.eclipse.bpmn2.features</artifactId>
<name>BPMN 2.0 Metamodel - Feature</name>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
<packaging>pom</packaging>
<modules>
diff --git a/org.eclipse.bpmn2.site/pom.xml b/org.eclipse.bpmn2.site/pom.xml
index 2bca26f..f4ced3b 100644
--- a/org.eclipse.bpmn2.site/pom.xml
+++ b/org.eclipse.bpmn2.site/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>bpmn2-parent</artifactId>
<groupId>org.eclipse.bpmn2</groupId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<artifactId>org.eclipse.bpmn2.site</artifactId>
diff --git a/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF
index d67e6a1..fa2d264 100644
--- a/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFEcoreGenerator
Bundle-SymbolicName: org.eclipse.bpmn2.tools.ecoremerger;singleton:=true
-Bundle-Version: 1.0.0.Final
+Bundle-Version: 1.2.1.Final
Require-Bundle: org.eclipse.emf,
org.eclipse.jface,
org.eclipse.ui,
diff --git a/org.eclipse.bpmn2.tools.ecoremerger/pom.xml b/org.eclipse.bpmn2.tools.ecoremerger/pom.xml
index 1eb3902..812dd1f 100644
--- a/org.eclipse.bpmn2.tools.ecoremerger/pom.xml
+++ b/org.eclipse.bpmn2.tools.ecoremerger/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>bpmn2-parent</artifactId>
<groupId>org.eclipse.bpmn2</groupId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<artifactId>org.eclipse.bpmn2.tools.ecoremerger</artifactId>
diff --git a/org.eclipse.bpmn2/META-INF/MANIFEST.MF b/org.eclipse.bpmn2/META-INF/MANIFEST.MF
index 2349f4f..bdf23ae 100644
--- a/org.eclipse.bpmn2/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpmn2;singleton:=true
-Bundle-Version: 1.2.0.Final
+Bundle-Version: 1.2.1.Final
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.bpmn2/pom.xml b/org.eclipse.bpmn2/pom.xml
index a1e68fc..e5aceca 100644
--- a/org.eclipse.bpmn2/pom.xml
+++ b/org.eclipse.bpmn2/pom.xml
@@ -4,12 +4,12 @@
<parent>
<artifactId>bpmn2-parent</artifactId>
<groupId>org.eclipse.bpmn2</groupId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
</parent>
<artifactId>org.eclipse.bpmn2</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
<name>BPMN 2.0 Metamodel - Core</name>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bb658a0..99c29d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>org.eclipse.bpmn2</groupId>
<artifactId>bpmn2-parent</artifactId>
- <version>1.2.0.Final</version>
+ <version>1.2.1.Final</version>
<packaging>pom</packaging>
<name>BPMN 2.0 Metamodel</name>
@@ -123,6 +123,27 @@
<platform-version-name>mars</platform-version-name>
</properties>
</profile>
+ <profile>
+ <id>sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>1.0.5</version>
+ <executions>
+ <execution>
+ <id>sign</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<modules>
@@ -143,21 +164,30 @@
</repositories>
<pluginRepositories>
+ <pluginRepository>
+ <id>maven-central</id>
+ <url>http://repo1.maven.org/maven2/</url>
+ </pluginRepository>
+
+ <pluginRepository>
+ <id>eclipse-nexus-central</id>
+ <url>http://maven.eclipse.org/nexus/content/groups/central/</url>
+ </pluginRepository>
+
+ <pluginRepository>
+ <id>eclipse-nexus-public</id>
+ <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
+ </pluginRepository>
+
+ <pluginRepository>
+ <id>m2e-cbi</id>
+ <url>http://download.eclipse.org/technology/m2e/maven/</url>
+ </pluginRepository>
<pluginRepository>
<id>repo.eclipse.org.cbi-releases</id>
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
- <pluginRepository>
- <!-- need maven-findbugs-2.3.2-SNAPSHOT, see http://jira.codehaus.org/browse/MFINDBUGS-122
- remove this when this version is released -->
- <id>codehaus.snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- </pluginRepository>
- <pluginRepository>
- <id>m2e-cbi</id>
- <url>http://download.eclipse.org/technology/m2e/maven/</url>
- </pluginRepository>
</pluginRepositories>
<build>
@@ -209,6 +239,7 @@
</configuration>
</plugin>
+<!--
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
@@ -250,7 +281,7 @@
</execution>
</executions>
</plugin>
-
+ -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
