Bug 548630 - [Releng] Maintenance Release for 2019-06 - Update the Sysml 1.6 repository Change-Id: I320fb201b9088e77506166c54d49807da1c39b38 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/README.md b/README.md index 3603ab2..2329fde 100755 --- a/README.md +++ b/README.md
@@ -52,7 +52,7 @@ ### Building against a specific Eclipse Release ### -By default SysML16 is build against latest stable Eclipse Release Train (2018-12). +By default SysML16 is build against latest stable Eclipse Release Train (2019-06). ### Building for Eclipser server ###
diff --git a/pom.xml b/pom.xml index 5b83d50..489df6c 100644 --- a/pom.xml +++ b/pom.xml
@@ -1,14 +1,15 @@ <?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" +<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> <groupId>org.eclipse.papyrus.components</groupId> <artifactId>org.eclipse.papyrus.components.parent</artifactId> <version>0.0.27</version> </parent> - + <groupId>org.eclipse.papyrus.sysml</groupId> <artifactId>org.eclipse.papyrus.sysml16.parent</artifactId> <version>1.0.0-SNAPSHOT</version> @@ -16,7 +17,7 @@ <name>SysML</name> <description>A Papyrus DSML for the SysML 1.6 OMG norm</description> <url>https://eclipse.org/papyrus/components/${component.shortname}/</url> - <inceptionYear>2015</inceptionYear> + <inceptionYear>2018</inceptionYear> <modules> <module>plugins</module> @@ -32,7 +33,7 @@ <component.package.rootname>org.eclipse.papyrus.sysml</component.package.rootname> <component.rcp.name>org.eclipse.papyrus.sysml16.rcp</component.rcp.name> <component.servicetype>org.eclipse.papyrus.sysml16.service.types</component.servicetype> - <eclipse.targetrelease>2018-12</eclipse.targetrelease> + <eclipse.targetrelease>2019-06</eclipse.targetrelease> <target.version>${project.version}</target.version> <sonar.exclusions>**/src-gen/**</sonar.exclusions> </properties> @@ -72,7 +73,7 @@ <distribution>repo</distribution> </license> </licenses> - + <distributionManagement> <site> <id>git.eclipse.org.server</id> @@ -86,35 +87,19 @@ </scm> <repositories> - <!--repository> + <!--repository> <id>pap.repo.eclipse.org</id> <name>Papyrus Repository + - Releases</name> <url>https://repo.eclipse.org/content/repositories/papyrus-releases/</url> + <releases> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> </releases> + <snapshots> <enabled>false</enabled> </snapshots> </repository> <repository> + <id>paps.repo.eclipse.org</id> <name>Papyrus Repository - Snapshots</name> + <url>https://repo.eclipse.org/content/repositories/papyrus-snapshots/</url> + <releases> <enabled>false</enabled> </releases> <snapshots> <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> </snapshots> </repository --> + <repository> <id>pap.repo.eclipse.org</id> <name>Papyrus Repository - Releases</name> - <url>https://repo.eclipse.org/content/repositories/papyrus-releases/</url> - <releases> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> + <url>https://repo.eclipse.org/content/repositories/papyrus/</url> </repository> - <repository> - <id>paps.repo.eclipse.org</id> - <name>Papyrus Repository - Snapshots</name> - <url>https://repo.eclipse.org/content/repositories/papyrus-snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </snapshots> - </repository--> - <repository> - <id>pap.repo.eclipse.org</id> - <name>Papyrus Repository - Releases</name> - <url>https://repo.eclipse.org/content/repositories/papyrus/</url> - </repository> </repositories> - + </project> \ No newline at end of file
diff --git a/releng/org.eclipse.papyrus.sysml16.p2/category.xml b/releng/org.eclipse.papyrus.sysml16.p2/category.xml index 475cc48..e4ce614 100644 --- a/releng/org.eclipse.papyrus.sysml16.p2/category.xml +++ b/releng/org.eclipse.papyrus.sysml16.p2/category.xml
@@ -17,5 +17,5 @@ Papyrus SysML Category </description> </category-def> - <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12/" enabled="true" /> + <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06/" enabled="true" /> </site>
diff --git a/releng/org.eclipse.papyrus.sysml16.p2/pom.xml b/releng/org.eclipse.papyrus.sysml16.p2/pom.xml index 0f1b0e0..fa6a4f4 100644 --- a/releng/org.eclipse.papyrus.sysml16.p2/pom.xml +++ b/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
@@ -34,7 +34,7 @@ <update.site.nightly>https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml16.p2/target/repository/</update.site.nightly> </symbols> <associateSites> - <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12</site> + <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06</site> </associateSites> <siteTemplateFolder>siteTemplate</siteTemplateFolder> <p2StatsUrl>http://download.eclipse.org/stats</p2StatsUrl>
diff --git a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product index f1a2356..5e1d99b 100644 --- a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product +++ b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
@@ -107,14 +107,11 @@ <feature id="org.eclipse.platform"/> <feature id="org.eclipse.rcp"/> <feature id="org.eclipse.equinox.p2.user.ui"/> - <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/> <feature id="org.eclipse.help"/> <feature id="org.eclipse.equinox.p2.core.feature"/> <feature id="org.eclipse.ecf.core.ssl.feature"/> <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/> <feature id="org.eclipse.equinox.p2.rcp.feature"/> - <feature id="org.eclipse.ecf.filetransfer.feature"/> - <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/> <feature id="org.eclipse.emf.common"/> <feature id="org.eclipse.emf.ecore"/> <feature id="org.eclipse.equinox.p2.extras.feature"/> @@ -141,7 +138,7 @@ <repositories> <repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml16/" enabled="true" /> - <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12" enabled="true" /> + <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06" enabled="true" /> </repositories> <preferencesInfo>
diff --git a/releng/pom.xml b/releng/pom.xml index 132af09..602a730 100644 --- a/releng/pom.xml +++ b/releng/pom.xml
@@ -1,6 +1,7 @@ <?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"> +<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> <groupId>org.eclipse.papyrus.sysml</groupId> @@ -16,15 +17,15 @@ </modules> <profiles> - <profile> - <id>p2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>org.eclipse.papyrus.sysml16.p2</module> - </modules> - </profile> + <profile> + <id>p2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>org.eclipse.papyrus.sysml16.p2</module> + </modules> + </profile> <profile> <id>product</id> <activation>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/.project b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/.project deleted file mode 100644 index 8a984b0..0000000 --- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/.project +++ /dev/null
@@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.papyrus.sysml16.targetplatform.2018-12</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/pom.xml b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/pom.xml deleted file mode 100644 index 005d300..0000000 --- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/pom.xml +++ /dev/null
@@ -1,13 +0,0 @@ -<?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.sysml16.targetplatform</artifactId> - <groupId>org.eclipse.papyrus.sysml</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.sysml16.targetplatform.2018-12</artifactId> - <packaging>eclipse-target-definition</packaging> - <name>org.eclipse.papyrus.sysml16.targetplatform.2018-12</name> - <description>This plug-in contains the target definition for Papyrus SysML in 2018-12.</description> -</project> \ No newline at end of file
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/.settings/org.eclipse.core.resources.prefs b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/.settings/org.eclipse.core.resources.prefs rename to releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/.settings/org.eclipse.core.resources.prefs
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/org.eclipse.papyrus.sysml16.targetplatform.2018-12.target b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/org.eclipse.papyrus.sysml16.targetplatform.2019-06.target old mode 100644 new mode 100755 similarity index 83% rename from releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/org.eclipse.papyrus.sysml16.targetplatform.2018-12.target rename to releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/org.eclipse.papyrus.sysml16.targetplatform.2019-06.target index 4d7762f..35ea6df --- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/org.eclipse.papyrus.sysml16.targetplatform.2018-12.target +++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/org.eclipse.papyrus.sysml16.targetplatform.2019-06.target
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="SysML 1.6 - 2018-12" sequenceNumber="1552387809"> +<target name="SysML 1.6 - 2019-06" sequenceNumber="1561629302"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.platform.feature.group" version="0.0.0"/> @@ -10,7 +10,7 @@ <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"/> - <repository id="eclipse-2018-12" location="http://download.eclipse.org/releases/2018-12/"/> + <repository id="eclipse-2019-06" location="http://download.eclipse.org/releases/2019-06/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="0.0.0"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/> - <repository id="Papyrus-2018-12" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12/"/> + <repository id="Papyrus-2019-06" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06/"/> </location> </locations> </target>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/org.eclipse.papyrus.sysml16.targetplatform.2018-12.tpd b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/org.eclipse.papyrus.sysml16.targetplatform.2019-06.tpd similarity index 78% rename from releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/org.eclipse.papyrus.sysml16.targetplatform.2018-12.tpd rename to releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/org.eclipse.papyrus.sysml16.targetplatform.2019-06.tpd index e95d2cc..29a59e9 100644 --- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2018-12/org.eclipse.papyrus.sysml16.targetplatform.2018-12.tpd +++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/org.eclipse.papyrus.sysml16.targetplatform.2019-06.tpd
@@ -1,6 +1,6 @@ -target "SysML 1.6 - 2018-12" with source requirements +target "SysML 1.6 - 2019-06" with source requirements -location "http://download.eclipse.org/releases/2018-12/" eclipse-2018-12 { +location "http://download.eclipse.org/releases/2019-06/" eclipse-2019-06 { org.eclipse.platform.feature.group lazy org.eclipse.rcp.feature.group lazy org.eclipse.jdt.feature.group lazy @@ -13,7 +13,7 @@ org.eclipse.license.feature.group lazy } -location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12/" Papyrus-2018-12 { +location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06/" Papyrus-2019-06 { org.eclipse.papyrus.junit.feature.feature.group lazy org.eclipse.papyrus.sdk.feature.feature.group lazy org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/pom.xml b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/pom.xml new file mode 100644 index 0000000..f15a518 --- /dev/null +++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.2019-06/pom.xml
@@ -0,0 +1,15 @@ +<?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.sysml16.targetplatform</artifactId> + <groupId>org.eclipse.papyrus.sysml</groupId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.sysml16.targetplatform.2019-06</artifactId> + <packaging>eclipse-target-definition</packaging> + <name>org.eclipse.papyrus.sysml16.targetplatform.2019-06</name> + <description>This plug-in contains the target definition for Papyrus SysML in 2019-06.</description> +</project> \ No newline at end of file
diff --git a/releng/targetplatform/pom.xml b/releng/targetplatform/pom.xml index 9bfc0d6..2249601 100644 --- a/releng/targetplatform/pom.xml +++ b/releng/targetplatform/pom.xml
@@ -1,5 +1,6 @@ <?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" +<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> @@ -11,16 +12,9 @@ <packaging>pom</packaging> <name>SysML Target Platform</name> <description>This module contains the different Eclipse target platform definitions.</description> - <profiles> - <profile> - <id>2018-12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>org.eclipse.papyrus.sysml16.targetplatform.2018-12</module> - </modules> - </profile> - </profiles> + + <modules> + <module>org.eclipse.papyrus.sysml16.targetplatform.2019-06</module> + </modules> </project> \ No newline at end of file