from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPConnection.java"
   contains "import org.apache.geronimo.mail.util.Base64;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/transport/nntp/NNTPConnection.java"
   contains "import org.apache.geronimo.mail.util.Base64;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/authentication/DigestMD5Authenticator.java"
   contains "import org.apache.geronimo.mail.util.Base64;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/authentication/CramMD5Authenticator.java"
   contains "import org.apache.geronimo.mail.util.Hex;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/NNTPRootFolder.java"
   contains "import org.apache.geronimo.mail.util.SessionUtil;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/nntp/NNTPStore.java"
   contains "import org.apache.geronimo.mail.util.SessionUtil;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/imap/IMAPMimeBodyPart.java"
   contains "import org.apache.geronimo.mail.util.SessionUtil;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/imap/connection/IMAPConnection.java"
   contains "import org.apache.geronimo.mail.util.Base64;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/imap/connection/IMAPTaggedResponse.java"
   contains "import org.apache.geronimo.mail.util.Base64;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/pop3/connection/POP3Connection.java"
   contains "import org.apache.geronimo.mail.util.Base64;"

from: geronimo-javamail_1.6
to: geronimo-mail_2.1
evidence:
 - file: "geronimo-javamail_1.6/geronimo-javamail_1.6_provider/src/main/java/org/apache/geronimo/javamail/store/pop3/connection/POP3Response.java"
   contains "import org.apache.geronimo.mail.util.Base64;"