#2891 Force guava version to 30

eclipse-capella · Sep 18, 2024 · 8dd40ce · 8dd40ce
1 parent fb402a8
commit 8dd40ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/releng/features/org.polarsys.capella.rcp/feature.xml b/releng/features/org.polarsys.capella.rcp/feature.xml
@@ -98,13 +98,7 @@
          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="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,7 +148,6 @@
       <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

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
@@ -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 [31, 32) //guava version is also defined in org.polarsys.capella.rcp/feature.xml
+	com.google.guava [30, 31) //2023-03 xtext version
 }
 
 location Mylyn-3.26 "https://download.eclipse.org/mylyn/releases/3.26/" {