Add missing @Deprecated and @Override.
diff --git a/src/main/java/org/apache/commons/cli/CommandLine.java b/src/main/java/org/apache/commons/cli/CommandLine.java
index e6b1cd9..3a5d4a7 100644
--- a/src/main/java/org/apache/commons/cli/CommandLine.java
+++ b/src/main/java/org/apache/commons/cli/CommandLine.java
@@ -167,6 +167,7 @@
      * @param opt the name of the option.
      * @return the type of opt.
      */
+    @Deprecated
     public Object getOptionObject(final char opt)
     {
         return getOptionObject(String.valueOf(opt));
diff --git a/src/main/java/org/apache/commons/cli/DefaultParser.java b/src/main/java/org/apache/commons/cli/DefaultParser.java
index d52eb94..eb34bf8 100644
--- a/src/main/java/org/apache/commons/cli/DefaultParser.java
+++ b/src/main/java/org/apache/commons/cli/DefaultParser.java
@@ -101,6 +101,7 @@
         this.allowPartialMatching = allowPartialMatching;
     }
 
+    @Override
     public CommandLine parse(final Options options, final String[] arguments) throws ParseException
     {
         return parse(options, arguments, null);
@@ -122,6 +123,7 @@
         return parse(options, arguments, properties, false);
     }
 
+    @Override
     public CommandLine parse(final Options options, final String[] arguments, final boolean stopAtNonOption) throws ParseException
     {
         return parse(options, arguments, null, stopAtNonOption);
diff --git a/src/main/java/org/apache/commons/cli/HelpFormatter.java b/src/main/java/org/apache/commons/cli/HelpFormatter.java
index af13ae8..961f130 100644
--- a/src/main/java/org/apache/commons/cli/HelpFormatter.java
+++ b/src/main/java/org/apache/commons/cli/HelpFormatter.java
@@ -1083,6 +1083,7 @@
          *         the first argument is less than, equal to, or greater than the
          *         second.
          */
+        @Override
         public int compare(final Option opt1, final Option opt2)
         {
             return opt1.getKey().compareToIgnoreCase(opt2.getKey());
diff --git a/src/main/java/org/apache/commons/cli/Parser.java b/src/main/java/org/apache/commons/cli/Parser.java
index 1f00e14..4bc9e05 100644
--- a/src/main/java/org/apache/commons/cli/Parser.java
+++ b/src/main/java/org/apache/commons/cli/Parser.java
@@ -82,6 +82,7 @@
      * @throws ParseException if there are any problems encountered
      *                        while parsing the command line tokens.
      */
+    @Override
     public CommandLine parse(final Options options, final String[] arguments) throws ParseException
     {
         return parse(options, arguments, null, false);
@@ -117,6 +118,7 @@
      * @return the <code>CommandLine</code>
      * @throws ParseException if an error occurs when parsing the arguments.
      */
+    @Override
     public CommandLine parse(final Options options, final String[] arguments, final boolean stopAtNonOption) throws ParseException
     {
         return parse(options, arguments, null, stopAtNonOption);
diff --git a/src/test/java/org/apache/commons/cli/BasicParserTest.java b/src/test/java/org/apache/commons/cli/BasicParserTest.java
index c6c2137..1eb0471 100644
--- a/src/test/java/org/apache/commons/cli/BasicParserTest.java
+++ b/src/test/java/org/apache/commons/cli/BasicParserTest.java
@@ -24,6 +24,7 @@
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class BasicParserTest extends ParserTestCase
 {
+    @Override
     @Before
     public void setUp()
     {
diff --git a/src/test/java/org/apache/commons/cli/DefaultParserTest.java b/src/test/java/org/apache/commons/cli/DefaultParserTest.java
index 00a405d..0e0626b 100644
--- a/src/test/java/org/apache/commons/cli/DefaultParserTest.java
+++ b/src/test/java/org/apache/commons/cli/DefaultParserTest.java
@@ -21,6 +21,7 @@
 
 public class DefaultParserTest extends ParserTestCase {
 
+    @Override
     @Before
     public void setUp() {
         super.setUp();
diff --git a/src/test/java/org/apache/commons/cli/GnuParserTest.java b/src/test/java/org/apache/commons/cli/GnuParserTest.java
index 7842db3..a4f3b8f 100644
--- a/src/test/java/org/apache/commons/cli/GnuParserTest.java
+++ b/src/test/java/org/apache/commons/cli/GnuParserTest.java
@@ -24,6 +24,7 @@
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class GnuParserTest extends ParserTestCase
 {
+    @Override
     @Before
     public void setUp()
     {
diff --git a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
index a712007..20393de 100644
--- a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
@@ -287,6 +287,7 @@
         final HelpFormatter helpFormatter = new HelpFormatter();
         helpFormatter.setOptionComparator(new Comparator<Option>()
         {
+            @Override
             public int compare(final Option opt1, final Option opt2)
             {
                 // reverses the functionality of the default comparator
diff --git a/src/test/java/org/apache/commons/cli/PosixParserTest.java b/src/test/java/org/apache/commons/cli/PosixParserTest.java
index 14d8e2b..6800880 100644
--- a/src/test/java/org/apache/commons/cli/PosixParserTest.java
+++ b/src/test/java/org/apache/commons/cli/PosixParserTest.java
@@ -26,6 +26,7 @@
  */
 public class PosixParserTest extends ParserTestCase
 {
+    @Override
     @SuppressWarnings("deprecation")
     @Before
     public void setUp()