[582461] Makes codebase compatible with Guice 7.0

Guice 7.0 stopped supporting the injector-framework independent
`javax.inject`, `javax.servlet` and `javax.persistence` packages in
favor of `jakarta.inject`, `jakarta.servlet` and `jakarta.persistence`,
breaking injections relying on these components when using the new
version. See https://github.com/google/guice/wiki/Guice700 for details.

This commit replaces these usages with the Guice-specific annotations as
they are compatible with Guice 3.0-7.0 releases that is necessary to
support all the environments VIATRA 2.8 aims to support.

Change-Id: I2164a492f330d2e56c74171fc034c357fc360942
Signed-off-by: Zoltan Ujhelyi <[email protected]>

addon/plugins/org.eclipse.viatra.addon.querybasedfeatures.runtime.validation/META-INF/MANIFEST.MF

@@ -7,6 +7,6 @@ Bundle-Vendor: Eclipse VIATRA Project
 Fragment-Host: org.eclipse.viatra.addon.querybasedfeatures.runtime;bundle-version="[2.8.0,2.9.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.viatra.addon.querybasedfeatures.runtime.validation
-Require-Bundle: org.eclipse.viatra.query.patternlanguage.emf;bundle-version="[2.8.0,2.9.0)"
-Import-Package: javax.inject
+Require-Bundle: org.eclipse.viatra.query.patternlanguage.emf;bundle-version="[2.8.0,2.9.0)",
+ com.google.inject
 Automatic-Module-Name: org.eclipse.viatra.addon.querybasedfeatures.runtime.validation

addon/plugins/org.eclipse.viatra.addon.querybasedfeatures.runtime.validation/src/org/eclipse/viatra/addon/querybasedfeatures/runtime/validation/QueryBasedFeaturePatternValidator.java

@@ -11,7 +11,7 @@
 import java.util.Collection;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;

addon/plugins/org.eclipse.viatra.addon.querybasedfeatures.runtime.validation/src/org/eclipse/viatra/addon/querybasedfeatures/runtime/validation/SurrogatePatternValidator.java

@@ -11,7 +11,7 @@
 import java.util.Collection;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;

query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/patternlanguage/emf/ui/builder/configuration/EMFPatternLanguageGeneratorEclipseConfigProvider.java

@@ -8,8 +8,6 @@
  *******************************************************************************/
 package org.eclipse.viatra.query.patternlanguage.emf.ui.builder.configuration;
 
-import javax.inject.Inject;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.emf.ecore.EObject;
@@ -19,6 +17,7 @@
 import org.eclipse.xtext.xbase.compiler.IGeneratorConfigProvider;
 
 import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
 
 /**
  * This class is a modified version of {@link org.eclipse.xtext.xbase.ui.builder.EclipseGeneratorConfigProvider} that

query/plugins/org.eclipse.viatra.query.patternlanguage.emf.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java

@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.eclipse.viatra.query.tooling.ui.migrator.metadata;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;

query/plugins/org.eclipse.viatra.query.patternlanguage.emf/src/org/eclipse/viatra/query/patternlanguage/emf/util/EMFPatternLanguageGeneratorConfigProvider.java

@@ -13,7 +13,7 @@
 import java.io.IOException;
 import java.util.Properties;
 
-import javax.inject.Inject;
+import com.google.inject.Inject;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;