Skip to content

Commit

Permalink
releng: Remove JBoss repository-utils from build
Browse files Browse the repository at this point in the history
Remove the generate-repository-facade goal from releng-site pom.xml

Move the associateSites to category.xml as repository-reference.

Upgrade Tycho version to 2.7.3.

Change-Id: Ia63057499edeb5fa22869a9e6666fd730a56223a
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/193429
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
  • Loading branch information
PatrickTasse committed May 18, 2022
1 parent bf70416 commit 1de5436
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,6 @@
Additional functionalities for Trace Compass
</description>
</category-def>
<repository-reference location="https://download.eclipse.org/ease/release/0.8.0" enabled="true" />
<repository-reference location="https://eclipse.py4j.org" enabled="true" />
</site>
27 changes: 0 additions & 27 deletions common/org.eclipse.tracecompass.incubator.releng-site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,6 @@
<name>Trace Compass Incubator Repository</name>
<packaging>eclipse-repository</packaging>

<build>
<plugins>
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
<executions>
<execution>
<id>generate-facade</id>
<phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
</execution>
</executions>
<configuration>
<removeDefaultCategory>true</removeDefaultCategory>
<skipWebContentGeneration>true</skipWebContentGeneration>
<associateSites>
<site>https://download.eclipse.org/ease/release/0.8.0</site>
<site>http://eclipse.py4j.org</site>
</associateSites>
<skipBuildInfo>true</skipBuildInfo>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>deploy-update-site</id>
Expand Down
17 changes: 3 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2017, 2021 École Polytechnique de Montréal and others
Copyright (C) 2017, 2021 �cole Polytechnique de Montr�al and others
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -50,8 +50,8 @@
<jdk.version>11</jdk.version>
<jdk.release>11</jdk.release>

<tycho-version>2.3.0</tycho-version>
<tycho-extras-version>2.3.0</tycho-extras-version>
<tycho-version>2.7.3</tycho-version>
<tycho-extras-version>2.7.3</tycho-extras-version>
<tycho-use-project-settings>true</tycho-use-project-settings>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass.incubator/org.eclipse.tracecompass.incubator.git</tycho.scmUrl>
<cbi-plugins.version>1.3.1</cbi-plugins.version>
Expand Down Expand Up @@ -101,11 +101,6 @@
<id>tycho-snapshots</id>
<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
</pluginRepository>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
</pluginRepository>
<pluginRepository>
<id>rcptt-snapshots</id>
<name>RCPTT Maven Snapshots repository</name>
Expand Down Expand Up @@ -654,12 +649,6 @@
<version>2.9</version>
</plugin>

<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
<version>1.7.0</version>
</plugin>

<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
Expand Down

0 comments on commit 1de5436

Please sign in to comment.