Bug 569806 - [BPMN] Update to Papyrus 2020-12
Change-Id: I70715b9f83846500017886ac680cdd423635ba32
Signed-off-by: Sebastien Revol <sebastien.revol@cea.fr>
diff --git a/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF
index c1fad64..bbb091d 100644
--- a/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.architecture/META-INF/MANIFEST.MF
@@ -6,19 +6,22 @@
Bundle-Version: 0.10.0.qualifier
Bundle-Activator: org.eclipse.papyrus.bpmn.architecture.Activator
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.core.runtime,
+ org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,6.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.bpmn.architecture,
diff --git a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
index f2219ee..6d1f73b 100755
--- a/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.collaboration/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
org.eclipse.core.runtime,
org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,5.0.0)",
org.eclipse.gmf.runtime.notation.edit,
org.eclipse.gmf.runtime.diagram.core,
org.eclipse.papyrus.uml.diagram.activity,
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
index 446da79..8b2c422 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.common/META-INF/MANIFEST.MF
@@ -5,20 +5,26 @@
Bundle-SymbolicName: org.eclipse.papyrus.bpmn.diagram.common;singleton:=true
Bundle-Version: 0.10.0.qualifier
Bundle-Activator: org.eclipse.papyrus.bpmn.diagram.common.Activator
-Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,5.0.0)",
org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="2.3.0",
- org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[1.2.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[2.3.0,5.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,5.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,5.0.0)"
Export-Package: org.eclipse.papyrus.bpmn.diagram.common,
org.eclipse.papyrus.bpmn.diagram.common.commands,
org.eclipse.papyrus.bpmn.diagram.common.edit.part,
diff --git a/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF b/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
index a5fd94c..7261710 100755
--- a/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
+++ b/org.eclipse.papyrus.bpmn.diagram.process/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
org.eclipse.core.runtime,
org.eclipse.papyrus.bpmn;bundle-version="0.7.0",
org.eclipse.papyrus.bpmn.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,5.0.0)",
org.eclipse.gmf.runtime.notation.edit,
org.eclipse.gmf.runtime.diagram.core,
org.eclipse.papyrus.uml.diagram.activity,
diff --git a/pom.xml b/pom.xml
index 8ce1fc8..7fa378f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
<inceptionYear>2015</inceptionYear>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <java.source.version>11</java.source.version>
+ <java.target.version>11</java.target.version>
<component.shortname>bpmn</component.shortname>
<component.fullartifactId>org.eclipse.papyrus.bpmn</component.fullartifactId>
<component.hudson.tabname>bpmn</component.hudson.tabname>
@@ -30,9 +30,13 @@
<component.rcp.name>org.eclipse.papyrus.bpmn.rcp</component.rcp.name>
<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/bpmn/0.8.0_papyrus-bpmn-mars_190/</component.apibaseline.url>
<component.servicetype>org.eclipse.papyrus.bpmn.service.types</component.servicetype>
- <eclipse.targetrelease>2019-03</eclipse.targetrelease>
+ <eclipse.targetrelease>2020-12</eclipse.targetrelease>
<target.version>${project.version}</target.version>
<sonar.exclusions>**/src-gen/**</sonar.exclusions>
+
+ <tycho-version>2.0.0</tycho-version>
+ <tychoExtrasVersion>2.0.0</tychoExtrasVersion>
+
</properties>
<modules>
@@ -51,7 +55,7 @@
<ciManagement>
<system>Hudson</system>
- <url>https://hudson.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
+ <url>https://ci.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
</ciManagement>
<issueManagement>
<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=Papyrus&component=${component.bugzilla.name}</url>
@@ -104,14 +108,47 @@
</snapshots>
</repository>
<repository>
- <id>eclipse-2019-03</id>
- <url>http://download.eclipse.org/releases/2019-03</url>
+ <id>eclipse-2020-12</id>
+ <url>http://download.eclipse.org/releases/2020-12</url>
<layout>p2</layout>
</repository>
</repositories>
<build>
<sourceDirectory>src</sourceDirectory>
+ <pluginManagement>
+ <!-- redistributed plugin configurations -->
+ <plugins>
+
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ <optimize>true</optimize>
+ <showWarnings>true</showWarnings>
+ <!-- Tycho build using the project's JDT settings. -->
+ <useProjectSettings>true</useProjectSettings>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+
</build>
</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.bpmn.feature/feature.xml b/releng/org.eclipse.papyrus.bpmn.feature/feature.xml
index 43ada29..85e6b52 100755
--- a/releng/org.eclipse.papyrus.bpmn.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.bpmn.feature/feature.xml
@@ -23,7 +23,7 @@
</license>
<requires>
- <import feature="org.eclipse.papyrus.sdk.feature" version="4.0.0" match="compatible"/>
+ <import feature="org.eclipse.papyrus.sdk.feature" version="4.0.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/org.eclipse.papyrus.bpmn.targetplatform.2020-12.target b/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/org.eclipse.papyrus.bpmn.targetplatform.2020-12.target
new file mode 100644
index 0000000..deb3dfc
--- /dev/null
+++ b/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/org.eclipse.papyrus.bpmn.targetplatform.2020-12.target
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Papyrus 2019-03 4.3.0" sequenceNumber="1608202627">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
+ <repository id="eclipse-2020-12" location="http://download.eclipse.org/releases/2020-12/"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/org.eclipse.papyrus.bpmn.targetplatform.2020-12.tpd b/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/org.eclipse.papyrus.bpmn.targetplatform.2020-12.tpd
new file mode 100644
index 0000000..1e1ff8d
--- /dev/null
+++ b/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/org.eclipse.papyrus.bpmn.targetplatform.2020-12.tpd
@@ -0,0 +1,12 @@
+target "Papyrus 2019-03 4.3.0" with source requirements
+
+location "http://download.eclipse.org/releases/2020-12/" eclipse-2020-12 {
+ org.eclipse.platform.feature.group lazy
+ org.eclipse.rcp.feature.group lazy
+ org.eclipse.jdt.feature.group lazy
+ org.eclipse.equinox.p2.discovery.feature.feature.group lazy
+ org.eclipse.equinox.executable.feature.group lazy
+ org.eclipse.ocl.uml.feature.group lazy
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.views.properties.model.xwt lazy
+}
diff --git a/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/pom.xml b/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/pom.xml
new file mode 100644
index 0000000..b39b2d5
--- /dev/null
+++ b/releng/org.eclipse.papyrus.bpmn.targetplatform.2020-12/pom.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus.bpmn.releng</artifactId>
+ <groupId>org.eclipse.papyrus.bpmn</groupId>
+ <version>0.10.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.bpmn.targetplatform.2020-12</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+</project>
\ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index ae2d901..7043f0f 100755
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -12,7 +12,7 @@
<modules>
<module>org.eclipse.papyrus.bpmn.feature</module>
<module>org.eclipse.papyrus.bpmn.p2</module>
- <module>org.eclipse.papyrus.bpmn.targetplatform.2019-03</module>
+ <module>org.eclipse.papyrus.bpmn.targetplatform.2020-12</module>
</modules>
