Update more dependencies to newer versions (#999)

* Update more dependencies to newer versions

* Add lockfiles and back out 2 problematic dep updates

* Fix the build (backs out more changes)

* Back out qdox 2.0 too
This commit is contained in:
Ben McIlwain 2021-03-10 11:22:07 -05:00 committed by GitHub
parent 765a6b9bc3
commit e5801e1b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
144 changed files with 2325 additions and 2334 deletions

View file

@ -46,7 +46,6 @@ import google.registry.testing.FakeClock;
import google.registry.testing.InjectExtension;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import org.joda.time.DateTime;
import org.joda.time.Duration;
import org.junit.jupiter.api.BeforeEach;
@ -425,7 +424,7 @@ public class DnsUpdateWriterTest {
}
private void assertThatTotalUpdateSetsIs(Update update, int count) {
assertThat(update.getSectionRRsets(Section.UPDATE)).hasLength(count);
assertThat(update.getSectionRRsets(Section.UPDATE)).hasSize(count);
}
private void assertThatUpdateDeletes(Update update, String resourceName, int recordType) {
@ -451,7 +450,7 @@ public class DnsUpdateWriterTest {
Update update, String resourceName, int recordType) {
for (RRset set : update.getSectionRRsets(Section.UPDATE)) {
if (set.getName().toString().equals(resourceName) && set.getType() == recordType) {
return fixIterator(Record.class, set.rrs());
return ImmutableList.copyOf(set.rrs());
}
}
assertWithMessage(
@ -461,11 +460,6 @@ public class DnsUpdateWriterTest {
throw new AssertionError();
}
@SuppressWarnings({"unchecked", "unused"})
private static <T> ImmutableList<T> fixIterator(Class<T> clazz, final Iterator<?> iterator) {
return ImmutableList.copyOf((Iterator<T>) iterator);
}
private Message messageWithResponseCode(int responseCode) {
Message message = new Message();
message.getHeader().setOpcode(Opcode.UPDATE);