Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-06-17 03:53:15 -0400
committerCamille Letavernier2015-06-17 03:53:15 -0400
commit981f866569ea7cac165740c6d924d2a1ec1e916a (patch)
tree535daa173b68c9d15a97abbe14aa920df891de42
parent5d87280630de9d0a75aa1001810ddbe91573c27b (diff)
downloadorg.eclipse.papyrus-981f866569ea7cac165740c6d924d2a1ec1e916a.tar.gz
org.eclipse.papyrus-981f866569ea7cac165740c6d924d2a1ec1e916a.tar.xz
org.eclipse.papyrus-981f866569ea7cac165740c6d924d2a1ec1e916a.zip
469953: [Releng] Update the build to support a global POM
https://bugs.eclipse.org/bugs/show_bug.cgi?id=469953 - Remove the unused "purge-dependencies", which doesn't work with P2 repository and causes issues when running Sonar - Prefix all releng launch configs with 'Papyrus' Change-Id: Ifaaedf38cc06a6eeee29b373ec8cb2ea58c02ab1 Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
-rw-r--r--releng/Main tests - Failures.launch22
-rw-r--r--releng/Papyrus - All.launch (renamed from releng/All.launch)0
-rw-r--r--releng/Papyrus - Dev.launch (renamed from releng/Dev.launch)0
-rw-r--r--releng/Papyrus - Extra tests.launch (renamed from releng/Extra tests.launch)0
-rw-r--r--releng/Papyrus - Extra.launch (renamed from releng/Extra.launch)0
-rw-r--r--releng/Papyrus - Main tests - Failures.launch24
-rw-r--r--releng/Papyrus - Main tests.launch (renamed from releng/Main tests.launch)0
-rw-r--r--releng/Papyrus - Main.launch (renamed from releng/Main.launch)0
-rw-r--r--releng/extra/pom.xml21
9 files changed, 24 insertions, 43 deletions
diff --git a/releng/Main tests - Failures.launch b/releng/Main tests - Failures.launch
deleted file mode 100644
index 7fd3bdc7c04..00000000000
--- a/releng/Main tests - Failures.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES">
-<listEntry value="papyrus.repo.main=file:/${project_loc:releng}/main/site/target/repository"/>
-<listEntry value="testConfig=FAILING_TESTS_CONFIG"/>
-<listEntry value="papyrus.repo.main.online=https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/releng/main/target/repository/"/>
-<listEntry value="papyrus.repo.dev.online=https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
-<listEntry value="papyrus.repo.dev=file:/${project_loc:releng}/dev/site/target/repository"/>
-</listAttribute>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<intAttribute key="M2_THREADS" value="1"/>
-<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}/main-tests"/>
-</launchConfiguration>
diff --git a/releng/All.launch b/releng/Papyrus - All.launch
index d607dfd167b..d607dfd167b 100644
--- a/releng/All.launch
+++ b/releng/Papyrus - All.launch
diff --git a/releng/Dev.launch b/releng/Papyrus - Dev.launch
index 44a9499ffaf..44a9499ffaf 100644
--- a/releng/Dev.launch
+++ b/releng/Papyrus - Dev.launch
diff --git a/releng/Extra tests.launch b/releng/Papyrus - Extra tests.launch
index 10c0a44f6e0..10c0a44f6e0 100644
--- a/releng/Extra tests.launch
+++ b/releng/Papyrus - Extra tests.launch
diff --git a/releng/Extra.launch b/releng/Papyrus - Extra.launch
index bb7c2d0e823..bb7c2d0e823 100644
--- a/releng/Extra.launch
+++ b/releng/Papyrus - Extra.launch
diff --git a/releng/Papyrus - Main tests - Failures.launch b/releng/Papyrus - Main tests - Failures.launch
new file mode 100644
index 00000000000..f9eaf93d76d
--- /dev/null
+++ b/releng/Papyrus - Main tests - Failures.launch
@@ -0,0 +1,24 @@
+<?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"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="papyrus.repo.main.local=file:/${project_loc:releng}/main/site/target/repository"/>
+<listEntry value="testConfig=FAILING_TESTS_CONFIG"/>
+<listEntry value="papyrus.repo.main=https://hudson.eclipse.org/papyrus/job/Papyrus-Master/lastSuccessfulBuild/artifact/repository/"/>
+<listEntry value="papyrus.repo.dev=https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+<listEntry value="papyrus.repo.dev.local=file:/${project_loc:releng}/dev/site/target/repository"/>
+<listEntry value="tycho-version=0.21.0"/>
+<listEntry value="testSuite=org.eclipse.papyrus.tests.AllTests"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<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}/main-tests"/>
+</launchConfiguration>
diff --git a/releng/Main tests.launch b/releng/Papyrus - Main tests.launch
index 6925c6f758b..6925c6f758b 100644
--- a/releng/Main tests.launch
+++ b/releng/Papyrus - Main tests.launch
diff --git a/releng/Main.launch b/releng/Papyrus - Main.launch
index fbba5779c32..fbba5779c32 100644
--- a/releng/Main.launch
+++ b/releng/Papyrus - Main.launch
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index 08168cf6b97..e2dc2af9682 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -549,27 +549,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <id>purge-local-dependencies</id>
- <phase>process-sources</phase>
- <goals>
- <goal>purge-local-repository</goal>
- </goals>
- <configuration>
- <includes>
- <include>org.eclipse.papyrus</include>
- </includes>
- <verbose>true</verbose>
- <resolutionFuzziness>groupId</resolutionFuzziness>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>

Back to the top