Bug 571869 - [Designer][release] Release version 2.0.0 of Papyrus SW designer
- Switch build from 2020-12 to 2021-03
- Update documentation (installation instructions for Java/Java reverse)
- Switch to tycho and tycho.jboss 2.2.0
Change-Id: I50ab908b06d931e55697acab771af26d05d9b7ac
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/.gitignore b/.gitignore
index c1a8223..a77b7f0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
bin/
+xtend-gen/
target/
*.java._trace
*.pyc
diff --git a/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java-reverse/java-reverse.mediawiki b/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java-reverse/java-reverse.mediawiki
index 366b592..b2d781d 100644
--- a/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java-reverse/java-reverse.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java-reverse/java-reverse.mediawiki
@@ -4,10 +4,10 @@
== Installation instructions==
The Java features of Papyrus are available as part of the [http://wiki.eclipse.org/Papyrus_Software_Designer Papyrus Software Designer] extra feature.
-You can install it by using the Papyrus Software Designer update-site (for Oxygen):
+You can install it by using the Papyrus Software Designer update-site:
* http://download.eclipse.org/modeling/mdt/papyrus/components/designer/
-Or you can use the nightly build update site for Oxygen (paste following url in eclipse update site):
-* https://ci.eclipse.org/papyrus/view/Designer/job/papyrus-designer-2020-12/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/
+Or you can use the nightly build update site by choosing a job below and select the update site in its description:
+* https://ci.eclipse.org/papyrus/view/Designer/
Then select "Papyrus Java profile, library and code generation (Incubation)" feature. You need JDT installed (which comes with most Eclipse packages).
diff --git a/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java/java.mediawiki b/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java/java.mediawiki
index 204480e..37df28e 100644
--- a/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java/java.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/codegen/java/java.mediawiki
@@ -1,12 +1,10 @@
The Java code generation is available via Papyrus SW designer, a Papyrus component. It can be used by installing the latest version of Papyrus. It allows to create Java source code from a class diagram.
== Installation instructions==
-The Java features of Papyrus are available as part of the [http://wiki.eclipse.org/Papyrus_Software_Designer Papyrus Software Designer] extra feature.
-
-You can install it by using the Papyrus Software Designer update-site:
+You can install the Java reverse mechanisms by using the Papyrus Software Designer update-site:
* http://download.eclipse.org/modeling/mdt/papyrus/components/designer/
-Or you can use the nightly build update site (paste following url in eclipse update site):
-* https://ci.eclipse.org/papyrus/job/papyrus-designer-2020-12/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/
+Or you can use the nightly build update site by choosing a job below and select the update site in its description:
+* https://ci.eclipse.org/papyrus/view/Designer/
Then select "Papyrus Java profile, library and code generation (Incubation)" feature. You need JDT installed (which comes with most Eclipse packages).
diff --git a/releng/org.eclipse.papyrus.designer.configuration/pom.xml b/releng/org.eclipse.papyrus.designer.configuration/pom.xml
index 0d8aebf..308f273 100644
--- a/releng/org.eclipse.papyrus.designer.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.designer.configuration/pom.xml
@@ -16,8 +16,8 @@
<component.rcp.name>org.eclipse.papyrus.designer.rcp</component.rcp.name>
<target.version>2.0.0-SNAPSHOT</target.version>
- <tycho.version>2.0.0</tycho.version>
- <tycho.extras.version>2.0.0</tycho.extras.version>
+ <tycho.version>2.2.0</tycho.version>
+ <tycho.extras.version>2.2.0</tycho.extras.version>
<xtend.version>2.21.0</xtend.version>
<!-- plugin versions -->
@@ -200,7 +200,7 @@
<!-- https://github.com/jbosstools/jbosstools-maven-plugins/wiki -->
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
- <version>1.7.0</version>
+ <version>2.2.0</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/releng/org.eclipse.papyrus.designer.product/p2.inf b/releng/org.eclipse.papyrus.designer.product/p2.inf
index 447a695..75c87aa 100644
--- a/releng/org.eclipse.papyrus.designer.product/p2.inf
+++ b/releng/org.eclipse.papyrus.designer.product/p2.inf
@@ -1,6 +1,6 @@
instructions.configure=\
- addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
- addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
+ addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
+ addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2021-03,name:2021-03);\
addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/designer,name:Papyrus SW designer release);\
addRepository(type:1,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/designer,name:Papyrus SW designer release);\
addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/marte,name:MARTE);\
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/.project b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/.project
similarity index 84%
rename from targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/.project
rename to targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/.project
index 35aa418..5080fd2 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/.project
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.designer.targetplatform.2020-12</name>
+ <name>org.eclipse.papyrus.designer.targetplatform.2021-03</name>
<comment></comment>
<projects>
</projects>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/org.eclipse.papyrus.designer.targetplatform.2020-12.target b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/org.eclipse.papyrus.designer.targetplatform.2021-03.target
similarity index 94%
rename from targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/org.eclipse.papyrus.designer.targetplatform.2020-12.target
rename to targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/org.eclipse.papyrus.designer.targetplatform.2021-03.target
index 0daef9e..4587153 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/org.eclipse.papyrus.designer.targetplatform.2020-12.target
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/org.eclipse.papyrus.designer.targetplatform.2021-03.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Papyrus Designer for Eclipse 2020-12" sequenceNumber="1466666614">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Papyrus Designer for Eclipse 2021-03" sequenceNumber="1466666614">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -16,7 +16,7 @@
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.json" version="0.0.0"/>
<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
- <repository location="https://download.eclipse.org/releases/2020-12"/>
+ <repository location="https://download.eclipse.org/releases/2021-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.marte.core.feature.feature.group" version="0.0.0"/>
@@ -26,7 +26,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
- <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-12"/>
+ <repository id="papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.moka.kernel.animation" version="0.0.0"/>
diff --git a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/pom.xml b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/pom.xml
similarity index 77%
rename from targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/pom.xml
rename to targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/pom.xml
index e3a8347..9c7fbeb 100644
--- a/targetplatform/org.eclipse.papyrus.designer.targetplatform.2020-12/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.designer.targetplatform.2021-03/pom.xml
@@ -6,8 +6,8 @@
<groupId>org.eclipse.papyrus.designer</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.designer.targetplatform.2020-12</artifactId>
+ <artifactId>org.eclipse.papyrus.designer.targetplatform.2021-03</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>org.eclipse.papyrus.designer.targetplatform.2020-12</name>
- <description>This plug-in contains the target definition for Papyrus Designer in 2020-12.</description>
+ <name>org.eclipse.papyrus.designer.targetplatform.2021-03</name>
+ <description>This plug-in contains the target definition for Papyrus Designer in 2021-03.</description>
</project>
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 43786d3..b7c76a9 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -13,15 +13,15 @@
<description>This module contains the different Eclipse target platform definitions.</description>
<profiles>
<profile>
- <id>2020-12</id>
+ <id>2021-03</id>
<activation>
<property>
<name>eclipse.targetrelease</name>
- <value>2020-12</value>
+ <value>2021-03</value>
</property>
</activation>
<modules>
- <module>org.eclipse.papyrus.designer.targetplatform.2020-12</module>
+ <module>org.eclipse.papyrus.designer.targetplatform.2021-03</module>
</modules>
</profile>
<profile>
