You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2022/10/28 03:53:29 UTC
[james-jspf] 01/03: [UPGRADES] Various library updates
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jspf.git
commit db8d03d06f96aba7d50a1f0de1a9f5977ee96cae
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Oct 17 13:32:39 2022 +0700
[UPGRADES] Various library updates
- dnsjava 2.1.9 -> 3.5.1
- logback 1.2.6 -> 1.4.4
- commons-cli 1.4 -> 1.5.0
- slf4j 1.7.32 -> 2.0.3
---
pom.xml | 8 ++++----
.../org/apache/james/jspf/tester/DNSTestingServer.java | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3a25551..95799a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.1.9</version>
+ <version>3.5.1</version>
</dependency>
<dependency>
<groupId>uk.nominet</groupId>
@@ -106,12 +106,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.6</version>
+ <version>1.4.4</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.4</version>
+ <version>1.5.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.32</version>
+ <version>2.0.3</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java b/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
index 635c3af..60a1125 100644
--- a/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
+++ b/tester/src/main/java/org/apache/james/jspf/tester/DNSTestingServer.java
@@ -187,7 +187,7 @@ public class DNSTestingServer implements ResponseGenerator {
} else if ("SPF".equals(type)) {
if (value instanceof List<?>) {
records.add(new SPFRecord(hostname,
- DClass.IN, 3600, (List<?>) value));
+ DClass.IN, 3600L, (List<String>) value));
} else {
records.add(new SPFRecord(hostname,
DClass.IN, 3600, (String) value));
@@ -195,7 +195,7 @@ public class DNSTestingServer implements ResponseGenerator {
} else if ("TXT".equals(type)) {
if (value instanceof List<?>) {
records.add(new TXTRecord(hostname,
- DClass.IN, 3600, (List<?>) value));
+ DClass.IN, 3600L, (List<String>) value));
} else {
records.add(new TXTRecord(hostname,
DClass.IN, 3600, (String) value));
@@ -264,7 +264,7 @@ public class DNSTestingServer implements ResponseGenerator {
private SetResponse findRecords(Name name, int type) {
SetResponse sr = zone.findRecords(name, type);
- if (sr == null || sr.answers() == null || sr.answers().length == 0) {
+ if (sr == null || sr.answers() == null || sr.answers().size() == 0) {
boolean timeout = timeoutServers.contains(name);
if (timeout) {
try {
@@ -291,7 +291,7 @@ public class DNSTestingServer implements ResponseGenerator {
if (response.findRRset(name, rrset.getType(), s))
return;
if ((flags & FLAG_SIGONLY) == 0) {
- Iterator<Record> it = rrset.rrs();
+ Iterator<Record> it = rrset.rrs().iterator();
while (it.hasNext()) {
Record r = (Record) it.next();
if (r.getName().isWild() && !name.isWild())
@@ -300,7 +300,7 @@ public class DNSTestingServer implements ResponseGenerator {
}
}
if ((flags & (FLAG_SIGONLY | FLAG_DNSSECOK)) != 0) {
- Iterator it = rrset.sigs();
+ Iterator it = rrset.sigs().iterator();
while (it.hasNext()) {
Record r = (Record) it.next();
if (r.getName().isWild() && !name.isWild())
@@ -392,9 +392,9 @@ public class DNSTestingServer implements ResponseGenerator {
rcode = addAnswer(response, newname, type, dclass, iterations + 1,
flags);
} else if (sr.isSuccessful()) {
- RRset[] rrsets = sr.answers();
- for (int i = 0; i < rrsets.length; i++)
- addRRset(name, response, rrsets[i], Section.ANSWER, flags);
+ List<RRset> rrsets = sr.answers();
+ for (int i = 0; i < rrsets.size(); i++)
+ addRRset(name, response, rrsets.get(i), Section.ANSWER, flags);
RRset findNSRecords = findNSRecords();
addRRset(findNSRecords.getName(), response, findNSRecords,
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org