From e84c4a96c7e4313ffb9c3ceb04e290be1cdcda6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Ujhelyi?= <zoltan.ujhelyi@incquerylabs.com>
Date: Fri, 5 Jan 2024 16:07:41 +0100
Subject: [PATCH] [582668] Updated google.inject dependency management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to ensure only current Google Guice versions gets moved into
the SimRel repository, the feature does not include but only depend on a
Guice installation.

Change-Id: Ib9602e0242d2d6eca74228d58e792ea39de0e095
Signed-off-by: Zoltán Ujhelyi <zoltan.ujhelyi@incquerylabs.com>
---
 .../feature.xml                               | 21 ++-----------------
 releng/org.eclipse.viatra.update/category.xml |  2 ++
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/query/features/org.eclipse.viatra.query.language.feature/feature.xml b/query/features/org.eclipse.viatra.query.language.feature/feature.xml
index 6f2be5a42e..35065155fb 100644
--- a/query/features/org.eclipse.viatra.query.language.feature/feature.xml
+++ b/query/features/org.eclipse.viatra.query.language.feature/feature.xml
@@ -26,28 +26,11 @@
    <requires>
       <import feature="org.eclipse.viatra.query.runtime.feature" version="2.8.0" match="equivalent"/>
       <import feature="org.eclipse.xtext.runtime" version="2.16.0" match="compatible"/>
+      <import plugin="com.google.inject" version="3.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
          id="org.eclipse.viatra.query.patternlanguage.emf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.inject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.inject.multibindings"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/releng/org.eclipse.viatra.update/category.xml b/releng/org.eclipse.viatra.update/category.xml
index 1b7e1bbd9d..b24cad0ca3 100644
--- a/releng/org.eclipse.viatra.update/category.xml
+++ b/releng/org.eclipse.viatra.update/category.xml
@@ -21,6 +21,8 @@
    <feature url="features/org.eclipse.viatra.query.language.vgql.feature_0.28.1.qualifier.jar" id="org.eclipse.viatra.query.language.vgql.feature" version="0.28.1.qualifier">
       <category name="org.eclipse.viatra.core"/>
    </feature>
+   <bundle id="com.google.inject"/>
+   <bundle id="com.google.inject.multibindings"/>
    <category-def name="org.eclipse.viatra.core" label="VIATRA Core"/>
    <category-def name="org.eclipse.viatra.extensions" label="VIATRA Extensions"/>
 </site>