Bug 512969 - [SysML1.4][Interoperability] Manage the SysML1.1 to SysML1.4 interoperability https://bugs.eclipse.org/bugs/show_bug.cgi?id=512969 Rewrite job contribution for SysML 1.4 build Bug 513698: [Interoperability][Rpy] Rpy plugins must be built and distributed Change in AbstractImportRpyModelTests.java to be able to run JUnit tests with Maven (we force the load of the rpy parser) Change-Id: I88f203ea1ce01c053eb6503df783ebd692e08402 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
diff --git a/releng/Papyrus - Main.launch b/releng/Papyrus - Common - Main.launch similarity index 100% rename from releng/Papyrus - Main.launch rename to releng/Papyrus - Common - Main.launch
diff --git a/releng/Papyrus - Main tests.launch b/releng/Papyrus - SysML14 - Main tests.launch similarity index 84% rename from releng/Papyrus - Main tests.launch rename to releng/Papyrus - SysML14 - Main tests.launch index ec8b04f..9720b89 100644 --- a/releng/Papyrus - Main tests.launch +++ b/releng/Papyrus - SysML14 - Main tests.launch
@@ -4,9 +4,9 @@ <stringAttribute key="M2_GOALS" value="clean verify"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_OFFLINE" value="false"/> -<stringAttribute key="M2_PROFILES" value=""/> +<stringAttribute key="M2_PROFILES" value="SysML14"/> <listAttribute key="M2_PROPERTIES"> -<listEntry value="papyrus.repo.interoperability.main=file:/${project_loc:releng}/../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/target/repository"/> +<listEntry value="papyrus.repo.interoperability.main=file:/${project_loc:releng}/../sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/target/repository"/> </listAttribute> <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
diff --git a/releng/Papyrus - Main tests.launch b/releng/Papyrus - SysML14 - Main.launch similarity index 70% copy from releng/Papyrus - Main tests.launch copy to releng/Papyrus - SysML14 - Main.launch index ec8b04f..1c1dd0c 100644 --- a/releng/Papyrus - Main tests.launch +++ b/releng/Papyrus - SysML14 - Main.launch
@@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> -<stringAttribute key="M2_GOALS" value="clean verify"/> +<stringAttribute key="M2_GOALS" value="clean install"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_OFFLINE" value="false"/> -<stringAttribute key="M2_PROFILES" value=""/> +<stringAttribute key="M2_PROFILES" value="SysMl14"/> <listAttribute key="M2_PROPERTIES"> -<listEntry value="papyrus.repo.interoperability.main=file:/${project_loc:releng}/../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/target/repository"/> +<listEntry value="eclipse.p2.mirrors=false"/> </listAttribute> <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> <booleanAttribute key="M2_SKIP_TESTS" value="false"/> @@ -14,5 +14,5 @@ <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> <stringAttribute key="M2_USER_SETTINGS" value=""/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}/tests"/> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}/main"/> </launchConfiguration>
diff --git a/releng/main/.project b/releng/main/.project deleted file mode 100644 index f02efd9..0000000 --- a/releng/main/.project +++ /dev/null
@@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>main</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/main/pom.xml b/releng/main/pom.xml index 05b833e..0853f10 100644 --- a/releng/main/pom.xml +++ b/releng/main/pom.xml
@@ -9,17 +9,18 @@ <artifactId>org.eclipse.papyrus.interoperability.all.releng</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + + <properties> + <testConfig>CI_TESTS_CONFIG</testConfig> + <jacoco.version>0.7.4.201502262128</jacoco.version> + <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> + </properties> + <modules> <module>../../common/plugins</module> <module>../features/org.eclipse.papyrus.interoperability.main.feature</module> - <module>targetplatform</module> </modules> - <properties> - <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> - <target.platform.groupid>org.eclipse.papyrus.interoperability</target.platform.groupid> - </properties> - <build> <pluginManagement> <plugins> @@ -203,6 +204,92 @@ <activation> <activeByDefault>true</activeByDefault> </activation> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability</target.platform.groupid> + <target.version>1.0.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>targetplatform</module> + </modules> + </profile> + + <profile> + <id>buildAll</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability</target.platform.groupid> + <target.version>1.0.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>targetplatform</module> + <module>../../rpy/releng/main</module> + <module>../../rpy/plugins</module> + <module>../../rpy/releng/org.eclipse.papyrus.interoperability.rpy.p2</module> + <module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.feature</module> + <!--module>../../sysml14/releng/main</module> + <module>../../sysml14/plugins</module> + <module>../../sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2</module> + <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature</module--> + </modules> + </profile> + + <profile> + <id>Rpy</id> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability</target.platform.groupid> + <target.version>0.7.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>../../rpy/releng/main</module> + <module>../../rpy/plugins</module> + <module>../../rpy/releng/org.eclipse.papyrus.interoperability.rpy.p2</module> + <module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.feature</module> + </modules> </profile> <profile> @@ -226,17 +313,17 @@ </plugin> </plugins> </build> - - <activation> - <property> - <name>buildAll</name> - <value>true</value> - </property> - </activation> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability</target.platform.groupid> + <target.version>0.10.1-SNAPSHOT</target.version> + </properties> <modules> <module>../../sysml14/plugins</module> - <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2</module> + <module>../../sysml14/releng/main</module> + <module>../../sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2</module> <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature</module> </modules> </profile>
diff --git a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project index 8fdf9ad..d1ac7d4 100644 --- a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project +++ b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.interoperability.targetplatform.oxygen</name> + <name>org.eclipse.papyrus.interoperability.main.targetplatform.oxygen</name> <comment></comment> <projects> </projects>
diff --git a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target index bf7d741..a53c79d 100644 --- a/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target +++ b/releng/main/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -13,12 +13,10 @@ <repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.papyrus.migration.rsa.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.diagram.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/> -<unit id="org.eclipse.papyrus.migration.rsa.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group" version="0.0.0"/> @@ -37,7 +35,6 @@ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.jdt.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.platform.feature.group" version="0.0.0"/> <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/releases/oxygen"/> @@ -47,5 +44,17 @@ <unit id="org.eclipse.m2m.qvt.oml.tools.coverage.feature.group" version="1.2.0.v20161102-0315"/> <repository location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0"/> </location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/> +</location> +<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> +<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/> +<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/> +<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/> +</location> </locations> </target>
diff --git a/releng/pom.xml b/releng/pom.xml index 61a538b..2723089 100644 --- a/releng/pom.xml +++ b/releng/pom.xml
@@ -116,7 +116,7 @@ <artifact> <groupId>${target.platform.groupid}</groupId> <artifactId>${target.platform}</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${target.version}</version> </artifact> </target> </configuration>
diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml index 291019c..8939392 100644 --- a/releng/tests/pom.xml +++ b/releng/tests/pom.xml
@@ -15,8 +15,6 @@ <jacoco.version>0.7.4.201502262128</jacoco.version> <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire --> <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> - <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> - <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> </properties> <modules> <!-- Features --> @@ -24,8 +22,6 @@ <!-- Plugins --> <module>../../common/tests</module> - - <module>targetplatform</module> </modules> <build> <pluginManagement> @@ -134,12 +130,20 @@ <activation> <activeByDefault>true</activeByDefault> </activation> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>1.0.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>targetplatform</module> + </modules> </profile> - <profile> - <id>buildAll</id> - <!-- Papyrus Update sites not included (They are included in the same build) --> + <id>buildAllTests</id> <repositories> <repository> @@ -168,25 +172,186 @@ </plugins> </build> - <activation> - <property> - <name>buildAll</name> - <value>true</value> - </property> - </activation> + <properties> + <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>1.0.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>targetplatform</module> + <module>../../rpy/releng/tests</module> + <module>../../rpy/tests</module> + <module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.tests.feature</module> + <!-->module>../../sysml14/releng/tests</module> + <module>../../sysml14/tests</module> + <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature</module--> + </modules> + </profile> + + <profile> + <id>buildAll</id> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>1.0.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>targetplatform</module> + <module>../../rpy/releng/tests</module> + <module>../../rpy/tests</module> + <module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.tests.feature</module> + <!--module>../../sysml14/releng/tests</module> + <module>../../sysml14/tests</module> + <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature</module--> + </modules> + </profile> + + <profile> + <id>RpyTests</id> + + <repositories> + <repository> + <id>papyrus-interoperability-main</id> + <layout>p2</layout> + <url>${papyrus.repo.interoperability.main}</url> + </repository> + </repositories> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>0.7.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>../../rpy/releng/tests</module> + <module>../../rpy/tests</module> + <module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.tests.feature</module> + </modules> + </profile> + + <profile> + <id>Rpy</id> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.rpy.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>0.7.0-SNAPSHOT</target.version> + </properties> + + <modules> + <module>../../rpy/releng/tests</module> + <module>../../rpy/tests</module> + <module>../../rpy/features/org.eclipse.papyrus.interoperability.rpy.tests.feature</module> + </modules> + </profile> + + <profile> + <id>SysML14Tests</id> + + <repositories> + <repository> + <id>papyrus-interoperability-main</id> + <layout>p2</layout> + <url>${papyrus.repo.interoperability.main}</url> + </repository> + </repositories> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + <target.platform>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>0.10.1-SNAPSHOT</target.version> + </properties> + + <modules> + <module>../../sysml14/releng/tests</module> + <module>../../sysml14/tests</module> + <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature</module> + </modules> </profile> <profile> <id>SysML14</id> - <repositories> - <repository> - <id>papyrus-interoperability-main</id> - <layout>p2</layout> - <url>${papyrus.repo.interoperability.main}</url> - </repository> - </repositories> - <build> <plugins> <plugin> @@ -206,15 +371,16 @@ </plugins> </build> - <activation> - <property> - <name>buildAll</name> - <value>true</value> - </property> - </activation> + <properties> + <target.platform>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</target.platform> + <target.platform.groupid>org.eclipse.papyrus.interoperability.tests</target.platform.groupid> + <target.version>0.10.1-SNAPSHOT</target.version> + </properties> <modules> + <module>../../sysml14/releng/tests</module> <module>../../sysml14/tests</module> + <module>../../sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature</module> </modules> </profile> </profiles>
diff --git a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project index 8fdf9ad..64d88d7 100644 --- a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project +++ b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/.project
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.papyrus.interoperability.targetplatform.oxygen</name> + <name>org.eclipse.papyrus.interoperability.main.tests.targetplatform.oxygen</name> <comment></comment> <projects> </projects>
diff --git a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target index 7f6dbb2..60ad3a9 100644 --- a/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target +++ b/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.targetplatform.oxygen/org.eclipse.papyrus.interoperability.targetplatform.oxygen.target
@@ -13,12 +13,10 @@ <repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> -<unit id="org.eclipse.papyrus.migration.rsa.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.diagram.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/> -<unit id="org.eclipse.papyrus.migration.rsa.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group" version="0.0.0"/> @@ -37,9 +35,11 @@ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.jdt.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.platform.feature.group" version="0.0.0"/> <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/> +<unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/> +<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> +<unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/> <repository location="http://download.eclipse.org/releases/oxygen"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -47,5 +47,22 @@ <unit id="org.eclipse.m2m.qvt.oml.tools.coverage.feature.group" version="1.2.0.v20161102-0315"/> <repository location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0"/> </location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.dev.feature.source.feature.group" version="0.0.0"/> +<repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/> +</location> +<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> +<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/> +<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/> +<repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/> +</location> </locations> </target>
diff --git a/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/META-INF/MANIFEST.MF b/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/META-INF/MANIFEST.MF index 4d3b0a1..bc442c0 100755 --- a/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/META-INF/MANIFEST.MF +++ b/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ org.eclipse.emf.compare;bundle-version="[3.3.0,4.0.0)", org.eclipse.papyrus.interoperability.rpy.blackboxes;bundle-version="0.7.0", org.eclipse.papyrus.interoperability.common;bundle-version="0.7.0", - org.eclipse.papyrus.interoperability.rpy.metamodel;bundle-version="0.7.0" + org.eclipse.papyrus.interoperability.rpy.metamodel;bundle-version="0.7.0", + org.eclipse.papyrus.interoperability.rpy.parser.ui;bundle-version="0.7.0" Bundle-Activator: org.eclipse.papyrus.interoperability.rpy.tests.Activator Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.interoperability.rpy.tests,
diff --git a/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/src/org/eclipse/papyrus/interoperability/rpy/tests/tests/AbstractImportRpyModelTests.java b/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/src/org/eclipse/papyrus/interoperability/rpy/tests/tests/AbstractImportRpyModelTests.java index 628c936..8ab4ccd 100644 --- a/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/src/org/eclipse/papyrus/interoperability/rpy/tests/tests/AbstractImportRpyModelTests.java +++ b/rpy/tests/org.eclipse.papyrus.interoperability.rpy.tests/src/org/eclipse/papyrus/interoperability/rpy/tests/tests/AbstractImportRpyModelTests.java
@@ -70,6 +70,7 @@ import org.eclipse.papyrus.interoperability.rpy.importer.SelectedRpyFilesImporter; import org.eclipse.papyrus.interoperability.rpy.importer.utils.RpyProjectHandler; import org.eclipse.papyrus.interoperability.rpy.importer.utils.RpyUtil; +import org.eclipse.papyrus.interoperability.rpy.parser.ui.internal.RpySyntaxActivator; import org.eclipse.papyrus.interoperability.rpy.transformations.RpyImportTransformationLauncher; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.DisplayUtils; @@ -151,6 +152,13 @@ * */ public void initTest(final String projectName, final String rpyModelName, final String resourcePath, Bundle bundle) throws CoreException, IOException, URISyntaxException { + //this call has been added to be able to run tests on hudson. + //The problem was that resourcetSet.getResource(myURI.rpy) returned an XMIResource instead of the XtextResource, after that we get a SAX parser error because we don't use the good parser. + //These Junit tests worked fine in Eclipse, but not with the maven build (neither on local neither on hudson) + //I have no idea to fix this bug with another way. + RpySyntaxActivator.getInstance(); + + this.rpyModelName = rpyModelName; this.project = ProjectUtils.createProject(projectName);
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml index 1341895..5291041 100644 --- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml +++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.tests.feature/pom.xml
@@ -3,8 +3,8 @@ 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.interoperability</groupId> - <artifactId>org.eclipse.papyrus.interoperability.releng</artifactId> + <groupId>org.eclipse.papyrus.interoperability.tests</groupId> + <artifactId>org.eclipse.papyrus.interoperability.tests.releng</artifactId> <relativePath>../../../releng/main/pom.xml</relativePath> <version>1.0.0-SNAPSHOT</version> </parent>
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF index 3aa5760..659c70d 100644 --- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF +++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/META-INF/MANIFEST.MF
@@ -17,10 +17,10 @@ org.eclipse.m2m.qvt.oml.common;bundle-version="[3.6.0,4.0.0)", org.eclipse.m2m.qvt.oml.project;bundle-version="[3.7.0,4.0.0)", org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.7.0,4.0.0)", - org.eclipse.papyrus.m2m.qvto;bundle-version="[1.4.0,2.0.0)", org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)", - org.eclipse.papyrus.sysml14;bundle-version="[0.10.1,1.0.0)" + org.eclipse.papyrus.sysml14;bundle-version="[0.10.1,1.0.0)", + org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.interoperability.sysml14.sysml,
diff --git a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/PreserveXMIIDHelper.java b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/PreserveXMIIDHelper.java index bf33745..1cae3a2 100644 --- a/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/PreserveXMIIDHelper.java +++ b/sysml14/plugins/org.eclipse.papyrus.interoperability.sysml14.sysml/src/org/eclipse/papyrus/interoperability/sysml14/sysml/xmi/helper/PreserveXMIIDHelper.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.xmi.XMIResource; import org.eclipse.m2m.internal.qvt.oml.library.Context; -import org.eclipse.papyrus.m2m.qvto.TraceHelper; +import org.eclipse.papyrus.interoperability.common.utils.TraceHelper; import org.eclipse.uml2.uml.util.UMLUtil; /**
diff --git a/sysml14/releng/.project b/sysml14/releng/.project new file mode 100644 index 0000000..5fe0919 --- /dev/null +++ b/sysml14/releng/.project
@@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.interoperability.sysml14.sysml.releng</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription>
diff --git a/sysml14/releng/main/pom.xml b/sysml14/releng/main/pom.xml new file mode 100644 index 0000000..d352efd --- /dev/null +++ b/sysml14/releng/main/pom.xml
@@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.releng</artifactId> + <packaging>pom</packaging> + <version>0.10.1-SNAPSHOT</version> + <parent> + <groupId>org.eclipse.papyrus.interoperability</groupId> + <artifactId>org.eclipse.papyrus.interoperability.all</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../releng/main/pom.xml</relativePath> + </parent> + <modules> + <module>targetplatform</module> + </modules> +</project>
diff --git a/releng/tests/.project b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/.project similarity index 79% rename from releng/tests/.project rename to sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/.project index a56b479..62c3bab 100644 --- a/releng/tests/.project +++ b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/.project
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>tests</name> + <name>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</name> <comment></comment> <projects> </projects>
diff --git a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target new file mode 100644 index 0000000..c09f216 --- /dev/null +++ b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
@@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317046"> +<locations> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/> +<repository location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/> +<repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.sysml.diagram.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.nattable.feature.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/> +<repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> +<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/> +<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/> +<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/> +<unit id="org.eclipse.platform.feature.group" version="0.0.0"/> +<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/releases/oxygen"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20161102-0315"/> +<unit id="org.eclipse.m2m.qvt.oml.tools.coverage.feature.group" version="1.2.0.v20161102-0315"/> +<repository location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/> +</location> +</locations> +</target>
diff --git a/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml new file mode 100644 index 0000000..d256cd9 --- /dev/null +++ b/sysml14/releng/main/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
@@ -0,0 +1,13 @@ +<?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.interoperability.sysml14.sysml.target.parent</artifactId> + <groupId>org.eclipse.papyrus.interoperability</groupId> + <version>0.10.1-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</artifactId> + <packaging>eclipse-target-definition</packaging> + <name>Interoperability SysML14 Oxygen Target Definition</name> + <description>This plug-in contains the target definition for Papyrus Interoperability SysML14 in Oxygen</description> +</project> \ No newline at end of file
diff --git a/sysml14/releng/main/targetplatform/pom.xml b/sysml14/releng/main/targetplatform/pom.xml new file mode 100644 index 0000000..d12ac47 --- /dev/null +++ b/sysml14/releng/main/targetplatform/pom.xml
@@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.releng</artifactId> + <groupId>org.eclipse.papyrus.interoperability</groupId> + <version>0.10.1-SNAPSHOT</version> + </parent> + + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.target.parent</artifactId> + <packaging>pom</packaging> + <version>0.10.1-SNAPSHOT</version> + + <modules> + <module>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</module> + </modules> +</project> \ No newline at end of file
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/.project b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/.project similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/.project rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/.project
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/category.xml
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml similarity index 95% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml index 4c70798..5cedf53 100644 --- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml +++ b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/pom.xml
@@ -60,7 +60,6 @@ </dependencies> </plugin> </plugins> - </build> - <name>org.eclipse.papyrus.interoperability.p2</name> - <description>This plugin defines the update site of Papyrus Interoperability plugins and feature.</description> + </build>= + <description>This plugin defines the update site of Papyrus Interoperability SysML14 plugins and feature.</description> </project> \ No newline at end of file
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.README b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.README similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.README rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.README
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.sh b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.sh similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.sh rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/publish.sh
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/index.html b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/index.html similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/index.html rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/index.html
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/img/sysml-banner.png b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/img/sysml14-banner.png similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/img/sysml-banner.png rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/img/sysml14-banner.png Binary files differ
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/site.css b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/site.css similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/site.css rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/web/site.css
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.properties.xsl b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.properties.xsl similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.properties.xsl rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.properties.xsl
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.xsl b/sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.xsl similarity index 100% rename from sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.xsl rename to sysml14/releng/org.eclipse.papyrus.interoperability.sysml14.sysml.p2/siteTemplate/xslt/site.xsl
diff --git a/sysml14/releng/tests/pom.xml b/sysml14/releng/tests/pom.xml new file mode 100644 index 0000000..3cf49f3 --- /dev/null +++ b/sysml14/releng/tests/pom.xml
@@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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.interoperability.tests</groupId> + <artifactId>org.eclipse.papyrus.interoperability.tests.releng</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../releng/tests/pom.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus.interoperability.tests</groupId> + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.releng</artifactId> + <version>0.10.1-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>targetplatform</module> + </modules> +</project>
diff --git a/releng/tests/.project b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/.project similarity index 78% copy from releng/tests/.project copy to sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/.project index a56b479..93990f9 100644 --- a/releng/tests/.project +++ b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/.project
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>tests</name> + <name>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.targetplatform.oxygen</name> <comment></comment> <projects> </projects>
diff --git a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target new file mode 100644 index 0000000..5e482d3 --- /dev/null +++ b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen.target
@@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.8"?><target name="Tycho Tutorial" sequenceNumber="1465317045"> +<locations> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/> +<repository location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<repository location="http://download.eclipse.org/mylyn/drops/3.21.1/v20161129-2023"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/> +<repository location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.2.x"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.sysml.diagram.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.properties.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.properties.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.modelexplorer.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.nattable.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sysml.nattable.feature.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/extra/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/> +<repository location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> +<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/> +<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/> +<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/> +<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.emf.compare.diagram.papyrus.feature.group" version="0.0.0"/> +<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> +<unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/releases/oxygen"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20161102-0315"/> +<unit id="org.eclipse.m2m.qvt.oml.tools.coverage.feature.group" version="1.2.0.v20161102-0315"/> +<repository location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.toolsmiths.feature.source.feature.group" version="0.0.0"/> +<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen/main/"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="org.eclipse.papyrus.dev.feature.feature.group" version="0.0.0"/> +<unit id="org.eclipse.papyrus.dev.feature.source.feature.group" version="0.0.0"/> +<repository location="https://hudson.eclipse.org/papyrus/view/Oxygen%20(Master)/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/> +</location> +</locations> +</target>
diff --git a/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml new file mode 100644 index 0000000..fc9210a --- /dev/null +++ b/sysml14/releng/tests/targetplatform/org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen/pom.xml
@@ -0,0 +1,13 @@ +<?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.interoperability.tests.target.parent</artifactId> + <groupId>org.eclipse.papyrus.interoperability.tests</groupId> + <version>1.0.0-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.interoperability.targetplatform.oxygen</artifactId> + <packaging>eclipse-target-definition</packaging> + <name>Interoperability Oxygen Target Definition</name> + <description>This plug-in contains the target definition for Papyrus Interoperability in Oxygen</description> +</project> \ No newline at end of file
diff --git a/sysml14/releng/tests/targetplatform/pom.xml b/sysml14/releng/tests/targetplatform/pom.xml new file mode 100644 index 0000000..795cb8c --- /dev/null +++ b/sysml14/releng/tests/targetplatform/pom.xml
@@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.releng</artifactId> + <groupId>org.eclipse.papyrus.interoperability.tests</groupId> + <version>0.10.1-SNAPSHOT</version> + </parent> + + <artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.tests.target.parent</artifactId> + <packaging>pom</packaging> + <version>0.10.1-SNAPSHOT</version> + + <modules> + <module>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatform.oxygen</module> + </modules> +</project> \ No newline at end of file
