From efaf9972defe95ed34f188d35cd0f64870c91620 Mon Sep 17 00:00:00 2001
From: Philippe DUL <philippe.dul@thalesgroup.com>
Date: Fri, 2 Aug 2024 15:56:13 +0200
Subject: [PATCH] #2891 Force guava version

---
 .../org.polarsys.capella.rcp/feature.xml      | 36 ++++++++-----------
 .../capella.target-definition.targetplatform  |  2 +-
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/releng/features/org.polarsys.capella.rcp/feature.xml b/releng/features/org.polarsys.capella.rcp/feature.xml
index 4604f7817a..6e8b436731 100644
--- a/releng/features/org.polarsys.capella.rcp/feature.xml
+++ b/releng/features/org.polarsys.capella.rcp/feature.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2006, 2020 THALES GLOBAL SERVICES.
-  
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License 2.0 which is available at
-  http://www.eclipse.org/legal/epl-2.0
-  
-  SPDX-License-Identifier: EPL-2.0
-  
-  Contributors:
-       Thales - initial API and implementation
+<!--
+  Copyright (c) 2006, 2020 THALES GLOBAL SERVICES.
+  
+  This program and the accompanying materials are made available under the
+  terms of the Eclipse Public License 2.0 which is available at
+  http://www.eclipse.org/legal/epl-2.0
+  
+  SPDX-License-Identifier: EPL-2.0
+  
+  Contributors:
+       Thales - initial API and implementation
 -->
 <feature
       id="org.polarsys.capella.rcp"
@@ -20,7 +20,7 @@
    <description>
       %description
    </description>
-   
+
    <copyright>
       %copyright
    </copyright>
@@ -98,13 +98,8 @@
          version="0.0.0"/>
 
    <requires>
-   	  <!-- 
-   	  	Theorically, we would have to add no-source features of our dependencies here.
-   	  	But when the feature.source is generated by tycho, it doesn't generate <import> features.
-   	  	Adding them here avoid to maintain two features, with and without sources
-   	  -->
-   	  
-	  <import plugin="ch.qos.logback.slf4j"/>
+      <import plugin="ch.qos.logback.slf4j"/>
+      <import plugin="com.google.guava" version="31" match="compatible"/>
       <import feature="org.eclipse.acceleo.query.source"/>
       <import feature="org.eclipse.acceleo.ui.interpreter.source"/>
       <import feature="org.eclipse.amalgam.explorer.activity.source"/>
@@ -154,9 +149,8 @@
       <import feature="org.polarsys.kitalpha.resourcereuse.ui.feature.source"/>
       <import feature="org.polarsys.kitalpha.richtext.widget.feature.source"/>
       <import feature="org.polarsys.kitalpha.transposer.feature.source"/>
-
    </requires>
-   
+
    <plugin
          id="org.polarsys.capella.rcp"
          download-size="0"
diff --git a/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform b/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform
index e39bd62849..83d24014b3 100644
--- a/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform
+++ b/releng/plugins/org.polarsys.capella.targets/full/capella.target-definition.targetplatform
@@ -49,7 +49,7 @@ location eclipse "https://download.eclipse.org/releases/2023-03" {
 	org.eclipse.egit.source.feature.group
 	org.apache.log4j
 	org.apache.commons.lang
-	com.google.guava
+	com.google.guava [31, 32) //guava version is also defined in org.polarsys.capella.rcp/feature.xml
 }
 
 location Mylyn-3.26 "https://download.eclipse.org/mylyn/releases/3.26/" {