mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-04 15:45:52 +00:00
follow up merge fixes
This commit is contained in:
1 parent
e17760256e
commit
c1451269c3
5 files changed
+19
-6
No files matched your search
@@ -28,6 +28,7 @@ import static hudson.init.InitMilestone.PLUGINS_STARTED;
|
||||
import static hudson.init.InitMilestone.PLUGINS_LISTED;
|
||||
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
import hudson.PluginWrapper.Dependency;
|
||||
import hudson.init.InitStrategy;
|
||||
import hudson.init.InitializerFinder;
|
||||
@@ -278,7 +279,7 @@ public abstract class PluginManager extends AbstractModelObject {
|
||||
Jenkins.getInstance().lookup.set(PluginInstanceStore.class,new PluginInstanceStore());
|
||||
TaskGraphBuilder g = new TaskGraphBuilder();
|
||||
|
||||
Hudson.getInstance().container = Guice.createInjector();
|
||||
Jenkins.getInstance().lookup.set(Injector.class,Guice.createInjector());
|
||||
|
||||
// schedule execution of loading plugins
|
||||
for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[activePlugins.size()])) {
|
||||
|
||||
Reference in new issue
Block a user