upgrade to genesis-2.0 and remove Java 5 language depends, as the spec jar supports 1.4 users
git-svn-id: https://svn.apache.org/repos/asf/geronimo/javamail/trunk@824812 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
index 063e979..524ed9c 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/util/MailConnection.java
@@ -463,27 +463,27 @@
// the individual names
String protocols = props.getProperty(MAIL_SSL_PROTOCOLS);
if (protocols != null) {
- ArrayList<String> list = new ArrayList<String>();
+ ArrayList list = new ArrayList();
StringTokenizer t = new StringTokenizer(protocols);
while (t.hasMoreTokens()) {
list.add(t.nextToken());
}
- ((SSLSocket)socket).setEnabledProtocols(list.toArray(new String[list.size()]));
+ ((SSLSocket)socket).setEnabledProtocols((String[])list.toArray(new String[list.size()]));
}
// and do the same for any cipher suites
String suites = props.getProperty(MAIL_SSL_CIPHERSUITES);
if (suites != null) {
- ArrayList<String> list = new ArrayList<String>();
+ ArrayList list = new ArrayList();
StringTokenizer t = new StringTokenizer(suites);
while (t.hasMoreTokens()) {
list.add(t.nextToken());
}
- ((SSLSocket)socket).setEnabledCipherSuites(list.toArray(new String[list.size()]));
+ ((SSLSocket)socket).setEnabledCipherSuites((String[])list.toArray(new String[list.size()]));
}
}
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
index 233c7ef..37172d5 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/imap/IMAPStoreTest.java
@@ -41,7 +41,7 @@
private GreenMail greenMail;
private Message[] messages;
- @Override
+ //@Override
protected void setUp() throws Exception {
// Setup GreenMail
greenMail = new GreenMail(ServerSetupTest.SMTP_IMAP);
@@ -69,7 +69,7 @@
assertEquals(2, messages.length);
}
- @Override
+ //@Override
protected void tearDown() throws Exception {
greenMail.stop();
}
diff --git a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
index 05b045d..11687fb 100644
--- a/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
+++ b/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/test/java/org/apache/geronimo/javamail/store/pop3/POP3StoreTest.java
@@ -41,7 +41,7 @@
private GreenMail greenMail;
private Message[] messages;
- @Override
+ //@Override
protected void setUp() throws Exception {
// Setup GreenMail
greenMail = new GreenMail(ServerSetupTest.SMTP_POP3);
@@ -69,7 +69,7 @@
assertEquals(2, messages.length);
}
- @Override
+ //@Override
protected void tearDown() throws Exception {
greenMail.stop();
}
diff --git a/geronimo-javamail_1.4/pom.xml b/geronimo-javamail_1.4/pom.xml
index 61c73f3..4a2c0e7 100644
--- a/geronimo-javamail_1.4/pom.xml
+++ b/geronimo-javamail_1.4/pom.xml
@@ -25,9 +25,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.5</version>
+ <groupId>org.apache.geronimo.genesis</groupId>
+ <artifactId>genesis-java1.4-flava</artifactId>
+ <version>2.0</version>
</parent>
<groupId>org.apache.geronimo.javamail</groupId>
@@ -56,8 +56,8 @@
<distributionManagement>
<site>
- <id>geronimo-website</id>
- <url>${staging.siteURL}/${siteId}/${version}</url>
+ <id>apache-website</id>
+ <url>${site.deploy.url}/maven/${siteId}/${version}</url>
</site>
</distributionManagement>
