Bug 579959: [Build] Remove JBoss references from pom.xml to fix jobs in errors
- Remove JBoss reference
- Only use tycho-p2 for update site build
- in addition, fix URL in RCP
Change-Id: I877db7a2a55309f23125c7f8c6ba73618677da9c
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/releng/org.eclipse.papyrus.designer.configuration/pom.xml b/releng/org.eclipse.papyrus.designer.configuration/pom.xml
index cc065a1..551eacb 100644
--- a/releng/org.eclipse.papyrus.designer.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.designer.configuration/pom.xml
@@ -201,12 +201,6 @@
<artifactId>eclipse-winsigner-plugin</artifactId>
<version>${eclipse-cbi.version}</version>
</plugin>
- <plugin>
- <!-- https://github.com/jbosstools/jbosstools-maven-plugins/wiki -->
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>2.2.0</version>
- </plugin>
</plugins>
</pluginManagement>
diff --git a/releng/org.eclipse.papyrus.designer.p2/pom.xml b/releng/org.eclipse.papyrus.designer.p2/pom.xml
index 5a544fe..ef7035d 100644
--- a/releng/org.eclipse.papyrus.designer.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.designer.p2/pom.xml
@@ -14,24 +14,18 @@
<name>org.eclipse.papyrus.designer.p2</name>
<description>This plugin defines the update site of Designer plugins and feature.</description>
- <pluginRepositories>
- <pluginRepository>
- <id>org.jboss.tools.tycho-plugins</id>
- <url>https://repository.jboss.org/</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
- <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
<plugin>
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho.version}</version>
<executions>
<execution>
- <phase>package</phase>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
<goals>
- <goal>generate-repository-facade</goal>
+ <goal>p2-metadata</goal>
</goals>
<configuration>
<!-- components update facade -->
@@ -46,7 +40,7 @@
<siteTemplateFolder>siteTemplate</siteTemplateFolder>
<p2StatsUrl>https://download.eclipse.org/stats</p2StatsUrl>
- <!-- p2 update site transitive dependencies repositories -->
+ <!-- p2 update site transitive dependencies repositories -->
<associateSites>
<site>https://download.eclipse.org/modeling/mdt/papyrus/components/marte/</site>
<site>https://ci.eclipse.org/papyrus/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/</site>
@@ -54,25 +48,7 @@
</configuration>
</execution>
</executions>
-
- <!-- components dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- </dependency>
- </dependencies>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
</plugins>
</build>
</project>
