Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-06-06 11:41:30 -0400
committerQuentin Le Menez2018-06-28 08:01:12 -0400
commitc77b914fb8d11badabdb1b76f85d44a306562fb9 (patch)
tree84c8ff94df85f0a89caa08744090246f58340810
parent96a16874383effdbf9b58d379415cc4da1d18180 (diff)
downloadorg.eclipse.papyrus-c77b914fb8d11badabdb1b76f85d44a306562fb9.tar.gz
org.eclipse.papyrus-c77b914fb8d11badabdb1b76f85d44a306562fb9.tar.xz
org.eclipse.papyrus-c77b914fb8d11badabdb1b76f85d44a306562fb9.zip
Bug 535709 - [Releng] The maven dependencies and related poms need to be updated
- Update plugin versions - Remove duplicate dependencies and clean unneeded ones - Amended the p2 repository references - jboss.tools.tycho - to remove the webContent generation Change-Id: I5b0a2235dad2fc85e866384baf7749d57f04bdbf Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/pom.xml4
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.doctemplate.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml4
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.types.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml4
-rwxr-xr-xplugins/doc/org.eclipse.papyrus.uml.textedit.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.documentation.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml4
-rw-r--r--plugins/doc/org.eclipse.papyrus.views.references.doc/pom.xml4
-rw-r--r--releng/main-tests/pom.xml87
-rwxr-xr-xreleng/main/pom.xml131
-rw-r--r--releng/main/site/pom.xml14
-rw-r--r--releng/pom.xml73
-rw-r--r--releng/rcp/pom.xml2
-rwxr-xr-xreleng/toolsmiths/pom.xml85
-rw-r--r--releng/toolsmiths/site/pom.xml12
33 files changed, 224 insertions, 284 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
index a06a20103aa..4099d7669b9 100644
--- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/pom.xml
index 905fc1ecada..84bd01c3558 100644
--- a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/pom.xml
index 7dfcde06f35..88f6223c5c5 100755
--- a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/pom.xml
@@ -19,7 +19,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>src/site/mediawiki</sourceFolder>
<outputFolder>${project.build.directory}/site/generated-eclipse-help</outputFolder>
@@ -47,7 +47,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
index 4254d43f57a..a0413a88376 100644
--- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml
index 53cf545dc9c..91d2be58271 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resources</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/pom.xml
index 419207d18d3..e49bf758e51 100755
--- a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/pom.xml
@@ -16,7 +16,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>src/site/mediawiki</sourceFolder>
<outputFolder>${project.build.directory}/site/generated-eclipse-help</outputFolder>
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
index 1082322067b..26378c554a1 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
index 3ac1ffa5fc4..d642a5e1b12 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/pom.xml
@@ -15,7 +15,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/pom.xml
index 167a6e1e96b..7749ab99691 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/pom.xml
@@ -15,7 +15,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>src/site/mediawiki</sourceFolder>
<outputFolder>${project.build.directory}/site/generated-eclipse-help</outputFolder>
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
index 8a1e9647f6e..736dce149cf 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/pom.xml
@@ -15,7 +15,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>src/site/mediawiki</sourceFolder>
<outputFolder>${project.build.directory}/site/generated-eclipse-help</outputFolder>
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
index 7e165fa192a..b7118237e22 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
index d30e516cefb..7fbc7fe00b7 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.infra.types.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.infra.types.doc/pom.xml
index e97b7c043ae..89618a0663c 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.types.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.types.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resources</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml
index afa5568044e..6cb88358339 100644
--- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/pom.xml
index 9734fda3a0f..03541f7328c 100644
--- a/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/pom.xml
@@ -15,7 +15,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>src/site/mediawiki</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml
index f7245cf374a..12b568eaa8d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
index f55b0aae6b5..1910e28d8ac 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
index df1c5398a5b..638be6b0941 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
index 7c481a34f13..8910543ab3c 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml
index 9c110f1a362..fc8f8668e8d 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml
index 678af5e6c11..c9011adef0b 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
index c1d0fc878f6..d10d8d11c28 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/pom.xml
index ada30ef33c7..9cf7900c71e 100755
--- a/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/pom.xml
@@ -15,7 +15,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>site/mediawiki</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.views.documentation.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.views.documentation.doc/pom.xml
index e0748755863..bbb457ee07d 100644
--- a/plugins/doc/org.eclipse.papyrus.views.documentation.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.documentation.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
index 4b8cc842c16..34e152b8a52 100644
--- a/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.properties.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/plugins/doc/org.eclipse.papyrus.views.references.doc/pom.xml b/plugins/doc/org.eclipse.papyrus.views.references.doc/pom.xml
index dbbd4fe0503..fc0067b8deb 100644
--- a/plugins/doc/org.eclipse.papyrus.views.references.doc/pom.xml
+++ b/plugins/doc/org.eclipse.papyrus.views.references.doc/pom.xml
@@ -14,7 +14,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<configuration>
<sourceFolder>resource</sourceFolder>
<outputFolder>${project.build.directory}/generated-eclipse-help</outputFolder>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.mediawiki.core</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.mediawiki</artifactId>
<version>${mylyn.wikitext.version}</version>
</dependency>
</dependencies>
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 6dadee5b0a6..0961c03ccca 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -1,6 +1,7 @@
-<?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>
+<?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>
@@ -10,6 +11,7 @@
<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<properties>
<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
<testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass>
@@ -18,6 +20,7 @@
<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>
@@ -43,41 +46,24 @@
<module>targetPlatform</module>
</modules>
+
<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>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- <!-- Tycho build using the project's JDT settings. -->
- <useProjectSettings>true</useProjectSettings>
- </configuration>
- </plugin>
- <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>
@@ -93,8 +79,24 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
</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>
@@ -122,27 +124,15 @@
</execution>
</executions>
</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>
</plugins>
</build>
+
<profiles>
<profile>
<id>defaultProfile</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>papyrus-main</id>
@@ -155,9 +145,6 @@
<url>${papyrus.repo.toolsmiths}</url>
</repository>
</repositories>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
</profile>
<profile>
@@ -171,8 +158,15 @@
<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>
@@ -193,13 +187,6 @@
</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 26fbb81c4ba..4711fe3c359 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
+<?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>
<artifactId>org.eclipse.papyrus.releng</artifactId>
<packaging>pom</packaging>
<parent>
@@ -8,6 +9,7 @@
<artifactId>org.eclipse.papyrus.all.releng</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
+
<modules>
<module>../../plugins</module>
<module>../../examples</module>
@@ -16,71 +18,29 @@
<module>targetPlatform</module>
<module>site</module>
</modules>
-
- <repositories>
- <!-- Bug 468668: Reinstate and update this when the TableCombo has a new
- release for Mars or later. <repository> <id>nebula-tablecombo</id> <layout>p2</layout>
- <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>
- </repository> -->
- </repositories>
<properties>
+ <mojo.buildhelper.version>3.0.0</mojo.buildhelper.version>
+ <mylyn.wikitext.version>3.0.24</mylyn.wikitext.version>
+
<target.platform>org.eclipse.papyrus.main.${target.suffix}.target</target.platform>
</properties>
<build>
<pluginManagement>
+ <!-- redistributed plugins -->
<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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- <version>${xtext.version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- <!-- Tycho build using the project's JDT settings. -->
- <useProjectSettings>true</useProjectSettings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
+ <version>${mojo.buildhelper.version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.mylyn.docs</groupId>
- <artifactId>org.eclipse.mylyn.wikitext.core.maven</artifactId>
+ <artifactId>org.eclipse.mylyn.wikitext.maven</artifactId>
<version>${mylyn.wikitext.version}</version>
</plugin>
+
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
@@ -96,7 +56,7 @@
org.eclipse.mylyn.docs
</groupId>
<artifactId>
- org.eclipse.mylyn.wikitext.core.maven
+ org.eclipse.mylyn.wikitext.maven
</artifactId>
<versionRange>
[2.4.0-SNAPSHOT,)
@@ -115,7 +75,9 @@
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
+ <!-- local plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -131,8 +93,8 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
</plugin>
+
<!-- Sources -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -187,9 +149,11 @@
only. Activation: SIGN=true pack: produce a simple update site (Packed).
Used for nightly or feature branch builds. Activation: SIGN=false -->
<profiles>
-
<profile>
<id>defaultProfile</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -208,14 +172,16 @@
</plugin>
</plugins>
</build>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
</profile>
<profile>
<id>buildAll</id>
-
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -234,20 +200,18 @@
</plugin>
</plugins>
</build>
-
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
</profile>
-
-
<!-- nightly profile is useful for developers that want to link to nightly build -->
<profile>
<id>nightly</id>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>devnightly</value>
+ </property>
+ <activeByDefault>false</activeByDefault>
+ </activation>
<repositories>
<repository>
<id>papyrus-nightly</id>
@@ -266,19 +230,18 @@
</snapshots>
</repository>
</repositories>
- <activation>
- <property>
- <name>env</name>
- <value>devnightly</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
</profile>
<!-- Stable release profile. Takes +30min. Eclipse servers only -->
<profile>
<id>packAndSign</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
<!-- Pack200 -->
<build>
<plugins>
@@ -340,18 +303,18 @@
</plugin>
</plugins>
</build>
- <activation>
- <property>
- <name>SIGN</name>
- <value>true</value>
- </property>
- </activation>
</profile>
<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
<profile>
<id>pack</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>false</value>
+ </property>
+ </activation>
<build>
<plugins>
<!-- Pack200 -->
@@ -387,12 +350,6 @@
</plugin>
</plugins>
</build>
- <activation>
- <property>
- <name>SIGN</name>
- <value>false</value>
- </property>
- </activation>
</profile>
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index f261dcd2b64..5892a9de3db 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
+<?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.releng</artifactId>
@@ -34,13 +35,12 @@
<goal>generate-repository-facade</goal>
</goals>
<configuration>
-
- <!-- 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-->
<site>http://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</site>
- <!-- Provide the latest runtime update until its in the releases aggregation -->
- <site>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201806010809</site>
</associateSites>
</configuration>
</execution>
diff --git a/releng/pom.xml b/releng/pom.xml
index 639ef9f95ac..39dafb72ad4 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -10,28 +10,26 @@
<properties>
<tycho-version>1.2.0</tycho-version>
<tychoExtrasVersion>1.2.0</tychoExtrasVersion>
- <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
- <jarSignerVersion>1.1.2</jarSignerVersion>
+ <jarSignerVersion>1.1.5</jarSignerVersion>
<findbugs.version>3.0.1</findbugs.version>
- <xtext.version>2.11.0</xtext.version>
+ <xtext.version>2.14.0</xtext.version>
+ <maven.resources.version>3.0.2</maven.resources.version>
+ <maven.clean.version>3.0.0</maven.clean.version>
+ <mojo.execmaven.version>1.6.0</mojo.execmaven.version>
+ <jboss.utils.version>1.1.0</jboss.utils.version>
+ <maven.compiler.version>3.7.0</maven.compiler.version>
+
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git</tycho.scmUrl>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
- <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
<skipAllTests>false</skipAllTests>
<skipInnerTests>true</skipInnerTests>
+ <!-- Set buildAll 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). -->
+ <buildAll>false</buildAll>
- <!-- 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). -->
-
- <!-- Papyrus repositories. Used when we're building individual components
- (vs building the parent pom including everything) -->
+ <!-- Papyrus repositories. Used when we're building individual components (vs building the parent pom including everything) -->
<papyrus.eclipse.target>photon</papyrus.eclipse.target>
- <eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Deprecated; kept for Legacy. Can be set to file:/home/data/httpd/download.eclipse.org
- when building on HIPP -->
<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>
</properties>
@@ -43,6 +41,7 @@
</modules>
<pluginRepositories>
+ <!-- https://repo.maven.apache.org/maven2/ is being fetched by default -->
<pluginRepository>
<id>org.eclipse.cbi.maven.plugins</id>
<name>Eclipse CBI</name>
@@ -56,7 +55,6 @@
</pluginRepository>
<pluginRepository>
<id>eclipse.org-mylyn</id>
- <!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
<url>https://repo.eclipse.org/content/repositories/mylyn/</url>
</pluginRepository>
<pluginRepository>
@@ -68,11 +66,21 @@
<build>
<outputDirectory>bin</outputDirectory>
<pluginManagement>
+ <!-- redistributed plugin configurations -->
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>${maven.resources.version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
@@ -80,18 +88,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.6</version>
+ <version>${maven.clean.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
+ <version>${mojo.execmaven.version}</version>
</plugin>
+
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtext.version}</version>
</plugin>
+
+ <plugin>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>repository-utils</artifactId>
+ <version>${jboss.utils.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
@@ -103,6 +119,19 @@
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ <optimize>true</optimize>
+ <showWarnings>true</showWarnings>
+ <!-- Tycho build using the project's JDT settings. -->
+ <useProjectSettings>true</useProjectSettings>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -144,12 +173,6 @@
</target>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>0.26.0</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 6b49429a666..2e6512686e3 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -43,8 +43,6 @@
<!-- enable tycho build extension -->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml
index 47c3c46501b..994344ca683 100755
--- a/releng/toolsmiths/pom.xml
+++ b/releng/toolsmiths/pom.xml
@@ -1,6 +1,7 @@
-<?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>
+<?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>
<groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.toolsmiths.releng</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -23,46 +24,20 @@
<module>targetPlatform</module>
</modules>
- <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>
+ <build>
<plugins>
+ <!-- local plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- <!-- Tycho build using the project's JDT settings. -->
- <useProjectSettings>true</useProjectSettings>
- </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -71,8 +46,9 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
</plugin>
+
+ <!-- Sources -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
@@ -100,6 +76,7 @@
</execution>
</executions>
</plugin>
+
<!-- Pack200 -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
@@ -135,7 +112,6 @@
</build>
<profiles>
-
<profile>
<id>defaultProfile</id>
<repositories>
@@ -152,8 +128,13 @@
<profile>
<id>buildAll</id>
- <!-- Papyrus Update sites not included (They are included in the same build) -->
-
+ <!-- Papyrus Update sites not included (They are included in the same build) -->
+ <activation>
+ <property>
+ <name>buildAll</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -171,21 +152,19 @@
</executions>
</plugin>
</plugins>
- </build>
-
- <activation>
- <property>
- <name>buildAll</name>
- <value>true</value>
- </property>
- </activation>
+ </build>
</profile>
-
<!-- Stable release profile. Takes +30min. Eclipse servers only -->
<profile>
<id>packAndSign</id>
<!-- Pack200 -->
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -246,18 +225,18 @@
</plugin>
</plugins>
</build>
- <activation>
- <property>
- <name>SIGN</name>
- <value>true</value>
- </property>
- </activation>
</profile>
<!-- Nightly profile. Artifacts can be consumed, but are not signed -->
<profile>
<id>pack</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>false</value>
+ </property>
+ </activation>
<build>
<plugins>
<!-- Pack200 -->
@@ -293,12 +272,6 @@
</plugin>
</plugins>
</build>
- <activation>
- <property>
- <name>SIGN</name>
- <value>false</value>
- </property>
- </activation>
</profile>
diff --git a/releng/toolsmiths/site/pom.xml b/releng/toolsmiths/site/pom.xml
index 83a51e29d49..a485ec78ee1 100644
--- a/releng/toolsmiths/site/pom.xml
+++ b/releng/toolsmiths/site/pom.xml
@@ -1,6 +1,7 @@
-<?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>
+<?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.toolsmiths.releng</artifactId>
@@ -35,8 +36,9 @@
<goal>generate-repository-facade</goal>
</goals>
<configuration>
-
- <!-- 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>
<site>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a</site>
<site>http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/</site>

Back to the top