Use a newer version of Tycho and jarsigner
Eliminate some warnings.
Enable import organizing for the next time you regenerate the model to
produce fewer warnings.
Change-Id: I0a79df4e545ada36571396d3a5dc7c5b1e0be480
diff --git a/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF
index 5c1bfac..5a3f8d0 100644
--- a/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.edit/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
org.eclipse.bpmn2;visibility:=reexport,
org.eclipse.emf.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.bpmn2.edit
diff --git a/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF
index 95a0acc..6604ead 100644
--- a/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.editor/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.bpmn2.editor
diff --git a/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF
index 481e194..0d4cc75 100644
--- a/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.tests/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit,
org.eclipse.bpmn2;bundle-version="1.0.0"
+Automatic-Module-Name: org.eclipse.bpmn2.tests
diff --git a/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF
index 5683fdb..bfaad30 100644
--- a/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.tools.ecoremerger/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@
org.eclipse.bpmn2.tools.ecoremerger.exceptions,
org.eclipse.bpmn2.tools.ecoremerger.exceptions.impl,
org.eclipse.bpmn2.tools.ecoremerger.exceptions.util
+Automatic-Module-Name: org.eclipse.bpmn2.tools.ecoremerger
diff --git a/org.eclipse.bpmn2.tools.xsltFromEcore/META-INF/MANIFEST.MF b/org.eclipse.bpmn2.tools.xsltFromEcore/META-INF/MANIFEST.MF
index 11f2c77..4aed13d 100644
--- a/org.eclipse.bpmn2.tools.xsltFromEcore/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2.tools.xsltFromEcore/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
org.eclipse.emf.ecore.xmi,
org.eclipse.bpmn2,
org.junit
+Automatic-Module-Name: org.eclipse.bpmn2.tools.xsltFromEcore
diff --git a/org.eclipse.bpmn2/META-INF/MANIFEST.MF b/org.eclipse.bpmn2/META-INF/MANIFEST.MF
index c381b2d..5d63a2c 100644
--- a/org.eclipse.bpmn2/META-INF/MANIFEST.MF
+++ b/org.eclipse.bpmn2/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.xsd
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.bpmn2
diff --git a/org.eclipse.bpmn2/model/BPMN20.genmodel b/org.eclipse.bpmn2/model/BPMN20.genmodel
index 39bed85..92ef90d 100644
--- a/org.eclipse.bpmn2/model/BPMN20.genmodel
+++ b/org.eclipse.bpmn2/model/BPMN20.genmodel
@@ -4,7 +4,8 @@
modelDirectory="/org.eclipse.bpmn2/src" creationIcons="false" modelPluginID="org.eclipse.bpmn2"
templateDirectory="org.eclipse.bpmn2/templates" dynamicTemplates="true" modelName="Bpmn2"
modelPluginClass="" suppressEMFTypes="true" codeFormatting="true" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.4" language="en">
+ complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.4" language="en"
+ importOrganizing="true">
<foreignModel>BPMN20.ecore</foreignModel>
<genPackages prefix="Bpmn2" basePackage="org.eclipse" resource="XML" disposableProviderFactory="true"
loadInitialization="true" multipleEditorPages="false" ecorePackage="BPMN20.ecore#/">
@@ -853,6 +854,7 @@
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/modelElement"/>
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/style"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute DI.ecore#//DiagramElement/id"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute DI.ecore#//DiagramElement/anyAttribute"/>
</genClasses>
<genClasses ecoreClass="DI.ecore#//Edge">
<genFeatures createChild="false" ecoreFeature="ecore:EReference DI.ecore#//Edge/source"/>
diff --git a/pom.xml b/pom.xml
index 998b565..fc3f396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<properties>
<!-- 1.3.0 1.7.0 2.7.2 -->
- <tycho-version>1.3.0</tycho-version>
+ <tycho-version>2.7.5</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<BUILD_ALIAS>Final</BUILD_ALIAS>
</properties>
@@ -241,23 +241,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200a-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>pack200-normalize</id>
- <goals>
- <goal>normalize</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2</version>
<executions>
<execution>
<id>sign</id>
@@ -268,20 +254,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
