Revert "[remkop#1319] Bugfix: Avoid `DuplicateOptionAnnotationsExcept…

…ion` when parent has inherited mixed-in help options and the built-in `HelpCommand` subcommand."

This reverts commit 1a95bf2.

RELEASE-NOTES.md

@@ -26,7 +26,6 @@ Picocli follows [semantic versioning](http://semver.org/).
 * [#1303] Bugfix: Prevent `IllegalArgumentException: argument type mismatch` error in method subcommands with inherited mixed-in standard help options. Thanks to [Andreas Deininger](https://github.com/deining) for raising this.
 * [#1300] Bugfix: Avoid spurious warning "Could not set initial value for field boolean" when reusing `CommandLine` with ArgGroup. Thanks to [Yashodhan Ghadge](https://github.com/codexetreme) for raising this.
 * [#1316] Bugfix: Avoid `DuplicateOptionAnnotationsException` thrown on `mixinStandardHelpOptions` for subcommands when parent has `scope = INHERIT` by `picocli-codegen` annotation processor. Thanks to [Philippe Charles](https://github.com/charphi) for raising this.
-* [#1319] Bugfix: Avoid `DuplicateOptionAnnotationsException` when parent has inherited mixed-in help options and the built-in `HelpCommand` subcommand. Thanks to [Andreas Deininger](https://github.com/deining) for raising this.
 * [#1320][#1321] Bugfix/Enhancement: Use system properties `sun.stdout.encoding` and `sun.stderr.encoding` when creating the `PrintWriters` returned by  `CommandLine::getOut` and `CommandLine::getErr`. Thanks to [Philippe Charles](https://github.com/charphi) for the investigation and the pull request.
 * [#1296] DOC: add Kotlin code samples to user manual; other user manual improvements. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.
 * [#1299] DOC: Link to `IParameterPreprocessor` from `IParameterConsumer` javadoc. Thanks to [Andreas Deininger](https://github.com/deining) for the pull request.

src/main/java/picocli/CommandLine.java

@@ -7156,12 +7156,8 @@ public CommandSpec negatableOptionTransformer(INegatableOptionTransformer newVal
              * @see Command#mixinStandardHelpOptions() */
             public CommandSpec mixinStandardHelpOptions(boolean newValue) {
                 if (newValue) {
-                    CommandSpec mixin = CommandSpec.forAnnotatedObject(new AutoHelpMixin(), new DefaultFactory());
-                    boolean overlap = false;
-                    for (String key : mixin.optionsMap().keySet()) {
-                        if (optionsMap().containsKey(key)) { overlap = true; break; }
-                    }
-                    if (!overlap) { // #1316, 1319 avoid DuplicateOptionAnnotationsException
+                    if (!mixins.containsKey(AutoHelpMixin.KEY)) { // #1316 avoid DuplicateOptionAnnotationsException
+                        CommandSpec mixin = CommandSpec.forAnnotatedObject(new AutoHelpMixin(), new DefaultFactory());
                         mixin.inherited = this.inherited();
                         addMixin(AutoHelpMixin.KEY, mixin);
                     }

src/test/java/picocli/InheritedOptionTest.java

@@ -558,6 +558,7 @@ class Example { }
         new CommandLine(new Example()); // succeeds without error
     }
 
+    @Ignore("Needs fix for #1319")
     @Test
     public void testIssue1319() {
         @Command(scope = CommandLine.ScopeType.INHERIT