-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
- `show w'. This is free software, and you are welcome to redistribute
- it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License. Of course, the commands
-you use may be called something other than `show w' and `show c'; they
-could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- program `Gnomovision' (which makes passes at compilers) written by
- James Hacker.
-
- signature of Ty Coon, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications
-with the library. If this is what you want to do, use the GNU Library
-General Public License instead of this License.
-
-#
-
-Certain source files distributed by Oracle America, Inc. and/or its
-affiliates are subject to the following clarification and special
-exception to the GPLv2, based on the GNU Project exception for its
-Classpath libraries, known as the GNU Classpath Exception, but only
-where Oracle has expressly included in the particular source file's
-header the words "Oracle designates this particular file as subject to
-the "Classpath" exception as provided by Oracle in the LICENSE file
-that accompanied this code."
-
-You should also note that Oracle includes multiple, independent
-programs in this software package. Some of those programs are provided
-under licenses deemed incompatible with the GPLv2 by the Free Software
-Foundation and others. For example, the package includes programs
-licensed under the Apache License, Version 2.0. Such programs are
-licensed to you under their original licenses.
-
-Oracle facilitates your further distribution of this package by adding
-the Classpath Exception to the necessary parts of its GPLv2 code, which
-permits you to use that code in combination with other independent
-modules not licensed under the GPLv2. However, note that this would
-not permit you to commingle code under an incompatible license with
-Oracle's GPLv2 licensed code by, for example, cutting and pasting such
-code into a file also containing Oracle's GPLv2 licensed code and then
-distributing the result. Additionally, if you were to remove the
-Classpath Exception from any of the files to which it applies and
-distribute the result, you would likely be required to license some or
-all of the other code in that distribution under the GPLv2 as well, and
-since the GPLv2 is incompatible with the license terms of some items
-included in the distribution by Oracle, removing the Classpath
-Exception could therefore effectively compromise your ability to
-further distribute the package.
-
-Proceed with caution and we recommend that you obtain the advice of a
-lawyer skilled in open source matters before removing the Classpath
-Exception or making modifications to this package which may
-subsequently be redistributed and/or involve the use of third party
-software.
-
-CLASSPATH EXCEPTION
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License version 2 cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from or
-based on this library. If you modify this library, you may extend this
-exception to your version of the library, but you are not obligated to
-do so. If you do not wish to do so, delete this exception statement
-from your version.
diff --git a/third_party/activation/v1_2_0/javax.activation-1.2.0-sources.jar b/third_party/activation/v1_2_0/javax.activation-1.2.0-sources.jar
deleted file mode 100644
index 69e2e8a34..000000000
Binary files a/third_party/activation/v1_2_0/javax.activation-1.2.0-sources.jar and /dev/null differ
diff --git a/third_party/activation/v1_2_0/javax.activation.jar b/third_party/activation/v1_2_0/javax.activation.jar
deleted file mode 100644
index c0b9b299b..000000000
Binary files a/third_party/activation/v1_2_0/javax.activation.jar and /dev/null differ
diff --git a/third_party/build.gradle b/third_party/build.gradle
deleted file mode 100644
index 26c656e2c..000000000
--- a/third_party/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2019 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-plugins {
- id 'java-library'
-}
-
-sourceSets {
- main {
- java {
- srcDirs = [
- "${rootDir}/third_party/junit/"
- ]
- include '**/*.java'
- }
- }
-}
diff --git a/third_party/gradle/dependency-locks/annotationProcessor.lockfile b/third_party/gradle/dependency-locks/annotationProcessor.lockfile
deleted file mode 100644
index 0e2d9b8d4..000000000
--- a/third_party/gradle/dependency-locks/annotationProcessor.lockfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
-com.google.auto:auto-common:0.10
-com.google.code.findbugs:jFormatString:3.0.0
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-com.google.errorprone:error_prone_check_api:2.3.3
-com.google.errorprone:error_prone_core:2.3.3
-com.google.errorprone:error_prone_type_annotations:2.3.3
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.google.protobuf:protobuf-java:3.4.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
-org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.pcollections:pcollections:2.1.2
diff --git a/third_party/gradle/dependency-locks/apt.lockfile b/third_party/gradle/dependency-locks/apt.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/apt.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/archives.lockfile b/third_party/gradle/dependency-locks/archives.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/archives.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/buildscript-classpath.lockfile b/third_party/gradle/dependency-locks/buildscript-classpath.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/buildscript-classpath.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/checkstyle.lockfile b/third_party/gradle/dependency-locks/checkstyle.lockfile
deleted file mode 100644
index 986396b59..000000000
--- a/third_party/gradle/dependency-locks/checkstyle.lockfile
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-antlr:antlr:2.7.7
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.2
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:28.0-jre
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.3
-com.puppycrawl.tools:checkstyle:8.24
-commons-beanutils:commons-beanutils:1.9.4
-commons-collections:commons-collections:3.2.2
-info.picocli:picocli:4.0.3
-net.sf.saxon:Saxon-HE:9.9.1-4
-org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.8.1
-org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/third_party/gradle/dependency-locks/compile.lockfile b/third_party/gradle/dependency-locks/compile.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/compile.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/compileClasspath.lockfile b/third_party/gradle/dependency-locks/compileClasspath.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/compileClasspath.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/compileOnly.lockfile b/third_party/gradle/dependency-locks/compileOnly.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/compileOnly.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/default.lockfile b/third_party/gradle/dependency-locks/default.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/default.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/deploy_jar.lockfile b/third_party/gradle/dependency-locks/deploy_jar.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/deploy_jar.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/errorprone.lockfile b/third_party/gradle/dependency-locks/errorprone.lockfile
deleted file mode 100644
index 0e2d9b8d4..000000000
--- a/third_party/gradle/dependency-locks/errorprone.lockfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
-com.google.auto:auto-common:0.10
-com.google.code.findbugs:jFormatString:3.0.0
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-com.google.errorprone:error_prone_check_api:2.3.3
-com.google.errorprone:error_prone_core:2.3.3
-com.google.errorprone:error_prone_type_annotations:2.3.3
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.google.protobuf:protobuf-java:3.4.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
-org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.pcollections:pcollections:2.1.2
diff --git a/third_party/gradle/dependency-locks/errorproneJavac.lockfile b/third_party/gradle/dependency-locks/errorproneJavac.lockfile
deleted file mode 100644
index 43f098f5c..000000000
--- a/third_party/gradle/dependency-locks/errorproneJavac.lockfile
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.google.errorprone:javac:9+181-r4173-1
diff --git a/third_party/gradle/dependency-locks/jacocoAgent.lockfile b/third_party/gradle/dependency-locks/jacocoAgent.lockfile
deleted file mode 100644
index 6b7fa31b5..000000000
--- a/third_party/gradle/dependency-locks/jacocoAgent.lockfile
+++ /dev/null
@@ -1,4 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.5
diff --git a/third_party/gradle/dependency-locks/jacocoAnt.lockfile b/third_party/gradle/dependency-locks/jacocoAnt.lockfile
deleted file mode 100644
index 40e2c298b..000000000
--- a/third_party/gradle/dependency-locks/jacocoAnt.lockfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.5
-org.jacoco:org.jacoco.ant:0.8.5
-org.jacoco:org.jacoco.core:0.8.5
-org.jacoco:org.jacoco.report:0.8.5
-org.ow2.asm:asm-analysis:7.2
-org.ow2.asm:asm-commons:7.2
-org.ow2.asm:asm-tree:7.2
-org.ow2.asm:asm:7.2
diff --git a/third_party/gradle/dependency-locks/runtime.lockfile b/third_party/gradle/dependency-locks/runtime.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/runtime.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/runtimeClasspath.lockfile b/third_party/gradle/dependency-locks/runtimeClasspath.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/runtimeClasspath.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/testAnnotationProcessor.lockfile b/third_party/gradle/dependency-locks/testAnnotationProcessor.lockfile
deleted file mode 100644
index 0e2d9b8d4..000000000
--- a/third_party/gradle/dependency-locks/testAnnotationProcessor.lockfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-com.github.kevinstern:software-and-algorithms:1.0
-com.github.stephenc.jcip:jcip-annotations:1.0-1
-com.google.auto:auto-common:0.10
-com.google.code.findbugs:jFormatString:3.0.0
-com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotation:2.3.3
-com.google.errorprone:error_prone_annotations:2.3.3
-com.google.errorprone:error_prone_check_api:2.3.3
-com.google.errorprone:error_prone_core:2.3.3
-com.google.errorprone:error_prone_type_annotations:2.3.3
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.google.protobuf:protobuf-java:3.4.0
-com.googlecode.java-diff-utils:diffutils:1.3.0
-org.checkerframework:checker-qual:2.5.3
-org.checkerframework:dataflow:2.5.3
-org.checkerframework:javacutil:2.5.3
-org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.pcollections:pcollections:2.1.2
diff --git a/third_party/gradle/dependency-locks/testApt.lockfile b/third_party/gradle/dependency-locks/testApt.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/testApt.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/testCompile.lockfile b/third_party/gradle/dependency-locks/testCompile.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/testCompile.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/testCompileClasspath.lockfile b/third_party/gradle/dependency-locks/testCompileClasspath.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/testCompileClasspath.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/testCompileOnly.lockfile b/third_party/gradle/dependency-locks/testCompileOnly.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/testCompileOnly.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/testRuntime.lockfile b/third_party/gradle/dependency-locks/testRuntime.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/testRuntime.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile b/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile
deleted file mode 100644
index 656c5dbcc..000000000
--- a/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
diff --git a/third_party/jsch/v0_1_53/LICENSE b/third_party/jsch/v0_1_53/LICENSE
deleted file mode 100644
index 303096bf3..000000000
--- a/third_party/jsch/v0_1_53/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-JSch 0.0.* was released under the GNU LGPL license. Later, we have switched
-over to a BSD-style license.
-
-------------------------------------------------------------------------------
-Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/jsch/v0_1_53/README.md b/third_party/jsch/v0_1_53/README.md
deleted file mode 100644
index 56ca9bf86..000000000
--- a/third_party/jsch/v0_1_53/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# JSch 0.1.53
-
-JSCH is a library for making SSH and SFTP connections from Java. It is
-released under a BSD-style license. See its [project
-page](http://www.jcraft.com/jsch) for further details.
-
-No local modifications.
\ No newline at end of file
diff --git a/third_party/jsch/v0_1_53/jsch-0.1.53-src.jar b/third_party/jsch/v0_1_53/jsch-0.1.53-src.jar
deleted file mode 100644
index 7509c7489..000000000
Binary files a/third_party/jsch/v0_1_53/jsch-0.1.53-src.jar and /dev/null differ
diff --git a/third_party/jsch/v0_1_53/jsch-0.1.53.jar b/third_party/jsch/v0_1_53/jsch-0.1.53.jar
deleted file mode 100644
index 8e8878e20..000000000
Binary files a/third_party/jsch/v0_1_53/jsch-0.1.53.jar and /dev/null differ
diff --git a/third_party/junit/LICENSE b/third_party/junit/LICENSE
deleted file mode 100644
index c8824a5a5..000000000
--- a/third_party/junit/LICENSE
+++ /dev/null
@@ -1,214 +0,0 @@
-JUnit
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are
-not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and
-such derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under
-Licensed Patents to make, use, sell, offer to sell, import and otherwise
-transfer the Contribution of such Contributor, if any, in source code and
-object code form. This patent license shall apply to the combination of the
-Contribution and the Program if, at the time the Contribution is added by the
-Contributor, such addition of the Contribution causes such combination to be
-covered by the Licensed Patents. The patent license shall not apply to any
-other combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are provided by
-any Contributor that the Program does not infringe the patent or other
-intellectual property rights of any other entity. Each Contributor disclaims
-any liability to Recipient for claims brought by any other entity based on
-infringement of intellectual property rights or otherwise. As a condition to
-exercising the rights and licenses granted hereunder, each Recipient hereby
-assumes sole responsibility to secure any other intellectual property rights
-needed, if any. For example, if a third party patent license is required to
-allow Recipient to distribute the Program, it is Recipient's responsibility to
-acquire that license before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license
-set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on
-or through a medium customarily used for software exchange
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the
-Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its exercise
-of rights under this Agreement, including but not limited to the risks and
-costs of program errors, compliance with applicable laws, damage to or loss of
-data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's rights
-granted under Section 2(b) shall terminate as of the date such litigation is
-filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial
-in any resulting litigation.
-
diff --git a/third_party/junit/google/registry/testing/JUnitBackports.java b/third_party/junit/google/registry/testing/JUnitBackports.java
deleted file mode 100644
index 06f67f879..000000000
--- a/third_party/junit/google/registry/testing/JUnitBackports.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package google.registry.testing;
-
-/**
- * A testing utility class that contains backports of useful but not yet released JUnit methods.
- *
- * All of this code was taken directly from
- * https://github.com/junit-team/junit4/blob/a832c5afe5b0e7c2590d057a1a49a344d207f8a0/src/main/java/org/junit/Assert.java
- */
-public class JUnitBackports {
- // TODO(b/68257761): Delete these and switch over to JUnit 4.13 methods upon release.
-
- /**
- * This interface facilitates the use of assertThrows from Java 8. It allows method references to
- * void methods (that declare checked exceptions) to be passed directly into assertThrows without
- * wrapping. It is not meant to be implemented directly.
- *
- * @since 4.13
- */
- public interface ThrowingRunnable {
- void run() throws Throwable;
- }
-
- /**
- * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
- * executed. If it does, the exception object is returned. If it does not throw an exception, an
- * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
- * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
- * be obtained by calling {@link AssertionError#getCause}.
- *
- * @param expectedThrowable the expected type of the exception
- * @param runnable a function that is expected to throw an exception when executed
- * @return the exception thrown by {@code runnable}
- * @since 4.13
- */
- public static T assertThrows(
- Class expectedThrowable, ThrowingRunnable runnable) {
- try {
- runnable.run();
- } catch (Throwable actualThrown) {
- if (expectedThrowable.isInstance(actualThrown)) {
- @SuppressWarnings("unchecked")
- T retVal = (T) actualThrown;
- return retVal;
- } else {
- String expected = formatClass(expectedThrowable);
- Class actualThrowable = actualThrown.getClass();
- String actual = formatClass(actualThrowable);
- if (expected.equals(actual)) {
- // There must be multiple class loaders. Add the identity hash code so the message
- // doesn't say "expected: java.lang.String ..."
- expected += "@" + Integer.toHexString(System.identityHashCode(expectedThrowable));
- actual += "@" + Integer.toHexString(System.identityHashCode(actualThrowable));
- }
- String mismatchMessage = format("unexpected exception type thrown;", expected, actual);
-
- // The AssertionError(String, Throwable) ctor is only available on JDK7.
- AssertionError assertionError = new AssertionError(mismatchMessage);
- assertionError.initCause(actualThrown);
- throw assertionError;
- }
- }
- String message =
- String.format(
- "expected %s to be thrown, but nothing was thrown", formatClass(expectedThrowable));
- throw new AssertionError(message);
- }
-
- static String format(String message, Object expected, Object actual) {
- String formatted = "";
- if (message != null && !"".equals(message)) {
- formatted = message + " ";
- }
- String expectedString = String.valueOf(expected);
- String actualString = String.valueOf(actual);
- if (equalsRegardingNull(expectedString, actualString)) {
- return formatted
- + "expected: "
- + formatClassAndValue(expected, expectedString)
- + " but was: "
- + formatClassAndValue(actual, actualString);
- } else {
- return formatted + "expected:<" + expectedString + "> but was:<" + actualString + ">";
- }
- }
-
- private static String formatClass(Class value) {
- String className = value.getCanonicalName();
- return className == null ? value.getName() : className;
- }
-
- private static String formatClassAndValue(Object value, String valueString) {
- String className = value == null ? "null" : value.getClass().getName();
- return className + "<" + valueString + ">";
- }
-
- private static boolean equalsRegardingNull(Object expected, Object actual) {
- if (expected == null) {
- return actual == null;
- }
-
- return isEquals(expected, actual);
- }
-
- private static boolean isEquals(Object expected, Object actual) {
- return expected.equals(actual);
- }
-}
diff --git a/util/build.gradle b/util/build.gradle
index 8e06da03b..3ae95ad27 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -43,7 +43,6 @@ dependencies {
testCompile deps['org.mockito:mockito-core']
testCompile files("${rootDir}/third_party/objectify/v4_1/objectify-4.1.3.jar")
testCompile project(path: ':common', configuration: 'testing')
- testCompile project(':third_party')
testRuntime deps['com.google.flogger:flogger-system-backend']
annotationProcessor deps['com.google.auto.value:auto-value']
annotationProcessor deps['com.google.dagger:dagger-compiler']
diff --git a/util/gradle/dependency-locks/testCompile.lockfile b/util/gradle/dependency-locks/testCompile.lockfile
index 21f2d6eb5..f2c348524 100644
--- a/util/gradle/dependency-locks/testCompile.lockfile
+++ b/util/gradle/dependency-locks/testCompile.lockfile
@@ -35,7 +35,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
-junit:junit:4.12
+junit:junit:4.13
net.bytebuddy:byte-buddy-agent:1.9.7
net.bytebuddy:byte-buddy:1.9.7
org.apache.httpcomponents:httpclient:4.5.8
diff --git a/util/gradle/dependency-locks/testCompileClasspath.lockfile b/util/gradle/dependency-locks/testCompileClasspath.lockfile
index 21f2d6eb5..f2c348524 100644
--- a/util/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/util/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -35,7 +35,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
-junit:junit:4.12
+junit:junit:4.13
net.bytebuddy:byte-buddy-agent:1.9.7
net.bytebuddy:byte-buddy:1.9.7
org.apache.httpcomponents:httpclient:4.5.8
diff --git a/util/gradle/dependency-locks/testRuntime.lockfile b/util/gradle/dependency-locks/testRuntime.lockfile
index a709db3e6..ffa5ad4ad 100644
--- a/util/gradle/dependency-locks/testRuntime.lockfile
+++ b/util/gradle/dependency-locks/testRuntime.lockfile
@@ -37,7 +37,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
-junit:junit:4.12
+junit:junit:4.13
net.bytebuddy:byte-buddy-agent:1.9.7
net.bytebuddy:byte-buddy:1.9.7
org.apache.httpcomponents:httpclient:4.5.8
diff --git a/util/gradle/dependency-locks/testRuntimeClasspath.lockfile b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
index a709db3e6..ffa5ad4ad 100644
--- a/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -37,7 +37,7 @@ javax.inject:javax.inject:1
javax.mail:mail:1.4
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.9.2
-junit:junit:4.12
+junit:junit:4.13
net.bytebuddy:byte-buddy-agent:1.9.7
net.bytebuddy:byte-buddy:1.9.7
org.apache.httpcomponents:httpclient:4.5.8
diff --git a/util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java b/util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java
index d6edbc51a..8f662b5cb 100644
--- a/util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java
+++ b/util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
diff --git a/util/src/test/java/google/registry/util/CidrAddressBlockTest.java b/util/src/test/java/google/registry/util/CidrAddressBlockTest.java
index 301dae0c5..978a06a90 100644
--- a/util/src/test/java/google/registry/util/CidrAddressBlockTest.java
+++ b/util/src/test/java/google/registry/util/CidrAddressBlockTest.java
@@ -14,8 +14,8 @@
package google.registry.util;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.InetAddresses;
diff --git a/util/src/test/java/google/registry/util/CollectionUtilsTest.java b/util/src/test/java/google/registry/util/CollectionUtilsTest.java
index 6c0ff0685..414711d17 100644
--- a/util/src/test/java/google/registry/util/CollectionUtilsTest.java
+++ b/util/src/test/java/google/registry/util/CollectionUtilsTest.java
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.CollectionUtils.partitionMap;
+import static org.junit.Assert.assertThrows;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
diff --git a/util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java b/util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java
index cfbb0bfdd..4a8e63914 100644
--- a/util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java
+++ b/util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/util/src/test/java/google/registry/util/DateTimeUtilsTest.java b/util/src/test/java/google/registry/util/DateTimeUtilsTest.java
index 481296a8d..06e64b5dd 100644
--- a/util/src/test/java/google/registry/util/DateTimeUtilsTest.java
+++ b/util/src/test/java/google/registry/util/DateTimeUtilsTest.java
@@ -15,7 +15,6 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static google.registry.util.DateTimeUtils.earliestOf;
@@ -26,6 +25,7 @@ import static google.registry.util.DateTimeUtils.leapSafeAddYears;
import static google.registry.util.DateTimeUtils.leapSafeSubtractYears;
import static google.registry.util.DateTimeUtils.toJodaDateTime;
import static google.registry.util.DateTimeUtils.toZonedDateTime;
+import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import java.time.ZonedDateTime;
diff --git a/util/src/test/java/google/registry/util/DomainNameUtilsTest.java b/util/src/test/java/google/registry/util/DomainNameUtilsTest.java
index c6fae586d..497b1d5ff 100644
--- a/util/src/test/java/google/registry/util/DomainNameUtilsTest.java
+++ b/util/src/test/java/google/registry/util/DomainNameUtilsTest.java
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
import static google.registry.util.DomainNameUtils.getSecondLevelDomain;
+import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/util/src/test/java/google/registry/util/HexDumperTest.java b/util/src/test/java/google/registry/util/HexDumperTest.java
index 82f9047fc..917fe35db 100644
--- a/util/src/test/java/google/registry/util/HexDumperTest.java
+++ b/util/src/test/java/google/registry/util/HexDumperTest.java
@@ -15,8 +15,8 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
import java.io.StringWriter;
import org.junit.Test;
diff --git a/util/src/test/java/google/registry/util/PosixTarHeaderTest.java b/util/src/test/java/google/registry/util/PosixTarHeaderTest.java
index e9296b85b..c0d956471 100644
--- a/util/src/test/java/google/registry/util/PosixTarHeaderTest.java
+++ b/util/src/test/java/google/registry/util/PosixTarHeaderTest.java
@@ -17,8 +17,8 @@ package google.registry.util;
import static com.google.common.io.BaseEncoding.base64;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertThrows;
import com.google.common.testing.EqualsTester;
import java.io.ByteArrayInputStream;
@@ -47,8 +47,7 @@ public class PosixTarHeaderTest {
byte[] gnuTarGeneratedData =
base64()
.decode(
- ""
- + "aGVsbG8ueG1sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ "aGVsbG8ueG1sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDA2NDAAMDU0MTI2"
+ "NgAwMDExNjEwADAwMDAwMDAwMDE0ADEyMjAyMzEwMzI0ADAxMjQ2MQAgMAAAAAAAAAAAAAAAAAAA"
+ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
diff --git a/util/src/test/java/google/registry/util/RetrierTest.java b/util/src/test/java/google/registry/util/RetrierTest.java
index 21b4d3d94..d507093bf 100644
--- a/util/src/test/java/google/registry/util/RetrierTest.java
+++ b/util/src/test/java/google/registry/util/RetrierTest.java
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.junit.Assert.assertThrows;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeSleeper;
@@ -94,6 +94,7 @@ public class RetrierTest {
}
@Test
+ @SuppressWarnings("AssertThrowsMultipleStatements")
public void testRetryFailed_withReporter() {
CountingException thrown =
assertThrows(
diff --git a/util/src/test/java/google/registry/util/SendEmailServiceTest.java b/util/src/test/java/google/registry/util/SendEmailServiceTest.java
index e9d932918..e42a2ad6d 100644
--- a/util/src/test/java/google/registry/util/SendEmailServiceTest.java
+++ b/util/src/test/java/google/registry/util/SendEmailServiceTest.java
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
diff --git a/util/src/test/java/google/registry/util/SerializeUtilsTest.java b/util/src/test/java/google/registry/util/SerializeUtilsTest.java
index 9ac00e6e9..5eacc72c2 100644
--- a/util/src/test/java/google/registry/util/SerializeUtilsTest.java
+++ b/util/src/test/java/google/registry/util/SerializeUtilsTest.java
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.SerializeUtils.deserialize;
import static google.registry.util.SerializeUtils.serialize;
+import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/util/src/test/java/google/registry/util/SqlTemplateTest.java b/util/src/test/java/google/registry/util/SqlTemplateTest.java
index 40fea754b..dbbb736e0 100644
--- a/util/src/test/java/google/registry/util/SqlTemplateTest.java
+++ b/util/src/test/java/google/registry/util/SqlTemplateTest.java
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.junit.Assert.assertThrows;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/util/src/test/java/google/registry/util/TeeOutputStreamTest.java b/util/src/test/java/google/registry/util/TeeOutputStreamTest.java
index ff3a70f70..ef6257381 100644
--- a/util/src/test/java/google/registry/util/TeeOutputStreamTest.java
+++ b/util/src/test/java/google/registry/util/TeeOutputStreamTest.java
@@ -15,9 +15,9 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
+import static org.junit.Assert.assertThrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
diff --git a/util/src/test/java/google/registry/util/TypeUtilsTest.java b/util/src/test/java/google/registry/util/TypeUtilsTest.java
index c0317be14..915ed39aa 100644
--- a/util/src/test/java/google/registry/util/TypeUtilsTest.java
+++ b/util/src/test/java/google/registry/util/TypeUtilsTest.java
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
-import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.junit.Assert.assertThrows;
import java.io.Serializable;
import java.util.ArrayList;