Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorQuentin Le Menez2019-02-07 13:41:39 +0000
committerQuentin Le Menez2019-02-19 09:26:43 +0000
commit0008788c3b16845b0758f8808edd2c87f4310501 (patch)
treed82e3e3fb10f43e264f8062000b72e2a0c0155c5 /releng
parentcf1997b9c3a1dac823a8cde546c6dcabf159296d (diff)
downloadorg.eclipse.papyrus-0008788c3b16845b0758f8808edd2c87f4310501.tar.gz
org.eclipse.papyrus-0008788c3b16845b0758f8808edd2c87f4310501.tar.xz
org.eclipse.papyrus-0008788c3b16845b0758f8808edd2c87f4310501.zip
Bug 542929 - [Releng] [CDO] Rewire the way tests are compiled in order to allow multiple tests configurations
- Update modified pom.xml files headers - Delete .project files in root and releng Change-Id: I6c76f0adb7a7c18baa4d45d78af62db4dfa69a5d Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'releng')
-rw-r--r--releng/.project11
-rwxr-xr-xreleng/main-tests-with-cdo/pom.xml195
-rwxr-xr-xreleng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd40
-rwxr-xr-xreleng/main/pom.xml8
-rw-r--r--releng/main/site/pom.xml28
-rw-r--r--releng/pom.xml46
-rwxr-xr-xreleng/tests/main-tests-with-cdo/README (renamed from releng/main-tests-with-cdo/README)3
-rwxr-xr-xreleng/tests/main-tests-with-cdo/pom.xml19
-rw-r--r--releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target (renamed from releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target)13
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml (renamed from releng/main-tests-with-cdo/targetPlatform/eclipse/pom.xml)0
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/pom.xml (renamed from releng/main-tests-with-cdo/targetPlatform/pom.xml)0
-rw-r--r--releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target (renamed from releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target)13
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd20
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml (renamed from releng/main-tests-with-cdo/targetPlatform/portable/pom.xml)4
-rw-r--r--releng/tests/main-tests/pom.xml20
-rw-r--r--releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target (renamed from releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target)0
-rw-r--r--releng/tests/main-tests/targetPlatform/eclipse/pom.xml (renamed from releng/main-tests/targetPlatform/eclipse/pom.xml)0
-rw-r--r--releng/tests/main-tests/targetPlatform/pom.xml (renamed from releng/main-tests/targetPlatform/pom.xml)2
-rw-r--r--releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target (renamed from releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target)0
-rw-r--r--releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd (renamed from releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd)2
-rw-r--r--releng/tests/main-tests/targetPlatform/portable/pom.xml (renamed from releng/main-tests/targetPlatform/portable/pom.xml)2
-rwxr-xr-x[-rw-r--r--]releng/tests/pom.xml (renamed from releng/main-tests/pom.xml)76
-rwxr-xr-xreleng/toolsmiths/pom.xml8
-rw-r--r--releng/toolsmiths/site/pom.xml14
24 files changed, 167 insertions, 357 deletions
diff --git a/releng/.project b/releng/.project
deleted file mode 100644
index 9838d30fce8..00000000000
--- a/releng/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/releng/main-tests-with-cdo/pom.xml b/releng/main-tests-with-cdo/pom.xml
deleted file mode 100755
index 148d587c72c..00000000000
--- a/releng/main-tests-with-cdo/pom.xml
+++ /dev/null
@@ -1,195 +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>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.all.releng</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.tests.cdo.releng</artifactId>
- <packaging>pom</packaging>
-
- <properties>
- <testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
- <jacoco.version>0.7.9</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.main.tests.cdo.${target.suffix}.target</target.platform>
- </properties>
-
- <modules>
- <!-- Features -->
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.emf.expressions.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.decoratormodel.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.expressions.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.textedit.tests.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.alf.tests.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature</module>
-
- <!-- Plugins -->
- <module>../../tests/junit/plugins</module>
- <module>../../tests/compatibility/cdo</module>
- <module>targetPlatform</module>
- </modules>
-
-<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <failIfNoTests>false</failIfNoTests>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <testFailureIgnore>true</testFailureIgnore>
- <!-- ${tycho.testArgLine} is populated by JaCoCo and is required to
- enable code coverage -->
- <argLine>${tycho.testArgLine} ${test.argLine}</argLine>
- <appArgLine>-testConfig=${testConfig}</appArgLine>
- <product>org.eclipse.sdk.ide</product>
- <skipTests>${skipInnerTests}</skipTests>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
- <configuration>
- <excludes>
- <exclude>org.eclipse.uml2</exclude>
- </excludes>
- <includes>
- <include>org.eclipse.papyrus.*</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>defaultProfile</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- <repository>
- <id>papyrus-toolsmiths</id>
- <layout>p2</layout>
- <url>${papyrus.repo.toolsmiths}</url>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>mac-tests</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100
- -XstartOnFirstThread</test.argLine>
- </properties>
- </profile>
-
- <profile>
- <id>buildAll</id>
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
- <!-- Papyrus Update sites not included (They are included in the same
- build) -->
-
- <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>
- </profile>
- </profiles>
-</project>
diff --git a/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd b/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd
deleted file mode 100755
index 55e1acb47be..00000000000
--- a/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd
+++ /dev/null
@@ -1,40 +0,0 @@
-target "Papyrus CDO Tests" with source requirements
-
-include
-"../../../main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd"
-
-/*** Manual referencing ***/
-
-//manualUpdate
-
-location PapyrusMain "https://ci.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"{
- org.eclipse.papyrus.sdk.feature.feature.group lazy
-}
-
-//manualUpdate
-
-location Sysml "https://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09/" {
- org.eclipse.papyrus.sysml14.feature.feature.group lazy
-}
-
-location papyrusCdo "https://hudson.eclipse.org/papyrus/job/Papyrus-CDO/lastSuccessfulBuild/artifact/repository/" {
- org.eclipse.papyrus.cdo.feature.feature.group lazy
- org.eclipse.papyrus.cdo.models.feature.feature.group lazy
-
-}
-
-/*** Updates from the Simrel repository ***/
-
-//updateFrom("EMF CDO",0)
-
-location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20180613-0111" {
- org.eclipse.emf.cdo.admin lazy
- org.eclipse.emf.cdo.dawn lazy
- org.eclipse.emf.cdo.dawn.gmf lazy
- org.eclipse.emf.cdo.ecore lazy
- org.eclipse.emf.cdo.explorer lazy
- org.eclipse.emf.cdo.explorer.ui lazy
- org.eclipse.emf.cdo.gmf.notation lazy
- org.eclipse.emf.cdo.server.ocl lazy
- org.eclipse.emf.cdo.ui.admin lazy
-} \ No newline at end of file
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index bbfa249b9a7..6159ee42b63 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -8,9 +8,9 @@
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
- <artifactId>org.eclipse.papyrus.releng</artifactId>
- <packaging>pom</packaging>
+
+ <artifactId>org.eclipse.papyrus.releng</artifactId>
+ <packaging>pom</packaging>
<modules>
<module>../../plugins</module>
@@ -22,7 +22,7 @@
</modules>
<properties>
- <!-- https://repo.maven.apache.org/maven2/ -->
+ <!-- https://repo.maven.apache.org/maven2/ -->
<mojo.buildhelper.version>3.0.0</mojo.buildhelper.version>
<mylyn.wikitext.version>3.0.29</mylyn.wikitext.version>
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index 832251a0683..75ca2b9a8e1 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -2,7 +2,7 @@
<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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.papyrus.releng</artifactId>
@@ -15,12 +15,12 @@
<packaging>eclipse-repository</packaging>
- <pluginRepositories>
- <pluginRepository>
- <id>org.jboss.tools.tycho-plugins</id>
- <url>https://repository.jboss.org/</url>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.jboss.tools.tycho-plugins</id>
+ <url>https://repository.jboss.org/</url>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<plugins>
@@ -32,24 +32,24 @@
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
-
+
<!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
- <version>${jboss.utils.version}</version>
+ <version>${jboss.utils.version}</version>
<executions>
<execution>
- <phase>package</phase>
+ <phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
<configuration>
- <!-- do not generate the pesky web folder and index.html -->
- <skipWebContentGeneration>true</skipWebContentGeneration>
- <!-- p2 update site transitive dependencies repositories -->
+ <!-- do not generate the pesky web folder and index.html -->
+ <skipWebContentGeneration>true</skipWebContentGeneration>
+ <!-- p2 update site transitive dependencies repositories -->
<associateSites>
- <!-- Oxygen orbit bundles for batik 1.6.0-->
+ <!-- Oxygen orbit bundles for batik 1.6.0 -->
<site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</site>
</associateSites>
</configuration>
diff --git a/releng/pom.xml b/releng/pom.xml
index 9bbb472f565..9cc52b0e280 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -9,19 +9,19 @@
<packaging>pom</packaging>
<properties>
- <!-- https://repo.maven.apache.org/maven2/ -->
+ <!-- https://repo.maven.apache.org/maven2/ -->
<tycho-version>1.3.0</tycho-version>
<tychoExtrasVersion>1.3.0</tychoExtrasVersion>
- <xtext.version>2.16.0</xtext.version>
- <maven.resources.version>3.1.0</maven.resources.version>
- <maven.clean.version>3.1.0</maven.clean.version>
- <mojo.execmaven.version>1.6.0</mojo.execmaven.version>
- <findbugs.version>3.0.5</findbugs.version>
- <maven.compiler.version>3.8.0</maven.compiler.version>
-
- <!-- https://repo.eclipse.org/content/repositories/cbi-releases/ -->
+ <xtext.version>2.16.0</xtext.version>
+ <maven.resources.version>3.1.0</maven.resources.version>
+ <maven.clean.version>3.1.0</maven.clean.version>
+ <mojo.execmaven.version>1.6.0</mojo.execmaven.version>
+ <findbugs.version>3.0.5</findbugs.version>
+ <maven.compiler.version>3.8.0</maven.compiler.version>
+
+ <!-- https://repo.eclipse.org/content/repositories/cbi-releases/ -->
<jarSignerVersion>1.1.5</jarSignerVersion>
-
+
<!-- https://repository.jboss.org/ -->
<jboss.utils.version>1.3.0</jboss.utils.version>
@@ -39,33 +39,25 @@
<papyrus.eclipse.target>master</papyrus.eclipse.target>
<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
<papyrus.repo.toolsmiths>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/toolsmiths</papyrus.repo.toolsmiths>
-
- <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</tycho.scmUrl>
+
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</tycho.scmUrl>
</properties>
<modules>
<module>main</module>
<module>toolsmiths</module>
- <module>main-tests</module>
+ <module>tests</module>
</modules>
<pluginRepositories>
<!-- https://repo.maven.apache.org/maven2/ is being fetched by default -->
- <!-- pluginRepository>
- <id>central</id>
- <name>Central Repository</name>
- <url>https://repo.maven.apache.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository -->
+ <!-- pluginRepository> <id>central</id> <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url> <releases> <enabled>true</enabled>
+ </releases> <snapshots> <enabled>false</enabled> </snapshots> </pluginRepository -->
<pluginRepository>
- <id>tycho-snapshots</id>
- <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
- </pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+ </pluginRepository>
<pluginRepository>
<id>org.eclipse.cbi.maven.plugins</id>
<name>Eclipse CBI</name>
diff --git a/releng/main-tests-with-cdo/README b/releng/tests/main-tests-with-cdo/README
index 2578c664062..3016fb9fc7a 100755
--- a/releng/main-tests-with-cdo/README
+++ b/releng/tests/main-tests-with-cdo/README
@@ -3,5 +3,6 @@ In order to run the Papyrus Tests, with CDO installed, we need to define the tar
On Hudson, we must configure the job with the same information.
-We are not able to run the job with the expected target platform due to the current Papyrus pom architecture. Without this information, maven uses the 'normal' target platform defined for the Papyrus tests.
+We are not able to run the job with the expected target platform due to the current Papyrus pom architecture.
+Without this information, maven uses the 'normal' target platform defined for the Papyrus tests.
\ No newline at end of file
diff --git a/releng/tests/main-tests-with-cdo/pom.xml b/releng/tests/main-tests-with-cdo/pom.xml
new file mode 100755
index 00000000000..f53e9762914
--- /dev/null
+++ b/releng/tests/main-tests-with-cdo/pom.xml
@@ -0,0 +1,19 @@
+<?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>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.tests.releng</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.tests.cdo.releng</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>targetPlatform</module>
+ </modules>
+
+</project>
diff --git a/releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
index 91bf32216ed..3ee8f3ea467 100644
--- a/releng/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.cdo.eclipse.target.target
@@ -110,19 +110,6 @@
<repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201812111422/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository id="PapyrusMain" location="https://ci.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
- <repository id="Sysml" location="https://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.cdo.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.cdo.models.feature.feature.group" version="0.0.0"/>
- <repository id="papyrusCdo" location="https://hudson.eclipse.org/papyrus/job/Papyrus-CDO/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.dawn" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.dawn.gmf" version="0.0.0"/>
diff --git a/releng/main-tests-with-cdo/targetPlatform/eclipse/pom.xml b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml
index 1f5e66ff641..1f5e66ff641 100755
--- a/releng/main-tests-with-cdo/targetPlatform/eclipse/pom.xml
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/eclipse/pom.xml
diff --git a/releng/main-tests-with-cdo/targetPlatform/pom.xml b/releng/tests/main-tests-with-cdo/targetPlatform/pom.xml
index ba9eeaf9fea..ba9eeaf9fea 100755
--- a/releng/main-tests-with-cdo/targetPlatform/pom.xml
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/pom.xml
diff --git a/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
index f0af08766fb..de29ed2b9f8 100644
--- a/releng/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.target
@@ -110,19 +110,6 @@
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201812111422/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository id="PapyrusMain" location="https://ci.eclipse.org/papyrus/view/Master/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
- <repository id="Sysml" location="https://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.cdo.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.cdo.models.feature.feature.group" version="0.0.0"/>
- <repository id="papyrusCdo" location="https://hudson.eclipse.org/papyrus/job/Papyrus-CDO/lastSuccessfulBuild/artifact/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.dawn" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.dawn.gmf" version="0.0.0"/>
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd
new file mode 100755
index 00000000000..8abf4881d5d
--- /dev/null
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/org.eclipse.papyrus.main.tests.cdo.portable.target.tpd
@@ -0,0 +1,20 @@
+target "Papyrus CDO Tests" with source requirements
+
+include "../../../main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd"
+
+
+/*** Updates from the Simrel repository ***/
+
+//updateFrom("EMF CDO",0)
+
+location cdo "http://download.eclipse.org/modeling/emf/cdo/drops/R20180613-0111" {
+ org.eclipse.emf.cdo.admin lazy
+ org.eclipse.emf.cdo.dawn lazy
+ org.eclipse.emf.cdo.dawn.gmf lazy
+ org.eclipse.emf.cdo.ecore lazy
+ org.eclipse.emf.cdo.explorer lazy
+ org.eclipse.emf.cdo.explorer.ui lazy
+ org.eclipse.emf.cdo.gmf.notation lazy
+ org.eclipse.emf.cdo.server.ocl lazy
+ org.eclipse.emf.cdo.ui.admin lazy
+} \ No newline at end of file
diff --git a/releng/main-tests-with-cdo/targetPlatform/portable/pom.xml b/releng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml
index d34c0f06cee..4b386f3667e 100755
--- a/releng/main-tests-with-cdo/targetPlatform/portable/pom.xml
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/portable/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.main.tests.cdo.target.parent</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.main.tests.cdo.target.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/releng/tests/main-tests/pom.xml b/releng/tests/main-tests/pom.xml
new file mode 100644
index 00000000000..26e68ca2813
--- /dev/null
+++ b/releng/tests/main-tests/pom.xml
@@ -0,0 +1,20 @@
+<?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>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.tests.releng</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.tests.main.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>targetPlatform</module>
+ </modules>
+
+</project>
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 3e859297a2c..3e859297a2c 100644
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/tests/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
diff --git a/releng/main-tests/targetPlatform/eclipse/pom.xml b/releng/tests/main-tests/targetPlatform/eclipse/pom.xml
index ba9327703dd..ba9327703dd 100644
--- a/releng/main-tests/targetPlatform/eclipse/pom.xml
+++ b/releng/tests/main-tests/targetPlatform/eclipse/pom.xml
diff --git a/releng/main-tests/targetPlatform/pom.xml b/releng/tests/main-tests/targetPlatform/pom.xml
index c434df6b0e2..9f773770e68 100644
--- a/releng/main-tests/targetPlatform/pom.xml
+++ b/releng/tests/main-tests/targetPlatform/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus.tests.releng</artifactId>
+ <artifactId>org.eclipse.papyrus.tests.main.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
<version>1.2.0-SNAPSHOT</version>
</parent>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 76da4b1ddc2..76da4b1ddc2 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
index fddc061c98d..0ecf3792456 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
+++ b/releng/tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd
@@ -1,6 +1,6 @@
target "Papyrus Tests" with source requirements
-include "../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
+include "../../../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
//manualUpdate
diff --git a/releng/main-tests/targetPlatform/portable/pom.xml b/releng/tests/main-tests/targetPlatform/portable/pom.xml
index bf7a091e540..d229d7bccd1 100644
--- a/releng/main-tests/targetPlatform/portable/pom.xml
+++ b/releng/tests/main-tests/targetPlatform/portable/pom.xml
@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.papyrus.main.tests.target.parent</artifactId>
<groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.main.tests.target.parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/releng/main-tests/pom.xml b/releng/tests/pom.xml
index 3ae00deab5b..0c83c739e31 100644..100755
--- a/releng/main-tests/pom.xml
+++ b/releng/tests/pom.xml
@@ -8,9 +8,9 @@
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
+
<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -20,33 +20,14 @@
<!-- 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.main.tests.${target.suffix}.target</target.platform>
</properties>
<modules>
<!-- Features -->
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.emf.expressions.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.nattable.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.services.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.decoratormodel.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.expressions.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.nattable.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.tools.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.views.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.textedit.tests.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.uml.alf.tests.feature</module>
- <module>../../features/papyrus-tests-features/org.eclipse.papyrus.tests.toolsmiths.feature</module>
+ <module>../../features/papyrus-tests-features/</module>
<!-- Plugins -->
<module>../../tests/junit/plugins</module>
-
- <module>targetPlatform</module>
</modules>
<build>
@@ -134,7 +115,10 @@
<profile>
<id>defaultProfile</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <property>
+ <name>defaultProfile</name>
+ <value>!true</value>
+ </property>
</activation>
<repositories>
<repository>
@@ -151,6 +135,52 @@
</profile>
<profile>
+ <id>mainTests</id>
+ <activation>
+ <property>
+ <name>mainTests</name>
+ <value>!true</value>
+ </property>
+ </activation>
+ <properties>
+ <target.platform>org.eclipse.papyrus.main.tests.${target.suffix}.target</target.platform>
+ </properties>
+ <modules>
+ <module>main-tests</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>mainTestsCDO</id>
+ <activation>
+ <property>
+ <name>mainTestsCDO</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <target.platform>org.eclipse.papyrus.main.tests.cdo.${target.suffix}.target</target.platform>
+ </properties>
+ <modules>
+ <module>../../tests/compatibility/cdo</module>
+ <module>main-tests-with-cdo</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>sysml14</id>
+ <layout>p2</layout>
+ <url>https://ci.eclipse.org/papyrus/job/papyrus-sysml-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/</url>
+ </repository>
+ <repository>
+ <id>papyrusCDO</id>
+ <layout>p2</layout>
+ <url>https://ci.eclipse.org/papyrus/job/Papyrus-CDO/lastSuccessfulBuild/artifact/repository/</url>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
<id>mac-tests</id>
<activation>
<os>
diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml
index 6487f1d68e9..97644d23907 100755
--- a/releng/toolsmiths/pom.xml
+++ b/releng/toolsmiths/pom.xml
@@ -8,10 +8,10 @@
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
-
- <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+
+ <artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<properties>
<target.platform>org.eclipse.papyrus.toolsmiths.${target.suffix}.targetplatform</target.platform>
diff --git a/releng/toolsmiths/site/pom.xml b/releng/toolsmiths/site/pom.xml
index 8650aa7d2b7..600f9adb21c 100644
--- a/releng/toolsmiths/site/pom.xml
+++ b/releng/toolsmiths/site/pom.xml
@@ -16,12 +16,12 @@
<packaging>eclipse-repository</packaging>
- <pluginRepositories>
- <pluginRepository>
- <id>org.jboss.tools.tycho-plugins</id>
- <url>https://repository.jboss.org/</url>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.jboss.tools.tycho-plugins</id>
+ <url>https://repository.jboss.org/</url>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<plugins>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
- <version>${jboss.utils.version}</version>
+ <version>${jboss.utils.version}</version>
<executions>
<execution>
<phase>package</phase>

Back to the top