Bug 579959: [Build] Remove JBoss references from pom.xml to fix jobs in errors
- in addition, we replaced tycho-source-feature-plugin:source-feature by tycho-source-plugin:feature-source
Change-Id: Iff840ef8d40531c5f7912bc6a11514ab76c09d7e
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
diff --git a/pom.xml b/pom.xml
index 7cdfed6..fcd06e1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,11 @@
<mojo.execmaven.version>3.0.0</mojo.execmaven.version>
<maven.compiler.version>3.8.1</maven.compiler.version>
- <tycho-version>2.2.0</tycho-version>
- <tychoExtrasVersion>2.2.0</tychoExtrasVersion>
+ <tycho-version>2.4.0</tycho-version>
+ <tychoExtrasVersion>2.4.0</tychoExtrasVersion>
<jarSignerVersion>1.3.1</jarSignerVersion>
<findbugs.version>3.0.5</findbugs.version>
<xtext.version>2.23.0</xtext.version>
- <jboss.version>1.7.0</jboss.version>
<jacoco.version>0.8.2</jacoco.version>
<testConfig>CI_TESTS_CONFIG</testConfig>
<test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine>
@@ -58,10 +57,6 @@
<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
<url>https://repo.eclipse.org/content/repositories/mylyn/</url>
</pluginRepository>
- <pluginRepository>
- <id>org.jboss.tools.tycho-plugins</id>
- <url>https://repository.jboss.org/</url>
- </pluginRepository>
</pluginRepositories>
<repositories>
@@ -109,11 +104,6 @@
<version>${tycho-version}</version>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- </plugin>
- <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
@@ -184,17 +174,10 @@
<goal>plugin-source</goal>
</goals>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
<execution>
- <id>source-feature</id>
- <phase>package</phase>
+ <id>feature-source</id>
<goals>
- <goal>source-feature</goal>
+ <goal>feature-source</goal>
</goals>
</execution>
</executions>
diff --git a/releng-model2doc/category/pom.xml b/releng-model2doc/category/pom.xml
index a3b6ccc..47d47d9 100755
--- a/releng-model2doc/category/pom.xml
+++ b/releng-model2doc/category/pom.xml
@@ -15,51 +15,4 @@
<name>Papyrus Model to Documentation p2</name>
<description>This plugin defines the update site of Papyrus UML Model to Documentation plugins and features.</description>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <build>
- <plugins>
- <plugin>
- <!-- https://github.com/jbosstools/jbosstools-maven-plugins/wiki -->
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>${jboss.version}</version>
- <executions>
- <execution>
- <id>generate-facade</id>
- <phase>package</phase>
- <goals>
- <goal>generate-repository-facade</goal>
- </goals>
- <configuration>
- <!-- do not generate the pesky web folder and index.html -->
- <skipWebContentGeneration>true</skipWebContentGeneration>
- <associateSites>
- <!-- SysML Update site -->
- <site>https://download.eclipse.org/modeling/mdt/papyrus/components/sysml16/2022-03/</site>
- <!-- GMF Notation update site -->
- <site>https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913/</site>
- <!-- GMF Runtime update site -->
- <site>https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202202190902/</site>
- </associateSites>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
</project>
