diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/configuration/MavenRunConfigurationSettingsEditor.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/configuration/MavenRunConfigurationSettingsEditor.kt index fdd84af1ebab..b37215d3fc64 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/configuration/MavenRunConfigurationSettingsEditor.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/configuration/MavenRunConfigurationSettingsEditor.kt @@ -115,7 +115,6 @@ class MavenRunConfigurationSettingsEditor( addOutputLevelFragment() addThreadsFragment() addMultimoduleDirFragment() - addUsePluginRegistryTag() addPrintStacktracesTag() addUpdateSnapshotsTag() addExecuteNonRecursivelyTag() @@ -266,16 +265,6 @@ class MavenRunConfigurationSettingsEditor( { runnerSettingsOrDefault.isSkipTests = it } ) - private fun SettingsEditorFragmentContainer.addUsePluginRegistryTag() = - addTag( - "maven.use.plugin.registry.tag", - MavenConfigurableBundle.message("maven.settings.general.use.plugin.registry"), - MavenConfigurableBundle.message("maven.run.configuration.general.options.group"), - MavenConfigurableBundle.message("maven.settings.general.use.plugin.registry.tooltip"), - { generalSettingsOrDefault.isUsePluginRegistry }, - { generalSettingsOrDefault.isUsePluginRegistry = it } - ) - private fun SettingsEditorFragmentContainer.addPrintStacktracesTag() = addTag( "maven.print.stacktraces.tag", diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.form index cdf151d09828..25ed685f53e4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.form @@ -1,6 +1,6 @@
- + @@ -10,7 +10,7 @@ - + @@ -21,13 +21,13 @@ - + - + @@ -36,13 +36,13 @@ - + - + @@ -51,7 +51,7 @@ - + @@ -65,19 +65,9 @@ - - - - - - - - - - - + @@ -89,7 +79,7 @@ - + @@ -100,17 +90,17 @@ - + - + - + @@ -120,7 +110,7 @@ - + @@ -132,7 +122,7 @@ - + @@ -140,7 +130,7 @@ - + @@ -149,7 +139,7 @@ - + @@ -158,7 +148,7 @@ - + @@ -167,13 +157,13 @@ - + - + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java index 1c3cdaa895f9..e2fce0dcd922 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java @@ -29,7 +29,6 @@ public class MavenGeneralPanel implements PanelWithAnchor { private JCheckBox checkboxProduceExceptionErrorMessages; private JComboBox checksumPolicyCombo; private JComboBox failPolicyCombo; - private JCheckBox checkboxUsePluginRegistry; private JCheckBox checkboxRecursive; private MavenEnvironmentForm mavenPathsForm; private JBLabel myMultiProjectBuildFailPolicyLabel; @@ -96,7 +95,6 @@ public class MavenGeneralPanel implements PanelWithAnchor { mavenPathsForm.setData(data); data.setPrintErrorStackTraces(checkboxProduceExceptionErrorMessages.isSelected()); - data.setUsePluginRegistry(checkboxUsePluginRegistry.isSelected()); data.setNonRecursive(!checkboxRecursive.isSelected()); data.setOutputLevel((MavenExecutionOptions.LoggingLevel)ComboBoxUtil.getSelectedValue(outputLevelComboModel)); @@ -121,7 +119,6 @@ public class MavenGeneralPanel implements PanelWithAnchor { mavenPathsForm.initializeFormData(data, project); checkboxProduceExceptionErrorMessages.setSelected(data.isPrintErrorStackTraces()); - checkboxUsePluginRegistry.setSelected(data.isUsePluginRegistry()); checkboxRecursive.setSelected(!data.isNonRecursive()); alwaysUpdateSnapshotsCheckBox.setSelected(data.isAlwaysUpdateSnapshots()); threadsEditor.setText(StringUtil.notNullize(data.getThreads())); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java index 9d0dabaa9d06..038014400d4d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java @@ -37,7 +37,6 @@ public class MavenGeneralSettings implements Cloneable { private String mavenSettingsFile = ""; private String overriddenLocalRepository = ""; private boolean printErrorStackTraces = false; - private boolean usePluginRegistry = false; private boolean nonRecursive = false; private boolean alwaysUpdateSnapshots = false; private boolean showDialogWithAdvancedSettings = false; @@ -294,17 +293,6 @@ public class MavenGeneralSettings implements Cloneable { } } - public boolean isUsePluginRegistry() { - return usePluginRegistry; - } - - public void setUsePluginRegistry(final boolean value) { - if (!Comparing.equal(this.usePluginRegistry, value)) { - this.usePluginRegistry = value; - changed(); - } - } - public boolean isUseMavenConfig() { return useMavenConfig; } @@ -384,7 +372,6 @@ public class MavenGeneralSettings implements Cloneable { if (alwaysUpdateSnapshots != that.alwaysUpdateSnapshots) return false; if (showDialogWithAdvancedSettings != that.showDialogWithAdvancedSettings) return false; if (printErrorStackTraces != that.printErrorStackTraces) return false; - if (usePluginRegistry != that.usePluginRegistry) return false; if (useMavenConfig != that.useMavenConfig) return false; if (workOffline != that.workOffline) return false; if (!checksumPolicy.equals(that.checksumPolicy)) return false; @@ -405,7 +392,6 @@ public class MavenGeneralSettings implements Cloneable { result = 31 * result + mavenSettingsFile.hashCode(); result = 31 * result + overriddenLocalRepository.hashCode(); result = 31 * result + (printErrorStackTraces ? 1 : 0); - result = 31 * result + (usePluginRegistry ? 1 : 0); result = 31 * result + (useMavenConfig ? 1 : 0); result = 31 * result + (nonRecursive ? 1 : 0); result = 31 * result + outputLevel.hashCode(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenSettingsCollector.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenSettingsCollector.kt index 1e436a4934b0..5089971a7242 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenSettingsCollector.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenSettingsCollector.kt @@ -41,7 +41,6 @@ class MavenSettingsCollector : ProjectUsagesCollector() { usages.add(ALWAYS_UPDATE_SNAPSHOTS.metric(generalSettings.isAlwaysUpdateSnapshots)) usages.add(NON_RECURSIVE.metric(generalSettings.isNonRecursive)) usages.add(PRINT_ERROR_STACK_TRACES.metric(generalSettings.isPrintErrorStackTraces)) - usages.add(USE_PLUGIN_REGISTRY.metric(generalSettings.isUsePluginRegistry)) usages.add(WORK_OFFLINE.metric(generalSettings.isWorkOffline)) usages.add(OUTPUT_LEVEL.metric(generalSettings.outputLevel)) @Suppress("DEPRECATION") @@ -102,12 +101,11 @@ class MavenSettingsCollector : ProjectUsagesCollector() { } companion object { - private val GROUP = EventLogGroup("build.maven.state", 9) + private val GROUP = EventLogGroup("build.maven.state", 10) private val HAS_MAVEN_PROJECT = GROUP.registerEvent("hasMavenProject", EventFields.Enabled) private val ALWAYS_UPDATE_SNAPSHOTS = GROUP.registerEvent("alwaysUpdateSnapshots", EventFields.Enabled) private val NON_RECURSIVE = GROUP.registerEvent("nonRecursive", EventFields.Enabled) private val PRINT_ERROR_STACK_TRACES = GROUP.registerEvent("printErrorStackTraces", EventFields.Enabled) - private val USE_PLUGIN_REGISTRY = GROUP.registerEvent("usePluginRegistry", EventFields.Enabled) private val WORK_OFFLINE = GROUP.registerEvent("workOffline", EventFields.Enabled) private val LOCAL_REPOSITORY = GROUP.registerEvent("localRepository", EventFields.Enabled) private val USER_SETTINGS_FILE = GROUP.registerEvent("userSettingsFile", EventFields.Enabled) diff --git a/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties b/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties index 57c05f75cec3..d34bcd5ec9a6 100644 --- a/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties +++ b/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties @@ -14,8 +14,6 @@ maven.settings.environment.use.maven.config.settings.hint=Any changes made maven.settings.general.work.offline=Work &offline maven.settings.general.work.offline.tooltip=Add option --offline to command line when run maven goals -maven.settings.general.use.plugin.registry=Use plugin ®istry -maven.settings.general.use.plugin.registry.tooltip=Add option --no-plugin-registry if this option is not selected maven.settings.general.execute.recursively=Execute &goals recursively maven.settings.general.execute.non.recursively=Execute &goals non recursively maven.settings.general.execute.recursively.tooltip=Add option --non-recursive if this option is not selected diff --git a/resources-en/resources/search/searchableOptions.xml b/resources-en/resources/search/searchableOptions.xml index 30ce362c2f93..932a1a474c58 100644 --- a/resources-en/resources/search/searchableOptions.xml +++ b/resources-en/resources/search/searchableOptions.xml @@ -33794,9 +33794,6 @@