Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorCamille Letavernier2015-12-08 04:33:08 -0500
committerCamille Letavernier2015-12-08 04:33:08 -0500
commita7aa9520040772cb7fbac9e6096d1b28075a7d57 (patch)
tree17466ef807a0104af3e3995e8f7a3fe3efb50c4e /releng
parent622e7480ae46f9058525a7cec7f8053e2253414a (diff)
downloadorg.eclipse.papyrus-a7aa9520040772cb7fbac9e6096d1b28075a7d57.tar.gz
org.eclipse.papyrus-a7aa9520040772cb7fbac9e6096d1b28075a7d57.tar.xz
org.eclipse.papyrus-a7aa9520040772cb7fbac9e6096d1b28075a7d57.zip
[Releng] Improve Papyrus repositories management
- Do not include the Papyrus P2 repositories when building the parent pom, to avoid introducing invalid dependencies Change-Id: I417441b33ad4626e32324cf9ee305d90d745134a Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'releng')
-rw-r--r--releng/Papyrus - All.launch6
-rwxr-xr-xreleng/dev/pom.xml73
-rwxr-xr-xreleng/extra-tests/pom.xml76
-rw-r--r--releng/extra/pom.xml55
-rw-r--r--releng/main-tests/pom.xml62
-rwxr-xr-xreleng/main/pom.xml33
-rw-r--r--releng/pom.xml8
7 files changed, 255 insertions, 58 deletions
diff --git a/releng/Papyrus - All.launch b/releng/Papyrus - All.launch
index d607dfd167b..1d56e4a4abb 100644
--- a/releng/Papyrus - All.launch
+++ b/releng/Papyrus - All.launch
@@ -6,9 +6,7 @@
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
-<listEntry value="papyrus.repo.extra=http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/extra"/>
-<listEntry value="papyrus.repo.main=http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main"/>
-<listEntry value="papyrus.repo.dev=https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/>
+<listEntry value="buildAll=true"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
@@ -16,6 +14,6 @@
<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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_75"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_45"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:releng}"/>
</launchConfiguration>
diff --git a/releng/dev/pom.xml b/releng/dev/pom.xml
index 886e3b2e62d..8f7ce3e17b4 100755
--- a/releng/dev/pom.xml
+++ b/releng/dev/pom.xml
@@ -78,18 +78,21 @@
<!-- manualUpdate -->
<url>${upr.repo.url}</url>
</repository>
- <repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- <repository>
- <id>papyrus-extra</id>
- <layout>p2</layout>
- <url>${papyrus.repo.extra}</url>
- </repository>
</repositories>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -196,4 +199,54 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>defaultProfile</id>
+ <repositories>
+ <repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ <repository>
+ <id>papyrus-extra</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.extra}</url>
+ </repository>
+ </repositories>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>buildAll</id>
+ <!-- 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>
+
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
+ </profiles>
</project>
diff --git a/releng/extra-tests/pom.xml b/releng/extra-tests/pom.xml
index 28167abad85..af0e8c9aae2 100755
--- a/releng/extra-tests/pom.xml
+++ b/releng/extra-tests/pom.xml
@@ -32,26 +32,6 @@
</modules>
<repositories>
<repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- <repository>
- <id>papyrus-dev</id>
- <layout>p2</layout>
- <url>${papyrus.repo.dev}</url>
- </repository>
- <!-- <repository>
- <id>org.eclipse.epf.richtext_1.5.1.6-update-site</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url>
- </repository>-->
- <repository>
- <id>papyrus-extra</id>
- <layout>p2</layout>
- <url>${papyrus.repo.extra}</url>
- </repository>
- <repository>
<id>cdt</id>
<layout>p2</layout>
<!-- updateFrom("CDT",0) -->
@@ -202,4 +182,60 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>defaultProfile</id>
+ <repositories>
+ <repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ <repository>
+ <id>papyrus-dev</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.dev}</url>
+ </repository>
+ <repository>
+ <id>papyrus-extra</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.extra}</url>
+ </repository>
+ </repositories>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+
+ <profile>
+ <id>buildAll</id>
+ <!-- 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>
+
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
+ </profiles>
</project>
diff --git a/releng/extra/pom.xml b/releng/extra/pom.xml
index bab3df97258..98cbe25ed54 100644
--- a/releng/extra/pom.xml
+++ b/releng/extra/pom.xml
@@ -166,7 +166,7 @@
<module>../../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.table</module>
<module>../../extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool</module>
<module>../../extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile</module>
- <!-- Missing org.eclipse.xtext.gmf.glue 0.8.0' <module>../../extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui</module>
+ <!-- Missing org.eclipse.xtext.gmf.glue 0.8.0' <module>../../extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext.ui</module>
<module>../../extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext</module> -->
<module>../../extraplugins/design/org.eclipse.papyrus.design.profile.architecture</module>
@@ -217,7 +217,7 @@
<module>../../extraplugins/req/org.eclipse.papyrus.req.sysml.assistant</module>
<module>../../extraplugins/req/org.eclipse.papyrus.req.sysml.traceabilityassistant</module>
<module>../../features/papyrus-extra-features/org.eclipse.papyrus.req.feature</module>
-
+
<!-- Papyrus BMM -->
<module>../../extraplugins/req/org.eclipse.papyrus.req.bmm</module>
<module>../../extraplugins/req/org.eclipse.papyrus.req.bmm.diagram</module>
@@ -237,15 +237,10 @@
</modules>
<repositories>
- <!-- <repository> <id>org.eclipse.epf.richtext_1.5.1.6-update-site</id>
- <layout>p2</layout> <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url>
+ <!-- <repository> <id>org.eclipse.epf.richtext_1.5.1.6-update-site</id>
+ <layout>p2</layout> <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url>
</repository> -->
<repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- <repository>
<id>cdt</id>
<layout>p2</layout>
<!-- updateFrom("CDT",0) -->
@@ -289,7 +284,6 @@
</repository>
</repositories>
<build>
-
<pluginManagement>
<plugins>
<plugin>
@@ -419,6 +413,13 @@
<profile>
<id>defaultProfile</id>
+ <repositories>
+ <repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ </repositories>
<build>
<plugins>
<plugin>
@@ -558,8 +559,40 @@
</property>
</activation>
</profile>
+
+
+ <profile>
+ <id>buildAll</id>
+ <!-- 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>
+
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
- <!-- profile dedicated to activate the repository linked to nightly artifacts,
+ <!-- profile dedicated to activate the repository linked to nightly artifacts,
useful for daily life of developers -->
<profile>
<id>nightly</id>
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 5317304b716..59696c3da37 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -95,16 +95,6 @@
</properties>
<repositories>
<repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- <repository>
- <id>papyrus-dev</id>
- <layout>p2</layout>
- <url>${papyrus.repo.dev}</url>
- </repository>
- <repository>
<id>emf-compare</id>
<layout>p2</layout>
<!-- updateFrom("EMF COMPARE",0) -->
@@ -272,4 +262,56 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>defaultProfile</id>
+ <repositories>
+ <repository>
+ <id>papyrus-main</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.main}</url>
+ </repository>
+ <repository>
+ <id>papyrus-dev</id>
+ <layout>p2</layout>
+ <url>${papyrus.repo.dev}</url>
+ </repository>
+ </repositories>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+
+
+ <profile>
+ <id>buildAll</id>
+ <!-- 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>
+
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
+ </profiles>
</project>
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index c02400b1037..b9b9057b527 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -536,6 +536,36 @@
<activeByDefault>true</activeByDefault>
</activation>
</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>
+
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
<profile>
<id>findBugs</id> <!-- Analysis profile. Takes +1h -->
@@ -694,6 +724,7 @@
</activation>
</profile>
+
<!-- nightly profile is useful for developers that want to link to nightly build -->
<profile>
<id>nightly</id>
@@ -724,4 +755,4 @@
</activation>
</profile>
</profiles>
-</project> \ No newline at end of file
+</project>
diff --git a/releng/pom.xml b/releng/pom.xml
index 7af5af27264..6b1d0cb9334 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -19,6 +19,9 @@
<skipAllTests>false</skipAllTests>
<skipInnerTests>true</skipInnerTests>
<eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Set to file:/home/data/httpd/download.eclipse.org when building on Eclipse servers to improve performances -->
+
+ <!-- TODO: Is it possible to automatically detect that we are building this pom rather than a child pom? That would remove the need for this manual variable -->
+ <buildAll>false</buildAll> <!-- Set to true when building this pom directly (Rather than individual components). This will disable Papyrus Update Sites (Since they are being built by this POM). -->
<!-- manualUpdate -->
<nattable.repo.url>${eclipse.download}/nattable/releases/1.3.0/repository/</nattable.repo.url>
@@ -71,10 +74,11 @@
<!-- updateFrom("oomph",0) -->
<oomph.repo.url>${eclipse.download}/oomph/drops/release/1.2.1</oomph.repo.url>
- <!-- Papyrus repositories -->
+ <!-- Papyrus repositories. Used when we're building individual components (vs building the parent pom including everything) -->
<papyrus.eclipse.target>neon</papyrus.eclipse.target>
- <papyrus.repo.main>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
+ <papyrus.repo.main>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/main</papyrus.repo.main>
<papyrus.repo.extra>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
+ <papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
</properties>

Back to the top