diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
index 35b642a..ce4f87a 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/AbstractInputHandler.java
@@ -40,10 +40,10 @@ public abstract class AbstractInputHandler
     extends AbstractLogEnabled
     implements InputHandler
 {
-    public List readMultipleLines()
+    public List<String> readMultipleLines()
         throws IOException
     {
-        List lines = new ArrayList();
+        List<String> lines = new ArrayList<>();
         String line = readLine();
         while ( line != null && line.length() > 0 )
         {
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
index cc95e3d..75855f1 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultOutputHandler.java
@@ -24,7 +24,6 @@
  * SOFTWARE.
  */
 
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java
index b7de00e..43942b8 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/DefaultPrompter.java
@@ -100,7 +100,7 @@ public String prompt( String message, String defaultReply )
         }
     }
 
-    public String prompt( String message, List possibleValues, String defaultReply )
+    public String prompt( String message, List<String> possibleValues, String defaultReply )
         throws PrompterException
     {
         String formattedMessage = formatMessage( message, possibleValues, defaultReply );
@@ -152,7 +152,7 @@ public String prompt( String message, List possibleValues, String defaultReply )
         return line;
     }
 
-    public String prompt( String message, List possibleValues )
+    public String prompt( String message, List<String> possibleValues )
         throws PrompterException
     {
         return prompt( message, possibleValues, null );
@@ -180,9 +180,9 @@ public String promptForPassword( String message )
         }
     }
 
-    private String formatMessage( String message, List possibleValues, String defaultReply )
+    private String formatMessage( String message, List<String> possibleValues, String defaultReply )
     {
-        StringBuffer formatted = new StringBuffer( message.length() * 2 );
+        StringBuilder formatted = new StringBuilder( message.length() * 2 );
 
         formatted.append( message );
 
@@ -190,9 +190,9 @@ private String formatMessage( String message, List possibleValues, String defaul
         {
             formatted.append( " (" );
 
-            for ( Iterator it = possibleValues.iterator(); it.hasNext(); )
+            for ( Iterator<String> it = possibleValues.iterator(); it.hasNext(); )
             {
-                String possibleValue = (String) it.next();
+                String possibleValue = it.next();
 
                 formatted.append( possibleValue );
 
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java
index 3711273..14a0342 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/InputHandler.java
@@ -61,6 +61,6 @@ String readPassword()
      * Ends when an empty line is encountered.
      * @return a list of lines read
      */
-    List readMultipleLines()
+    List<String> readMultipleLines()
         throws IOException;
 }
diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java
index 016597c..bd9b37c 100644
--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java
+++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/Prompter.java
@@ -42,10 +42,10 @@ String prompt( String message )
     String prompt( String message, String defaultReply )
         throws PrompterException;
 
-    String prompt( String message, List possibleValues )
+    String prompt( String message, List<String> possibleValues )
         throws PrompterException;
 
-    String prompt( String message, List possibleValues, String defaultReply )
+    String prompt( String message, List<String> possibleValues, String defaultReply )
         throws PrompterException;
 
     String promptForPassword( String message )
diff --git a/pom.xml b/pom.xml
index a3f98b0..de5b017 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>plexus-components</artifactId>
     <groupId>org.codehaus.plexus</groupId>
-    <version>6.5</version>
+    <version>6.6</version>
   </parent>
 
   <artifactId>plexus-interactivity</artifactId>
@@ -17,7 +17,6 @@
     <connection>${scm.url}</connection>
     <developerConnection>${scm.url}</developerConnection>
     <url>https://github.com/codehaus-plexus/plexus-interactivity</url>
-    <tag>plexus-interactivity-1.1</tag>
   </scm>
   <issueManagement>
     <system>github</system>