(geronimo-mail) branch main updated: Apply OpenRewrite Java8toJava11 migration
[email protected] Sat, 18 Jul 2026 06:48:38 +0000
| Newsgroups | gmane.comp.java.geronimo.cvs |
|---|---|
| Message-ID | <178435731806.1398004.9976405491420709957@gitbox3-he-fi.apache.org> |
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/geronimo-mail.git
The following commit(s) were added to refs/heads/main by this push:
new bb1c9ac Apply OpenRewrite Java8toJava11 migration
bb1c9ac is described below
commit bb1c9ac7026c52c9ba868ace0cd5d40dddb414da
Author: Richard Zowalla <[email protected]>
AuthorDate: Sat Jul 18 08:48:33 2026 +0200
Apply OpenRewrite Java8toJava11 migration
- Replace deprecated primitive wrapper constructors with valueOf
- Use maven-compiler-plugin <release>11</release> instead of source/target
- Drop cobertura-maven-plugin reporting (defunct on Java 11+)
---
geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml | 3 +--
.../java/org/apache/geronimo/mail/store/imap/IMAPFolder.java | 12 ++++++------
.../org/apache/geronimo/mail/store/imap/IMAPMessage.java | 2 +-
.../org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java | 4 ++--
.../java/org/apache/geronimo/mail/util/MailConnection.java | 6 +++---
geronimo-mail_2.1_impl/pom.xml | 11 -----------
geronimo-mail_2.1_spec/pom.xml | 5 ++---
7 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml
index a26a8f0..7a72de3 100644
--- a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml
+++ b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/pom.xml
@@ -444,8 +444,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
+ <release>11</release>
</configuration>
</plugin>
</plugins>
diff --git a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java
index 353e60b..779ff85 100644
--- a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java
+++ b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPFolder.java
@@ -919,7 +919,7 @@ public class IMAPFolder extends Folder implements UIDFolder, IMAPUntaggedRespons
// see if there are new messages in the folder.
checkMessageValidity(msgNum);
// create the mapping key for this
- Integer messageKey = new Integer(msgNum);
+ Integer messageKey = Integer.valueOf(msgNum);
// ok, if the message number is within range, we should have this in the
// messages list. Just return the element.
Message message = (Message)messageCache.get(messageKey);
@@ -1345,7 +1345,7 @@ public class IMAPFolder extends Folder implements UIDFolder, IMAPUntaggedRespons
// only allowed on open folders
checkOpen();
- Long key = new Long(uid);
+ Long key = Long.valueOf(uid);
// first check to see if we have a cached value for this
synchronized(messageCache) {
Message msg = (Message)uidCache.get(key);
@@ -1402,7 +1402,7 @@ public class IMAPFolder extends Folder implements UIDFolder, IMAPUntaggedRespons
// fill in each of the messages based on the returned value
for (int i = 0; i < msgs.length; i++) {
IMAPUid uid = (IMAPUid)uids.get(i);
- msgs[i] = retrieveMessageByUid(new Long(uid.uid), uid.messageNumber);
+ msgs[i] = retrieveMessageByUid(Long.valueOf(uid.uid), uid.messageNumber);
}
return msgs;
@@ -1472,7 +1472,7 @@ public class IMAPFolder extends Folder implements UIDFolder, IMAPUntaggedRespons
return -1;
}
// cache this information now that we've gotten it.
- addToUidCache(new Long(imapuid.uid), getMessage(imapuid.messageNumber));
+ addToUidCache(Long.valueOf(imapuid.uid), getMessage(imapuid.messageNumber));
// return the UID information.
return imapuid.uid;
} finally {
@@ -1881,7 +1881,7 @@ public class IMAPFolder extends Folder implements UIDFolder, IMAPUntaggedRespons
// needs removal from there also
long uid = ((IMAPMessage)expungedMessage).getUID();
if (uid >= 0) {
- uidCache.remove(new Long(uid));
+ uidCache.remove(Long.valueOf(uid));
}
// because we need to jigger the keys of some of these, we had better have a working
// copy.
@@ -1905,7 +1905,7 @@ public class IMAPFolder extends Folder implements UIDFolder, IMAPUntaggedRespons
// message cache under the new key value
IMAPMessage message = (IMAPMessage)messageCache.get(key);
message.setSequenceNumber(index - 1);
- newCache.put(new Integer(index - 1), message);
+ newCache.put(Integer.valueOf(index - 1), message);
}
else {
// the expunged message. We don't move this over to the new
diff --git a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java
index d37fc17..7fa8f11 100644
--- a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java
+++ b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/imap/IMAPMessage.java
@@ -1225,7 +1225,7 @@ public class IMAPMessage extends MimeMessage {
case IMAPFetchDataItem.UID:
uid = ((IMAPUid)item).uid;
// make sure the folder knows about the UID update.
- ((IMAPFolder)folder).addToUidCache(new Long(uid), this);
+ ((IMAPFolder)folder).addToUidCache(Long.valueOf(uid), this);
break;
case IMAPFetchDataItem.BODYSTRUCTURE:
updateBodyStructure((IMAPBodyStructure)item);
diff --git a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java
index e54de87..3670a44 100644
--- a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java
+++ b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/store/nntp/NNTPGroupFolder.java
@@ -213,7 +213,7 @@ public class NNTPGroupFolder extends NNTPFolder {
// get an object form to look up in the retrieve messages list (oh how I
// wish there was
// something like Map that could use integer keys directly!).
- Integer key = new Integer(msgNum);
+ Integer key = Integer.valueOf(msgNum);
NNTPMessage message = (NNTPMessage) articles.get(key);
if (message != null) {
// piece of cake!
@@ -276,7 +276,7 @@ public class NNTPGroupFolder extends NNTPFolder {
int pos = line.indexOf(' ');
int articleID = Integer.parseInt(line.substring(0, pos));
String messageID = line.substring(pos + 1);
- Integer key = new Integer(articleID);
+ Integer key = Integer.valueOf(articleID);
// see if we have this message cached, If not, create it.
Message message = (Message)articles.get(key);
if (message == null) {
diff --git a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java
index 1a1b00a..71f5417 100644
--- a/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java
+++ b/geronimo-mail_2.1_impl/geronimo-mail_2.1_provider/src/main/java/org/apache/geronimo/mail/util/MailConnection.java
@@ -340,7 +340,7 @@ public class MailConnection {
// we'll try this with potentially two different factories if we're allowed to fall back.
boolean fallback = props.getBooleanProperty(MAIL_FACTORY_FALLBACK, false);
int socketFactoryPort = props.getIntProperty(ssl?MAIL_SSL_FACTORY_PORT:MAIL_FACTORY_PORT, -1);
- Integer portArg = new Integer(socketFactoryPort == -1 ? serverPort : socketFactoryPort);
+ Integer portArg = Integer.valueOf(socketFactoryPort == -1 ? serverPort : socketFactoryPort);
debugOut("Creating "+(ssl?"":"non-")+"SSL socket using factory " + socketFactoryClass+ " listening on port "+portArg);
@@ -375,7 +375,7 @@ public class MailConnection {
Class[] createSocketSig = new Class[] { String.class, Integer.TYPE, InetAddress.class, Integer.TYPE };
Method createSocket = factoryClass.getMethod("createSocket", createSocketSig);
- Object[] createSocketArgs = new Object[] { serverHost, portArg, localAddress, new Integer(localPort) };
+ Object[] createSocketArgs = new Object[] { serverHost, portArg, localAddress, Integer.valueOf(localPort) };
socket = (Socket)createSocket.invoke(defFactory, createSocketArgs);
break;
}
@@ -385,7 +385,7 @@ public class MailConnection {
Class[] createSocketSig = new Class[] { Socket.class, String.class, Integer.TYPE, Boolean.TYPE };
Method createSocket = factoryClass.getMethod("createSocket", createSocketSig);
- Object[] createSocketArgs = new Object[] { socket, serverHost, new Integer(serverPort), Boolean.TRUE };
+ Object[] createSocketArgs = new Object[] { socket, serverHost, Integer.valueOf(serverPort), Boolean.TRUE };
socket = (Socket)createSocket.invoke(defFactory, createSocketArgs);
break;
} else {
diff --git a/geronimo-mail_2.1_impl/pom.xml b/geronimo-mail_2.1_impl/pom.xml
index 92fa3dd..79f311c 100644
--- a/geronimo-mail_2.1_impl/pom.xml
+++ b/geronimo-mail_2.1_impl/pom.xml
@@ -242,17 +242,6 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <formats>
- <format>html</format>
- </formats>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
diff --git a/geronimo-mail_2.1_spec/pom.xml b/geronimo-mail_2.1_spec/pom.xml
index 95da4a8..bdffccf 100644
--- a/geronimo-mail_2.1_spec/pom.xml
+++ b/geronimo-mail_2.1_spec/pom.xml
@@ -94,10 +94,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.6.2</version>
<configuration>
- <source>11</source>
- <target>11</target>
+ <release>11</release>
</configuration>
</plugin>
<plugin>