Use javax.inject.Inject instead of com.google.inject.Inject

The Guice team is discouraging use of its specific annotation where
possible, to increase JSR330 compliance.

Leave optional injection alone for now, which needs to be manually
replaced with OptionalBinder.

Change-Id: I4f53a518ba6f36fd67af12f3540dc44cbad07ff8

gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java

@@ -27,7 +27,6 @@ import com.google.gerrit.server.securestore.SecureStore;
 import com.google.gerrit.server.securestore.SecureStoreProvider;
 import com.google.gwtorm.server.SchemaFactory;
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 
@@ -36,6 +35,8 @@ import org.eclipse.jgit.lib.PersonIdent;
 
 import java.io.File;
 
+import javax.inject.Inject;
+
 /**
  * Copies critical objects from the {@code dbInjector} into a plugin.
  * <p>

gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java

@@ -21,9 +21,10 @@ import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.server.plugins.DisablePlugin.Input;
 import com.google.gerrit.server.plugins.ListPlugins.PluginInfo;
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import javax.inject.Inject;
+
 @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
 @Singleton
 class DisablePlugin implements RestModifyView<PluginResource, Input> {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java

@@ -22,12 +22,13 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.server.plugins.EnablePlugin.Input;
 import com.google.gerrit.server.plugins.ListPlugins.PluginInfo;
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import javax.inject.Inject;
+
 @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
 @Singleton
 class EnablePlugin implements RestModifyView<PluginResource, Input> {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java

@@ -25,7 +25,6 @@ import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.restapi.TopLevelResource;
 import com.google.gerrit.server.plugins.InstallPlugin.Input;
 import com.google.gerrit.server.plugins.ListPlugins.PluginInfo;
-import com.google.inject.Inject;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,6 +34,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.zip.ZipException;
 
+import javax.inject.Inject;
+
 @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
 class InstallPlugin implements RestModifyView<TopLevelResource, Input> {
   static class Input {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java

@@ -18,7 +18,6 @@ import static com.google.gerrit.server.plugins.PluginLoader.asTemp;
 
 import com.google.common.base.MoreObjects;
 import com.google.gerrit.server.config.SitePaths;
-import com.google.inject.Inject;
 
 import org.eclipse.jgit.internal.storage.file.FileSnapshot;
 import org.slf4j.Logger;
@@ -38,6 +37,8 @@ import java.util.List;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
+import javax.inject.Inject;
+
 public class JarPluginProvider implements ServerPluginProvider {
   static final String PLUGIN_TMP_PREFIX = "plugin_";
   static final String JAR_EXTENSION = ".jar";

gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java

@@ -25,7 +25,6 @@ import com.google.gerrit.extensions.restapi.Url;
 import com.google.gerrit.server.OutputFormat;
 import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
-import com.google.inject.Inject;
 
 import org.kohsuke.args4j.Option;
 
@@ -35,6 +34,8 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 /** List the installed plugins. */
 @RequiresCapability(GlobalCapability.VIEW_PLUGINS)
 public class ListPlugins implements RestReadView<TopLevelResource> {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java

@@ -16,12 +16,13 @@ package com.google.gerrit.server.plugins;
 
 import com.google.gerrit.server.git.WorkQueue;
 import com.google.gerrit.server.util.TimeUtil;
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 @Singleton
 class PluginCleanerTask implements Runnable {
   private final WorkQueue workQueue;

gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java

@@ -36,7 +36,6 @@ import com.google.gerrit.server.config.ConfigUtil;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.plugins.ServerPluginProvider.PluginDescription;
-import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
@@ -66,6 +65,8 @@ import java.util.TreeSet;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 @Singleton
 public class PluginLoader implements LifecycleListener {
   static final String PLUGIN_TMP_PREFIX = "plugin_";

gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java

@@ -22,10 +22,11 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
 import com.google.gerrit.extensions.restapi.RestCollection;
 import com.google.gerrit.extensions.restapi.RestView;
 import com.google.gerrit.extensions.restapi.TopLevelResource;
-import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
+import javax.inject.Inject;
+
 @Singleton
 public class PluginsCollection implements
     RestCollection<TopLevelResource, PluginResource>,

gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java

@@ -21,12 +21,13 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.server.plugins.ListPlugins.PluginInfo;
 import com.google.gerrit.server.plugins.ReloadPlugin.Input;
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import javax.inject.Inject;
+
 @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
 @Singleton
 class ReloadPlugin implements RestModifyView<PluginResource, Input> {

gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java

@@ -15,7 +15,6 @@
 package com.google.gerrit.server.plugins;
 
 import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import org.eclipse.jgit.internal.storage.file.FileSnapshot;
@@ -26,6 +25,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 @Singleton
 class UniversalServerPluginProvider implements ServerPluginProvider {
   private static final Logger log = LoggerFactory.getLogger(UniversalServerPluginProvider.class);