diff --git a/build.gradle b/build.gradle index 92c094a95..1139fc218 100644 --- a/build.gradle +++ b/build.gradle @@ -190,24 +190,33 @@ subprojects { // Skip no-op project if (project.name == 'services') return - ext.createUberJar = { taskName, binaryName, mainClass -> + ext.createUberJar = { + taskName, + binaryName, + mainClass, + List configs = [project.configurations.runtimeClasspath], + List srcOutput = [project.sourceSets.main.output], + List excludes = [] -> project.tasks.create( - taskName, com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { + taskName, com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { mergeServiceFiles() baseName = binaryName - manifest { - attributes 'Main-Class': mainClass + if (mainClass != '') { + manifest { + attributes 'Main-Class': mainClass + } } zip64 = true classifier = '' archiveVersion = '' - configurations = [project.configurations.runtimeClasspath] - from project.sourceSets.main.output + configurations = configs + from srcOutput // Excludes signature files that accompany some dependency jars, like // bonuncycastle. If they are present, only classes from those signed jars are // made available to the class loader. // see https://discuss.gradle.org/t/signing-a-custom-gradle-plugin-thats-downloaded-by-the-build-system-from-github/1365 exclude "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA" + exclude excludes } } diff --git a/core/build.gradle b/core/build.gradle index e58a8f2eb..3358eb32c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -13,6 +13,7 @@ // limitations under the License. import java.lang.reflect.Constructor +import java.util.Optional plugins { id 'java-library' @@ -89,8 +90,17 @@ sourceSets { exclude '**/*.xjb' } } + nonprod { + java { + compileClasspath += main.output + runtimeClasspath += main.output + } + } test { java { + compileClasspath += nonprod.output + runtimeClasspath += nonprod.output + // Javadoc API is deprecated in Java 11 and removed in Java 12. // TODO(jianglai): re-enable after migrating to the new Javadoc API if ((JavaVersion.current().majorVersion as Integer) >= 11) { @@ -112,6 +122,13 @@ configurations { jaxb soy closureCompiler + devtool + + nonprodCompile.extendsFrom compile + nonprodRuntime.extendsFrom runtime + + testCompile.extendsFrom nonprodCompile + testRuntime.extendsFrom nonprodRuntime // Published jars that are used for server/schema compatibility tests. // See the integration project @@ -147,9 +164,9 @@ dependencies { // Custom-built objectify jar at commit ecd5165, included in Nomulus // release. - implementation files( + compile files( "${rootDir}/third_party/objectify/v4_1/objectify-4.1.3.jar") - testImplementation project(':third_party') + testRuntime project(':third_party') testRuntime files(sourceSets.test.resources.srcDirs) @@ -243,6 +260,7 @@ dependencies { compile deps['org.testcontainers:postgresql'] testCompile deps['org.testcontainers:selenium'] testCompile deps['org.testcontainers:testcontainers'] + testCompile deps['pl.pragmatists:JUnitParams'] compile deps['xerces:xmlParserAPIs'] compile deps['xpp3:xpp3'] // This dependency must come after javax.mail:mail as it would otherwise @@ -718,41 +736,59 @@ task findGoldenImages(type: JavaExec) { args arguments } -// To run the nomulus tool with these command line tokens: +Optional> getToolArgsList() { + // If "-PtoolArgs=..." is present in the command line, use it to set the args, + // otherwise use the default flag, which is "--args" to set the args. + def toolArgs = rootProject.findProperty("toolArgs") + if (toolArgs != null) { + def delimiter = '|' + toolArgs += delimiter + def argsList = [] + def currArg = '' + for (def i = 0; i < toolArgs.length(); i++) { + def currChar = toolArgs[i] + if (currChar != delimiter) { + currArg += currChar + } else if (i != 0 && toolArgs[i - 1] == '\\') { + currArg = currArg.substring(0, currArg.length() - 1) + currChar + } else { + argsList.add(currArg) + currArg = '' + } + } + return Optional.of(argsList) + } + return Optional.empty() +} + + +// To run the nomulus tools with these command line tokens: // "--foo", "bar baz", "--qux=quz" // gradle registryTool --args="--foo 'bar baz' --qux=quz" // or: // gradle registryTool --PtoolArgs="--foo|bar baz|--qux=quz" // Note that the delimiting pipe can be backslash escaped if it is part of a // parameter. -task registryTool(type: JavaExec) { - classpath = sourceSets.main.runtimeClasspath - main = 'google.registry.tools.RegistryTool' +ext.createToolTask = { + taskName, + mainClass, + sourceSet = sourceSets.main -> + project.tasks.create(taskName, JavaExec) { + classpath = sourceSet.runtimeClasspath + main = mainClass - // If "-PtoolArgs=..." is present in the command line, use it to set the args, - // otherwise use the default flag, which is "--args" to set the args. - doFirst { - def toolArgs = rootProject.findProperty("toolArgs") - if (toolArgs != null) { - def delimiter = '|' - toolArgs += delimiter - def argsList = [] - def currArg = '' - for (def i = 0; i < toolArgs.length(); i++) { - def currChar = toolArgs[i] - if (currChar != delimiter) { - currArg += currChar - } else if (i != 0 && toolArgs[i - 1] == '\\') { - currArg = currArg.substring(0, currArg.length() - 1) + currChar - } else { - argsList.add(currArg) - currArg = '' - } + doFirst { + getToolArgsList().ifPresent { + args it } - args = argsList } } } +createToolTask('registryTool', 'google.registry.tools.RegistryTool') +createToolTask( + 'devTool', + 'google.registry.tools.DevTool', + sourceSets.nonprod) task generateGoldenImages(type: FilteringTest) { tests = ["**/webdriver/*"] @@ -818,7 +854,6 @@ test { }.dependsOn(fragileTest, outcastTest, standardTest, registryToolIntegrationTest) createUberJar('nomulus', 'nomulus', 'google.registry.tools.RegistryTool') -project.nomulus.dependsOn project(':third_party').jar // A jar with classes and resources from main sourceSet, excluding internal // data. See comments on configurations.nomulus_test above for details. @@ -836,26 +871,21 @@ task nomulusFossJar (type: Jar) { // An UberJar of registry test classes, resources and all dependencies. // See comments on configurations.nomulus_test above for details. -// TODO(weiminyu): extract shareable code with root.ext.createUberJar -task testUberJar ( - type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - mergeServiceFiles() - archiveBaseName = 'nomulus-tests' +createUberJar( + 'testUberJar', + 'nomulus-tests', + '', + [project.configurations.testRuntimeClasspath], + [project.sourceSets.test.output], + [ + // Exclude SQL schema, which is a test dependency. + 'sql/flyway/**', + // ShadowJar includes java source files when used on + // sourceSets.test.output. + '**/*.java' + ]) +tasks.testUberJar { archiveClassifier = 'alldeps' - zip64 = true - archiveVersion = '' - configurations = [project.configurations.testRuntimeClasspath] - from project.sourceSets.test.output - // Excludes signature files that accompany some dependency jars, like - // bonuncycastle. If they are present, only classes from those signed jars are - // made available to the class loader. - // see https://discuss.gradle.org/t/signing-a-custom-gradle-plugin-thats-downloaded-by-the-build-system-from-github/1365 - exclude "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA" - // Exclude SQL schema, which is a test dependency. - exclude 'sql/flyway/**' - // ShadowJar includes java source files when used on sourceSets.test.output. - // They are not needed. - exclude '**/*.java' } artifacts { @@ -884,6 +914,19 @@ task buildToolImage(dependsOn: nomulus, type: Exec) { commandLine 'docker', 'build', '-t', 'nomulus-tool', '.' } +// Build the devtool jar. +createUberJar( + 'devtool', + 'devtool', + 'google.registry.tools.DevTool', + [ project.configurations.nonprodRuntimeClasspath ], + [ project.sourceSets.nonprod.output, sourceSets.main.output ], + [ '**/*.java' ]) + +artifacts { + devtool devtool +} + task copyJsFilesForTestServer(dependsOn: assemble, type: Copy) { // Unfortunately the test server relies on having some compiled JS/CSS // in place, so copy it over here @@ -898,5 +941,6 @@ task runTestServer(dependsOn: copyJsFilesForTestServer, type: JavaExec) { classpath = sourceSets.test.runtimeClasspath } +project.build.dependsOn devtool project.build.dependsOn buildToolImage project.build.dependsOn ':stage' diff --git a/core/gradle/dependency-locks/compileClasspath.lockfile b/core/gradle/dependency-locks/compileClasspath.lockfile index 9a71594ef..122f7b0ce 100644 --- a/core/gradle/dependency-locks/compileClasspath.lockfile +++ b/core/gradle/dependency-locks/compileClasspath.lockfile @@ -163,7 +163,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -193,7 +192,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/core/gradle/dependency-locks/deploy_jar.lockfile b/core/gradle/dependency-locks/deploy_jar.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/core/gradle/dependency-locks/deploy_jar.lockfile +++ b/core/gradle/dependency-locks/deploy_jar.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/core/gradle/dependency-locks/devtool.lockfile b/core/gradle/dependency-locks/devtool.lockfile new file mode 100644 index 000000000..656c5dbcc --- /dev/null +++ b/core/gradle/dependency-locks/devtool.lockfile @@ -0,0 +1,3 @@ +# 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/core/gradle/dependency-locks/nonprodAnnotationProcessor.lockfile b/core/gradle/dependency-locks/nonprodAnnotationProcessor.lockfile new file mode 100644 index 000000000..0e2d9b8d4 --- /dev/null +++ b/core/gradle/dependency-locks/nonprodAnnotationProcessor.lockfile @@ -0,0 +1,24 @@ +# 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/core/gradle/dependency-locks/nonprodApt.lockfile b/core/gradle/dependency-locks/nonprodApt.lockfile new file mode 100644 index 000000000..656c5dbcc --- /dev/null +++ b/core/gradle/dependency-locks/nonprodApt.lockfile @@ -0,0 +1,3 @@ +# 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/core/gradle/dependency-locks/nonprodCompile.lockfile b/core/gradle/dependency-locks/nonprodCompile.lockfile new file mode 100644 index 000000000..3d383f5dd --- /dev/null +++ b/core/gradle/dependency-locks/nonprodCompile.lockfile @@ -0,0 +1,234 @@ +# 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 +aopalliance:aopalliance:1.0 +args4j:args4j:2.0.23 +cglib:cglib-nodep:2.2 +com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-databind:2.9.10 +com.fasterxml:classmate:1.3.4 +com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-jackson2:1.27.0 +com.google.api-client:google-api-client-java6:1.27.0 +com.google.api-client:google-api-client-servlet:1.30.6 +com.google.api-client:google-api-client:1.30.6 +com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:grpc-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0 +com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0 +com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:proto-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-iam-v1:0.12.0 +com.google.api:api-common:1.7.0 +com.google.api:gax-grpc:1.38.0 +com.google.api:gax-httpjson:0.52.0 +com.google.api:gax:1.38.0 +com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0 +com.google.apis:google-api-services-appengine:v1-rev101-1.25.0 +com.google.apis:google-api-services-bigquery:v2-rev20181104-1.27.0 +com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0 +com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0 +com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0 +com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0 +com.google.apis:google-api-services-dns:v2beta1-rev6-1.22.0 +com.google.apis:google-api-services-drive:v2-rev160-1.19.1 +com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0 +com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0 +com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0 +com.google.apis:google-api-services-sheets:v4-rev483-1.22.0 +com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0 +com.google.appengine.tools:appengine-gcs-client:0.6 +com.google.appengine.tools:appengine-mapreduce:0.9 +com.google.appengine.tools:appengine-pipeline:0.2.13 +com.google.appengine:appengine-api-1.0-sdk:1.9.48 +com.google.appengine:appengine-remote-api:1.9.48 +com.google.appengine:appengine-testing:1.9.58 +com.google.auth:google-auth-library-credentials:0.16.1 +com.google.auth:google-auth-library-oauth2-http:0.16.1 +com.google.auto.value:auto-value-annotations:1.6.3 +com.google.auto.value:auto-value:1.6.3 +com.google.cloud.bigdataoss:gcsio:1.9.16 +com.google.cloud.bigdataoss:util:1.9.16 +com.google.cloud.bigtable:bigtable-client-core:1.8.0 +com.google.cloud.datastore:datastore-v1-proto-client:1.6.0 +com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha +com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha +com.google.cloud:google-cloud-bigtable:0.73.0-alpha +com.google.cloud:google-cloud-core-grpc:1.61.0 +com.google.cloud:google-cloud-core-http:1.55.0 +com.google.cloud:google-cloud-core:1.61.0 +com.google.cloud:google-cloud-spanner:1.6.0 +com.google.code.findbugs:jsr305:3.0.2 +com.google.code.gson:gson:2.8.5 +com.google.common.html.types:types:1.0.4 +com.google.dagger:dagger:2.21 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.flogger:flogger-system-backend:0.3.1 +com.google.flogger:flogger:0.3.1 +com.google.flogger:google-extensions:0.3.1 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:28.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +com.google.gwt:gwt-user:2.8.2 +com.google.http-client:google-http-client-appengine:1.32.1 +com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-jackson:1.20.0 +com.google.http-client:google-http-client-protobuf:1.20.0 +com.google.http-client:google-http-client:1.32.1 +com.google.inject.extensions:guice-multibindings:4.1.0 +com.google.inject:guice:4.1.0 +com.google.j2objc:j2objc-annotations:1.3 +com.google.jsinterop:jsinterop-annotations:1.0.2 +com.google.monitoring-client:metrics:1.0.6 +com.google.monitoring-client:stackdriver:1.0.6 +com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-java6:1.28.0 +com.google.oauth-client:google-oauth-client-jetty:1.28.0 +com.google.oauth-client:google-oauth-client-servlet:1.30.4 +com.google.oauth-client:google-oauth-client:1.30.4 +com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 +com.google.protobuf:protobuf-java-util:3.6.1 +com.google.protobuf:protobuf-java:3.6.1 +com.google.re2j:re2j:1.1 +com.google.template:soy:2018-03-14 +com.googlecode.charts4j:charts4j:1.3 +com.googlecode.json-simple:json-simple:1.1.1 +com.ibm.icu:icu4j:57.1 +com.jcraft:jsch:0.1.55 +com.kohlschutter.junixsocket:junixsocket-common:2.0.4 +com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 +com.squareup.okhttp:okhttp:2.5.0 +com.squareup.okio:okio:1.13.0 +com.sun.istack:istack-commons-runtime:3.0.7 +com.sun.xml.fastinfoset:FastInfoset:1.2.15 +com.thoughtworks.paranamer:paranamer:2.7 +com.zaxxer:HikariCP:3.2.0 +commons-codec:commons-codec:1.11 +commons-logging:commons-logging:1.2 +dnsjava:dnsjava:2.1.7 +io.dropwizard.metrics:metrics-core:3.1.2 +io.grpc:grpc-all:1.17.1 +io.grpc:grpc-alts:1.17.1 +io.grpc:grpc-auth:1.17.1 +io.grpc:grpc-context:1.22.1 +io.grpc:grpc-core:1.17.1 +io.grpc:grpc-grpclb:1.17.1 +io.grpc:grpc-netty-shaded:1.17.1 +io.grpc:grpc-netty:1.17.1 +io.grpc:grpc-okhttp:1.17.1 +io.grpc:grpc-protobuf-lite:1.17.1 +io.grpc:grpc-protobuf-nano:1.17.1 +io.grpc:grpc-protobuf:1.17.1 +io.grpc:grpc-stub:1.17.1 +io.grpc:grpc-testing:1.17.1 +io.netty:netty-buffer:4.1.30.Final +io.netty:netty-codec-http2:4.1.30.Final +io.netty:netty-codec-http:4.1.30.Final +io.netty:netty-codec-socks:4.1.30.Final +io.netty:netty-codec:4.1.30.Final +io.netty:netty-common:4.1.30.Final +io.netty:netty-handler-proxy:4.1.30.Final +io.netty:netty-handler:4.1.30.Final +io.netty:netty-resolver:4.1.30.Final +io.netty:netty-tcnative-boringssl-static:2.0.17.Final +io.netty:netty-transport:4.1.30.Final +io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 +io.opencensus:opencensus-contrib-grpc-util:0.17.0 +io.opencensus:opencensus-contrib-http-util:0.24.0 +it.unimi.dsi:fastutil:6.5.16 +javax.activation:activation:1.1 +javax.activation:javax.activation-api:1.2.0 +javax.annotation:javax.annotation-api:1.3.2 +javax.annotation:jsr250-api:1.0 +javax.inject:javax.inject:1 +javax.jdo:jdo2-api:2.3-eb +javax.mail:mail:1.4 +javax.persistence:javax.persistence-api:2.2 +javax.servlet:servlet-api:2.5 +javax.transaction:transaction-api:1.1 +javax.validation:validation-api:1.0.0.GA +javax.xml.bind:jaxb-api:2.3.1 +jline:jline:1.0 +joda-time:joda-time:2.10.3 +junit:junit:4.12 +net.bytebuddy:byte-buddy:1.9.11 +net.java.dev.jna:jna-platform:5.3.1 +net.java.dev.jna:jna:5.3.1 +org.apache.avro:avro:1.8.2 +org.apache.beam:beam-model-job-management:2.16.0 +org.apache.beam:beam-model-pipeline:2.16.0 +org.apache.beam:beam-runners-core-construction-java:2.16.0 +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0 +org.apache.beam:beam-sdks-java-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0 +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0 +org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1 +org.apache.beam:beam-vendor-grpc-1_21_0:0.1 +org.apache.beam:beam-vendor-guava-26_0-jre:0.1 +org.apache.commons:commons-compress:1.19 +org.apache.commons:commons-lang3:3.5 +org.apache.httpcomponents:httpclient:4.5.10 +org.apache.httpcomponents:httpcore:4.4.12 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.jackson:jackson-core-asl:1.9.13 +org.codehaus.jackson:jackson-mapper-asl:1.9.13 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.dom4j:dom4j:2.1.1 +org.easymock:easymock:3.0 +org.glassfish.jaxb:jaxb-runtime:2.3.1 +org.glassfish.jaxb:txw2:2.3.1 +org.hamcrest:hamcrest-core:1.3 +org.hibernate.common:hibernate-commons-annotations:5.1.0.Final +org.hibernate:hibernate-core:5.4.4.Final +org.hibernate:hibernate-hikaricp:5.4.4.Final +org.javassist:javassist:3.24.0-GA +org.jboss.logging:jboss-logging:3.3.2.Final +org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final +org.jboss:jandex:2.0.5.Final +org.jetbrains:annotations:17.0.0 +org.joda:joda-money:1.0.1 +org.json:json:20160810 +org.jvnet.staxex:stax-ex:1.8 +org.mockito:mockito-core:1.9.5 +org.mortbay.jetty:jetty-util:6.1.26 +org.mortbay.jetty:jetty:6.1.26 +org.objenesis:objenesis:1.2 +org.ow2.asm:asm-analysis:6.0 +org.ow2.asm:asm-commons:6.0 +org.ow2.asm:asm-tree:6.0 +org.ow2.asm:asm-util:6.0 +org.ow2.asm:asm:6.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.rnorth:tcp-unix-socket-proxy:1.0.2 +org.scijava:native-lib-loader:2.0.2 +org.slf4j:slf4j-api:1.7.28 +org.testcontainers:database-commons:1.12.1 +org.testcontainers:jdbc:1.12.1 +org.testcontainers:postgresql:1.12.1 +org.testcontainers:testcontainers:1.12.1 +org.threeten:threetenbp:1.3.3 +org.tukaani:xz:1.8 +org.w3c.css:sac:1.3 +org.xerial.snappy:snappy-java:1.1.4 +org.yaml:snakeyaml:1.17 +xerces:xmlParserAPIs:2.6.2 +xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile b/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile new file mode 100644 index 000000000..264041cef --- /dev/null +++ b/core/gradle/dependency-locks/nonprodCompileClasspath.lockfile @@ -0,0 +1,232 @@ +# 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 +aopalliance:aopalliance:1.0 +args4j:args4j:2.0.23 +cglib:cglib-nodep:2.2 +com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-databind:2.9.10 +com.fasterxml:classmate:1.3.4 +com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-jackson2:1.27.0 +com.google.api-client:google-api-client-java6:1.27.0 +com.google.api-client:google-api-client-servlet:1.30.6 +com.google.api-client:google-api-client:1.30.6 +com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:grpc-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0 +com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0 +com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:proto-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-iam-v1:0.12.0 +com.google.api:api-common:1.7.0 +com.google.api:gax-grpc:1.38.0 +com.google.api:gax-httpjson:0.52.0 +com.google.api:gax:1.38.0 +com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0 +com.google.apis:google-api-services-appengine:v1-rev101-1.25.0 +com.google.apis:google-api-services-bigquery:v2-rev20181104-1.27.0 +com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0 +com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0 +com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0 +com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0 +com.google.apis:google-api-services-dns:v2beta1-rev6-1.22.0 +com.google.apis:google-api-services-drive:v2-rev160-1.19.1 +com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0 +com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0 +com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0 +com.google.apis:google-api-services-sheets:v4-rev483-1.22.0 +com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0 +com.google.appengine.tools:appengine-gcs-client:0.6 +com.google.appengine.tools:appengine-mapreduce:0.9 +com.google.appengine.tools:appengine-pipeline:0.2.13 +com.google.appengine:appengine-api-1.0-sdk:1.9.48 +com.google.appengine:appengine-remote-api:1.9.48 +com.google.appengine:appengine-testing:1.9.58 +com.google.auth:google-auth-library-credentials:0.16.1 +com.google.auth:google-auth-library-oauth2-http:0.16.1 +com.google.auto.value:auto-value-annotations:1.6.3 +com.google.auto.value:auto-value:1.6.3 +com.google.cloud.bigdataoss:gcsio:1.9.16 +com.google.cloud.bigdataoss:util:1.9.16 +com.google.cloud.bigtable:bigtable-client-core:1.8.0 +com.google.cloud.datastore:datastore-v1-proto-client:1.6.0 +com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha +com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha +com.google.cloud:google-cloud-bigtable:0.73.0-alpha +com.google.cloud:google-cloud-core-grpc:1.61.0 +com.google.cloud:google-cloud-core-http:1.55.0 +com.google.cloud:google-cloud-core:1.61.0 +com.google.cloud:google-cloud-spanner:1.6.0 +com.google.code.findbugs:jsr305:3.0.2 +com.google.code.gson:gson:2.8.5 +com.google.common.html.types:types:1.0.4 +com.google.dagger:dagger:2.21 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.flogger:flogger:0.3.1 +com.google.flogger:google-extensions:0.3.1 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:28.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +com.google.gwt:gwt-user:2.8.2 +com.google.http-client:google-http-client-appengine:1.32.1 +com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-jackson:1.20.0 +com.google.http-client:google-http-client-protobuf:1.20.0 +com.google.http-client:google-http-client:1.32.1 +com.google.inject.extensions:guice-multibindings:4.1.0 +com.google.inject:guice:4.1.0 +com.google.j2objc:j2objc-annotations:1.3 +com.google.jsinterop:jsinterop-annotations:1.0.2 +com.google.monitoring-client:metrics:1.0.6 +com.google.monitoring-client:stackdriver:1.0.6 +com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-java6:1.28.0 +com.google.oauth-client:google-oauth-client-jetty:1.28.0 +com.google.oauth-client:google-oauth-client-servlet:1.30.4 +com.google.oauth-client:google-oauth-client:1.30.4 +com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 +com.google.protobuf:protobuf-java-util:3.6.1 +com.google.protobuf:protobuf-java:3.6.1 +com.google.re2j:re2j:1.1 +com.google.template:soy:2018-03-14 +com.googlecode.charts4j:charts4j:1.3 +com.googlecode.json-simple:json-simple:1.1.1 +com.ibm.icu:icu4j:57.1 +com.jcraft:jsch:0.1.55 +com.kohlschutter.junixsocket:junixsocket-common:2.0.4 +com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 +com.squareup.okhttp:okhttp:2.5.0 +com.squareup.okio:okio:1.13.0 +com.sun.istack:istack-commons-runtime:3.0.7 +com.sun.xml.fastinfoset:FastInfoset:1.2.15 +com.thoughtworks.paranamer:paranamer:2.7 +com.zaxxer:HikariCP:3.2.0 +commons-codec:commons-codec:1.11 +commons-logging:commons-logging:1.2 +dnsjava:dnsjava:2.1.7 +io.dropwizard.metrics:metrics-core:3.1.2 +io.grpc:grpc-all:1.17.1 +io.grpc:grpc-alts:1.17.1 +io.grpc:grpc-auth:1.17.1 +io.grpc:grpc-context:1.22.1 +io.grpc:grpc-core:1.17.1 +io.grpc:grpc-netty-shaded:1.17.1 +io.grpc:grpc-netty:1.17.1 +io.grpc:grpc-okhttp:1.17.1 +io.grpc:grpc-protobuf-lite:1.17.1 +io.grpc:grpc-protobuf-nano:1.17.1 +io.grpc:grpc-protobuf:1.17.1 +io.grpc:grpc-stub:1.17.1 +io.grpc:grpc-testing:1.17.1 +io.netty:netty-buffer:4.1.30.Final +io.netty:netty-codec-http2:4.1.30.Final +io.netty:netty-codec-http:4.1.30.Final +io.netty:netty-codec-socks:4.1.30.Final +io.netty:netty-codec:4.1.30.Final +io.netty:netty-common:4.1.30.Final +io.netty:netty-handler-proxy:4.1.30.Final +io.netty:netty-handler:4.1.30.Final +io.netty:netty-resolver:4.1.30.Final +io.netty:netty-tcnative-boringssl-static:2.0.17.Final +io.netty:netty-transport:4.1.30.Final +io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 +io.opencensus:opencensus-contrib-grpc-util:0.17.0 +io.opencensus:opencensus-contrib-http-util:0.24.0 +it.unimi.dsi:fastutil:6.5.16 +javax.activation:activation:1.1 +javax.activation:javax.activation-api:1.2.0 +javax.annotation:javax.annotation-api:1.3.2 +javax.annotation:jsr250-api:1.0 +javax.inject:javax.inject:1 +javax.jdo:jdo2-api:2.3-eb +javax.mail:mail:1.4 +javax.persistence:javax.persistence-api:2.2 +javax.servlet:servlet-api:2.5 +javax.transaction:transaction-api:1.1 +javax.validation:validation-api:1.0.0.GA +javax.xml.bind:jaxb-api:2.3.1 +jline:jline:1.0 +joda-time:joda-time:2.10.3 +junit:junit:4.12 +net.bytebuddy:byte-buddy:1.9.11 +net.java.dev.jna:jna-platform:5.3.1 +net.java.dev.jna:jna:5.3.1 +org.apache.avro:avro:1.8.2 +org.apache.beam:beam-model-job-management:2.16.0 +org.apache.beam:beam-model-pipeline:2.16.0 +org.apache.beam:beam-runners-core-construction-java:2.16.0 +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0 +org.apache.beam:beam-sdks-java-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0 +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0 +org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1 +org.apache.beam:beam-vendor-grpc-1_21_0:0.1 +org.apache.beam:beam-vendor-guava-26_0-jre:0.1 +org.apache.commons:commons-compress:1.19 +org.apache.commons:commons-lang3:3.5 +org.apache.httpcomponents:httpclient:4.5.10 +org.apache.httpcomponents:httpcore:4.4.12 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.jackson:jackson-core-asl:1.9.13 +org.codehaus.jackson:jackson-mapper-asl:1.9.13 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.dom4j:dom4j:2.1.1 +org.easymock:easymock:3.0 +org.glassfish.jaxb:jaxb-runtime:2.3.1 +org.glassfish.jaxb:txw2:2.3.1 +org.hamcrest:hamcrest-core:1.3 +org.hibernate.common:hibernate-commons-annotations:5.1.0.Final +org.hibernate:hibernate-core:5.4.4.Final +org.hibernate:hibernate-hikaricp:5.4.4.Final +org.javassist:javassist:3.24.0-GA +org.jboss.logging:jboss-logging:3.3.2.Final +org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final +org.jboss:jandex:2.0.5.Final +org.jetbrains:annotations:17.0.0 +org.joda:joda-money:1.0.1 +org.json:json:20160810 +org.jvnet.staxex:stax-ex:1.8 +org.mockito:mockito-core:1.9.5 +org.mortbay.jetty:jetty-util:6.1.26 +org.mortbay.jetty:jetty:6.1.26 +org.objenesis:objenesis:1.2 +org.ow2.asm:asm-analysis:6.0 +org.ow2.asm:asm-commons:6.0 +org.ow2.asm:asm-tree:6.0 +org.ow2.asm:asm-util:6.0 +org.ow2.asm:asm:6.0 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.rnorth:tcp-unix-socket-proxy:1.0.2 +org.scijava:native-lib-loader:2.0.2 +org.slf4j:slf4j-api:1.7.28 +org.testcontainers:database-commons:1.12.1 +org.testcontainers:jdbc:1.12.1 +org.testcontainers:postgresql:1.12.1 +org.testcontainers:testcontainers:1.12.1 +org.threeten:threetenbp:1.3.3 +org.tukaani:xz:1.8 +org.w3c.css:sac:1.3 +org.xerial.snappy:snappy-java:1.1.4 +org.yaml:snakeyaml:1.17 +xerces:xmlParserAPIs:2.6.2 +xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/nonprodCompileOnly.lockfile b/core/gradle/dependency-locks/nonprodCompileOnly.lockfile new file mode 100644 index 000000000..656c5dbcc --- /dev/null +++ b/core/gradle/dependency-locks/nonprodCompileOnly.lockfile @@ -0,0 +1,3 @@ +# 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/core/gradle/dependency-locks/nonprodRuntime.lockfile b/core/gradle/dependency-locks/nonprodRuntime.lockfile new file mode 100644 index 000000000..40ebc8cb3 --- /dev/null +++ b/core/gradle/dependency-locks/nonprodRuntime.lockfile @@ -0,0 +1,235 @@ +# 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 +aopalliance:aopalliance:1.0 +args4j:args4j:2.0.23 +cglib:cglib-nodep:2.2 +com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-databind:2.9.10 +com.fasterxml:classmate:1.3.4 +com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-jackson2:1.27.0 +com.google.api-client:google-api-client-java6:1.27.0 +com.google.api-client:google-api-client-servlet:1.30.6 +com.google.api-client:google-api-client:1.30.6 +com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:grpc-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0 +com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0 +com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:proto-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-iam-v1:0.12.0 +com.google.api:api-common:1.7.0 +com.google.api:gax-grpc:1.38.0 +com.google.api:gax-httpjson:0.52.0 +com.google.api:gax:1.38.0 +com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0 +com.google.apis:google-api-services-appengine:v1-rev101-1.25.0 +com.google.apis:google-api-services-bigquery:v2-rev20181104-1.27.0 +com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0 +com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0 +com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0 +com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0 +com.google.apis:google-api-services-dns:v2beta1-rev6-1.22.0 +com.google.apis:google-api-services-drive:v2-rev160-1.19.1 +com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0 +com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0 +com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0 +com.google.apis:google-api-services-sheets:v4-rev483-1.22.0 +com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0 +com.google.appengine.tools:appengine-gcs-client:0.6 +com.google.appengine.tools:appengine-mapreduce:0.9 +com.google.appengine.tools:appengine-pipeline:0.2.13 +com.google.appengine:appengine-api-1.0-sdk:1.9.48 +com.google.appengine:appengine-remote-api:1.9.48 +com.google.appengine:appengine-testing:1.9.58 +com.google.auth:google-auth-library-credentials:0.16.1 +com.google.auth:google-auth-library-oauth2-http:0.16.1 +com.google.auto.value:auto-value-annotations:1.6.3 +com.google.auto.value:auto-value:1.6.3 +com.google.cloud.bigdataoss:gcsio:1.9.16 +com.google.cloud.bigdataoss:util:1.9.16 +com.google.cloud.bigtable:bigtable-client-core:1.8.0 +com.google.cloud.datastore:datastore-v1-proto-client:1.6.0 +com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha +com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha +com.google.cloud:google-cloud-bigtable:0.73.0-alpha +com.google.cloud:google-cloud-core-grpc:1.61.0 +com.google.cloud:google-cloud-core-http:1.55.0 +com.google.cloud:google-cloud-core:1.61.0 +com.google.cloud:google-cloud-spanner:1.6.0 +com.google.code.findbugs:jsr305:3.0.2 +com.google.code.gson:gson:2.8.5 +com.google.common.html.types:types:1.0.4 +com.google.dagger:dagger:2.21 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.flogger:flogger-system-backend:0.3.1 +com.google.flogger:flogger:0.3.1 +com.google.flogger:google-extensions:0.3.1 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:28.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +com.google.gwt:gwt-user:2.8.2 +com.google.http-client:google-http-client-appengine:1.32.1 +com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-jackson:1.20.0 +com.google.http-client:google-http-client-protobuf:1.20.0 +com.google.http-client:google-http-client:1.32.1 +com.google.inject.extensions:guice-multibindings:4.1.0 +com.google.inject:guice:4.1.0 +com.google.j2objc:j2objc-annotations:1.3 +com.google.jsinterop:jsinterop-annotations:1.0.2 +com.google.monitoring-client:metrics:1.0.6 +com.google.monitoring-client:stackdriver:1.0.6 +com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-java6:1.28.0 +com.google.oauth-client:google-oauth-client-jetty:1.28.0 +com.google.oauth-client:google-oauth-client-servlet:1.30.4 +com.google.oauth-client:google-oauth-client:1.30.4 +com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 +com.google.protobuf:protobuf-java-util:3.6.1 +com.google.protobuf:protobuf-java:3.6.1 +com.google.re2j:re2j:1.1 +com.google.template:soy:2018-03-14 +com.googlecode.charts4j:charts4j:1.3 +com.googlecode.json-simple:json-simple:1.1.1 +com.ibm.icu:icu4j:57.1 +com.jcraft:jsch:0.1.55 +com.kohlschutter.junixsocket:junixsocket-common:2.0.4 +com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 +com.squareup.okhttp:okhttp:2.5.0 +com.squareup.okio:okio:1.13.0 +com.sun.istack:istack-commons-runtime:3.0.7 +com.sun.xml.fastinfoset:FastInfoset:1.2.15 +com.thoughtworks.paranamer:paranamer:2.7 +com.zaxxer:HikariCP:3.2.0 +commons-codec:commons-codec:1.11 +commons-logging:commons-logging:1.2 +dnsjava:dnsjava:2.1.7 +io.dropwizard.metrics:metrics-core:3.1.2 +io.grpc:grpc-all:1.17.1 +io.grpc:grpc-alts:1.17.1 +io.grpc:grpc-auth:1.17.1 +io.grpc:grpc-context:1.22.1 +io.grpc:grpc-core:1.17.1 +io.grpc:grpc-grpclb:1.17.1 +io.grpc:grpc-netty-shaded:1.17.1 +io.grpc:grpc-netty:1.17.1 +io.grpc:grpc-okhttp:1.17.1 +io.grpc:grpc-protobuf-lite:1.17.1 +io.grpc:grpc-protobuf-nano:1.17.1 +io.grpc:grpc-protobuf:1.17.1 +io.grpc:grpc-stub:1.17.1 +io.grpc:grpc-testing:1.17.1 +io.netty:netty-buffer:4.1.30.Final +io.netty:netty-codec-http2:4.1.30.Final +io.netty:netty-codec-http:4.1.30.Final +io.netty:netty-codec-socks:4.1.30.Final +io.netty:netty-codec:4.1.30.Final +io.netty:netty-common:4.1.30.Final +io.netty:netty-handler-proxy:4.1.30.Final +io.netty:netty-handler:4.1.30.Final +io.netty:netty-resolver:4.1.30.Final +io.netty:netty-tcnative-boringssl-static:2.0.17.Final +io.netty:netty-transport:4.1.30.Final +io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 +io.opencensus:opencensus-contrib-grpc-util:0.17.0 +io.opencensus:opencensus-contrib-http-util:0.24.0 +it.unimi.dsi:fastutil:6.5.16 +javax.activation:activation:1.1 +javax.activation:javax.activation-api:1.2.0 +javax.annotation:javax.annotation-api:1.3.2 +javax.annotation:jsr250-api:1.0 +javax.inject:javax.inject:1 +javax.jdo:jdo2-api:2.3-eb +javax.mail:mail:1.4 +javax.persistence:javax.persistence-api:2.2 +javax.servlet:servlet-api:2.5 +javax.transaction:transaction-api:1.1 +javax.validation:validation-api:1.0.0.GA +javax.xml.bind:jaxb-api:2.3.1 +jline:jline:1.0 +joda-time:joda-time:2.10.3 +junit:junit:4.12 +net.bytebuddy:byte-buddy:1.9.11 +net.java.dev.jna:jna-platform:5.3.1 +net.java.dev.jna:jna:5.3.1 +org.apache.avro:avro:1.8.2 +org.apache.beam:beam-model-job-management:2.16.0 +org.apache.beam:beam-model-pipeline:2.16.0 +org.apache.beam:beam-runners-core-construction-java:2.16.0 +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0 +org.apache.beam:beam-sdks-java-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0 +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0 +org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1 +org.apache.beam:beam-vendor-grpc-1_21_0:0.1 +org.apache.beam:beam-vendor-guava-26_0-jre:0.1 +org.apache.commons:commons-compress:1.19 +org.apache.commons:commons-lang3:3.5 +org.apache.httpcomponents:httpclient:4.5.10 +org.apache.httpcomponents:httpcore:4.4.12 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.jackson:jackson-core-asl:1.9.13 +org.codehaus.jackson:jackson-mapper-asl:1.9.13 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.dom4j:dom4j:2.1.1 +org.easymock:easymock:3.0 +org.glassfish.jaxb:jaxb-runtime:2.3.1 +org.glassfish.jaxb:txw2:2.3.1 +org.hamcrest:hamcrest-core:1.3 +org.hibernate.common:hibernate-commons-annotations:5.1.0.Final +org.hibernate:hibernate-core:5.4.4.Final +org.hibernate:hibernate-hikaricp:5.4.4.Final +org.javassist:javassist:3.24.0-GA +org.jboss.logging:jboss-logging:3.3.2.Final +org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final +org.jboss:jandex:2.0.5.Final +org.jetbrains:annotations:17.0.0 +org.joda:joda-money:1.0.1 +org.json:json:20160810 +org.jvnet.staxex:stax-ex:1.8 +org.mockito:mockito-core:1.9.5 +org.mortbay.jetty:jetty-util:6.1.26 +org.mortbay.jetty:jetty:6.1.26 +org.objenesis:objenesis:1.2 +org.ow2.asm:asm-analysis:6.0 +org.ow2.asm:asm-commons:6.0 +org.ow2.asm:asm-tree:6.0 +org.ow2.asm:asm-util:6.0 +org.ow2.asm:asm:6.0 +org.postgresql:postgresql:42.2.6 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.rnorth:tcp-unix-socket-proxy:1.0.2 +org.scijava:native-lib-loader:2.0.2 +org.slf4j:slf4j-api:1.7.28 +org.testcontainers:database-commons:1.12.1 +org.testcontainers:jdbc:1.12.1 +org.testcontainers:postgresql:1.12.1 +org.testcontainers:testcontainers:1.12.1 +org.threeten:threetenbp:1.3.3 +org.tukaani:xz:1.8 +org.w3c.css:sac:1.3 +org.xerial.snappy:snappy-java:1.1.4 +org.yaml:snakeyaml:1.17 +xerces:xmlParserAPIs:2.6.2 +xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile b/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile new file mode 100644 index 000000000..40ebc8cb3 --- /dev/null +++ b/core/gradle/dependency-locks/nonprodRuntimeClasspath.lockfile @@ -0,0 +1,235 @@ +# 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 +aopalliance:aopalliance:1.0 +args4j:args4j:2.0.23 +cglib:cglib-nodep:2.2 +com.beust:jcommander:1.60 +com.fasterxml.jackson.core:jackson-annotations:2.9.10 +com.fasterxml.jackson.core:jackson-core:2.9.10 +com.fasterxml.jackson.core:jackson-databind:2.9.10 +com.fasterxml:classmate:1.3.4 +com.google.api-client:google-api-client-appengine:1.30.6 +com.google.api-client:google-api-client-jackson2:1.27.0 +com.google.api-client:google-api-client-java6:1.27.0 +com.google.api-client:google-api-client-servlet:1.30.6 +com.google.api-client:google-api-client:1.30.6 +com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-bigtable-v2:0.38.0 +com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:grpc-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:grpc-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.44.0 +com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:0.38.0 +com.google.api.grpc:proto-google-cloud-bigtable-v2:0.44.0 +com.google.api.grpc:proto-google-cloud-datastore-v1:0.44.0 +com.google.api.grpc:proto-google-cloud-pubsub-v1:1.43.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:1.6.0 +com.google.api.grpc:proto-google-cloud-spanner-v1:1.6.0 +com.google.api.grpc:proto-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-iam-v1:0.12.0 +com.google.api:api-common:1.7.0 +com.google.api:gax-grpc:1.38.0 +com.google.api:gax-httpjson:0.52.0 +com.google.api:gax:1.38.0 +com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0 +com.google.apis:google-api-services-appengine:v1-rev101-1.25.0 +com.google.apis:google-api-services-bigquery:v2-rev20181104-1.27.0 +com.google.apis:google-api-services-clouddebugger:v2-rev20180801-1.27.0 +com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0 +com.google.apis:google-api-services-cloudresourcemanager:v1-rev20181015-1.27.0 +com.google.apis:google-api-services-dataflow:v1b3-rev20190607-1.27.0 +com.google.apis:google-api-services-dns:v2beta1-rev6-1.22.0 +com.google.apis:google-api-services-drive:v2-rev160-1.19.1 +com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0 +com.google.apis:google-api-services-monitoring:v3-rev426-1.23.0 +com.google.apis:google-api-services-pubsub:v1-rev20181105-1.27.0 +com.google.apis:google-api-services-sheets:v4-rev483-1.22.0 +com.google.apis:google-api-services-storage:v1-rev20181109-1.27.0 +com.google.appengine.tools:appengine-gcs-client:0.6 +com.google.appengine.tools:appengine-mapreduce:0.9 +com.google.appengine.tools:appengine-pipeline:0.2.13 +com.google.appengine:appengine-api-1.0-sdk:1.9.48 +com.google.appengine:appengine-remote-api:1.9.48 +com.google.appengine:appengine-testing:1.9.58 +com.google.auth:google-auth-library-credentials:0.16.1 +com.google.auth:google-auth-library-oauth2-http:0.16.1 +com.google.auto.value:auto-value-annotations:1.6.3 +com.google.auto.value:auto-value:1.6.3 +com.google.cloud.bigdataoss:gcsio:1.9.16 +com.google.cloud.bigdataoss:util:1.9.16 +com.google.cloud.bigtable:bigtable-client-core:1.8.0 +com.google.cloud.datastore:datastore-v1-proto-client:1.6.0 +com.google.cloud:google-cloud-bigquerystorage:0.79.0-alpha +com.google.cloud:google-cloud-bigtable-admin:0.73.0-alpha +com.google.cloud:google-cloud-bigtable:0.73.0-alpha +com.google.cloud:google-cloud-core-grpc:1.61.0 +com.google.cloud:google-cloud-core-http:1.55.0 +com.google.cloud:google-cloud-core:1.61.0 +com.google.cloud:google-cloud-spanner:1.6.0 +com.google.code.findbugs:jsr305:3.0.2 +com.google.code.gson:gson:2.8.5 +com.google.common.html.types:types:1.0.4 +com.google.dagger:dagger:2.21 +com.google.errorprone:error_prone_annotations:2.3.3 +com.google.flogger:flogger-system-backend:0.3.1 +com.google.flogger:flogger:0.3.1 +com.google.flogger:google-extensions:0.3.1 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:28.1-jre +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +com.google.gwt:gwt-user:2.8.2 +com.google.http-client:google-http-client-appengine:1.32.1 +com.google.http-client:google-http-client-jackson2:1.32.1 +com.google.http-client:google-http-client-jackson:1.20.0 +com.google.http-client:google-http-client-protobuf:1.20.0 +com.google.http-client:google-http-client:1.32.1 +com.google.inject.extensions:guice-multibindings:4.1.0 +com.google.inject:guice:4.1.0 +com.google.j2objc:j2objc-annotations:1.3 +com.google.jsinterop:jsinterop-annotations:1.0.2 +com.google.monitoring-client:metrics:1.0.6 +com.google.monitoring-client:stackdriver:1.0.6 +com.google.oauth-client:google-oauth-client-appengine:1.30.4 +com.google.oauth-client:google-oauth-client-java6:1.28.0 +com.google.oauth-client:google-oauth-client-jetty:1.28.0 +com.google.oauth-client:google-oauth-client-servlet:1.30.4 +com.google.oauth-client:google-oauth-client:1.30.4 +com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 +com.google.protobuf:protobuf-java-util:3.6.1 +com.google.protobuf:protobuf-java:3.6.1 +com.google.re2j:re2j:1.1 +com.google.template:soy:2018-03-14 +com.googlecode.charts4j:charts4j:1.3 +com.googlecode.json-simple:json-simple:1.1.1 +com.ibm.icu:icu4j:57.1 +com.jcraft:jsch:0.1.55 +com.kohlschutter.junixsocket:junixsocket-common:2.0.4 +com.kohlschutter.junixsocket:junixsocket-native-common:2.0.4 +com.squareup.okhttp:okhttp:2.5.0 +com.squareup.okio:okio:1.13.0 +com.sun.istack:istack-commons-runtime:3.0.7 +com.sun.xml.fastinfoset:FastInfoset:1.2.15 +com.thoughtworks.paranamer:paranamer:2.7 +com.zaxxer:HikariCP:3.2.0 +commons-codec:commons-codec:1.11 +commons-logging:commons-logging:1.2 +dnsjava:dnsjava:2.1.7 +io.dropwizard.metrics:metrics-core:3.1.2 +io.grpc:grpc-all:1.17.1 +io.grpc:grpc-alts:1.17.1 +io.grpc:grpc-auth:1.17.1 +io.grpc:grpc-context:1.22.1 +io.grpc:grpc-core:1.17.1 +io.grpc:grpc-grpclb:1.17.1 +io.grpc:grpc-netty-shaded:1.17.1 +io.grpc:grpc-netty:1.17.1 +io.grpc:grpc-okhttp:1.17.1 +io.grpc:grpc-protobuf-lite:1.17.1 +io.grpc:grpc-protobuf-nano:1.17.1 +io.grpc:grpc-protobuf:1.17.1 +io.grpc:grpc-stub:1.17.1 +io.grpc:grpc-testing:1.17.1 +io.netty:netty-buffer:4.1.30.Final +io.netty:netty-codec-http2:4.1.30.Final +io.netty:netty-codec-http:4.1.30.Final +io.netty:netty-codec-socks:4.1.30.Final +io.netty:netty-codec:4.1.30.Final +io.netty:netty-common:4.1.30.Final +io.netty:netty-handler-proxy:4.1.30.Final +io.netty:netty-handler:4.1.30.Final +io.netty:netty-resolver:4.1.30.Final +io.netty:netty-tcnative-boringssl-static:2.0.17.Final +io.netty:netty-transport:4.1.30.Final +io.opencensus:opencensus-api:0.24.0 +io.opencensus:opencensus-contrib-grpc-metrics:0.17.0 +io.opencensus:opencensus-contrib-grpc-util:0.17.0 +io.opencensus:opencensus-contrib-http-util:0.24.0 +it.unimi.dsi:fastutil:6.5.16 +javax.activation:activation:1.1 +javax.activation:javax.activation-api:1.2.0 +javax.annotation:javax.annotation-api:1.3.2 +javax.annotation:jsr250-api:1.0 +javax.inject:javax.inject:1 +javax.jdo:jdo2-api:2.3-eb +javax.mail:mail:1.4 +javax.persistence:javax.persistence-api:2.2 +javax.servlet:servlet-api:2.5 +javax.transaction:transaction-api:1.1 +javax.validation:validation-api:1.0.0.GA +javax.xml.bind:jaxb-api:2.3.1 +jline:jline:1.0 +joda-time:joda-time:2.10.3 +junit:junit:4.12 +net.bytebuddy:byte-buddy:1.9.11 +net.java.dev.jna:jna-platform:5.3.1 +net.java.dev.jna:jna:5.3.1 +org.apache.avro:avro:1.8.2 +org.apache.beam:beam-model-job-management:2.16.0 +org.apache.beam:beam-model-pipeline:2.16.0 +org.apache.beam:beam-runners-core-construction-java:2.16.0 +org.apache.beam:beam-runners-google-cloud-dataflow-java:2.16.0 +org.apache.beam:beam-sdks-java-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0 +org.apache.beam:beam-sdks-java-extensions-protobuf:2.16.0 +org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0 +org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1 +org.apache.beam:beam-vendor-grpc-1_21_0:0.1 +org.apache.beam:beam-vendor-guava-26_0-jre:0.1 +org.apache.commons:commons-compress:1.19 +org.apache.commons:commons-lang3:3.5 +org.apache.httpcomponents:httpclient:4.5.10 +org.apache.httpcomponents:httpcore:4.4.12 +org.bouncycastle:bcpg-jdk15on:1.61 +org.bouncycastle:bcprov-jdk15on:1.61 +org.checkerframework:checker-qual:2.8.1 +org.codehaus.jackson:jackson-core-asl:1.9.13 +org.codehaus.jackson:jackson-mapper-asl:1.9.13 +org.codehaus.mojo:animal-sniffer-annotations:1.18 +org.dom4j:dom4j:2.1.1 +org.easymock:easymock:3.0 +org.glassfish.jaxb:jaxb-runtime:2.3.1 +org.glassfish.jaxb:txw2:2.3.1 +org.hamcrest:hamcrest-core:1.3 +org.hibernate.common:hibernate-commons-annotations:5.1.0.Final +org.hibernate:hibernate-core:5.4.4.Final +org.hibernate:hibernate-hikaricp:5.4.4.Final +org.javassist:javassist:3.24.0-GA +org.jboss.logging:jboss-logging:3.3.2.Final +org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final +org.jboss:jandex:2.0.5.Final +org.jetbrains:annotations:17.0.0 +org.joda:joda-money:1.0.1 +org.json:json:20160810 +org.jvnet.staxex:stax-ex:1.8 +org.mockito:mockito-core:1.9.5 +org.mortbay.jetty:jetty-util:6.1.26 +org.mortbay.jetty:jetty:6.1.26 +org.objenesis:objenesis:1.2 +org.ow2.asm:asm-analysis:6.0 +org.ow2.asm:asm-commons:6.0 +org.ow2.asm:asm-tree:6.0 +org.ow2.asm:asm-util:6.0 +org.ow2.asm:asm:6.0 +org.postgresql:postgresql:42.2.6 +org.rnorth.duct-tape:duct-tape:1.0.8 +org.rnorth.visible-assertions:visible-assertions:2.1.2 +org.rnorth:tcp-unix-socket-proxy:1.0.2 +org.scijava:native-lib-loader:2.0.2 +org.slf4j:slf4j-api:1.7.28 +org.testcontainers:database-commons:1.12.1 +org.testcontainers:jdbc:1.12.1 +org.testcontainers:postgresql:1.12.1 +org.testcontainers:testcontainers:1.12.1 +org.threeten:threetenbp:1.3.3 +org.tukaani:xz:1.8 +org.w3c.css:sac:1.3 +org.xerial.snappy:snappy-java:1.1.4 +org.yaml:snakeyaml:1.17 +xerces:xmlParserAPIs:2.6.2 +xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/runtimeClasspath.lockfile b/core/gradle/dependency-locks/runtimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile index 935c01cd8..735e1b392 100644 --- a/core/gradle/dependency-locks/testCompile.lockfile +++ b/core/gradle/dependency-locks/testCompile.lockfile @@ -265,5 +265,6 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 +pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile index 89554fabd..42a3fbc96 100644 --- a/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -263,5 +263,6 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 +pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/testRuntime.lockfile b/core/gradle/dependency-locks/testRuntime.lockfile index 077af3a6f..55205f815 100644 --- a/core/gradle/dependency-locks/testRuntime.lockfile +++ b/core/gradle/dependency-locks/testRuntime.lockfile @@ -280,5 +280,6 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 +pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 077af3a6f..55205f815 100644 --- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -280,5 +280,6 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 +pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/src/main/java/google/registry/tools/RegistryTool.java b/core/src/main/java/google/registry/tools/RegistryTool.java index 0b95f14bd..6e15298d9 100644 --- a/core/src/main/java/google/registry/tools/RegistryTool.java +++ b/core/src/main/java/google/registry/tools/RegistryTool.java @@ -60,7 +60,6 @@ public final class RegistryTool { .put("generate_dns_report", GenerateDnsReportCommand.class) .put("generate_escrow_deposit", GenerateEscrowDepositCommand.class) .put("generate_lordn", GenerateLordnCommand.class) - .put("generate_sql_schema", GenerateSqlSchemaCommand.class) .put("generate_zone_files", GenerateZoneFilesCommand.class) .put("get_allocation_token", GetAllocationTokenCommand.class) .put("get_claims_list", GetClaimsListCommand.class) diff --git a/core/src/nonprod/java/google/registry/tools/DevTool.java b/core/src/nonprod/java/google/registry/tools/DevTool.java new file mode 100644 index 000000000..e97523fd4 --- /dev/null +++ b/core/src/nonprod/java/google/registry/tools/DevTool.java @@ -0,0 +1,37 @@ +// 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. + +package google.registry.tools; + +import com.google.common.collect.ImmutableMap; + +/** Entry point of Nomulus development commands. */ +public class DevTool { + + /** + * Available commands. + * + *

Note: If changing the command-line name of any commands below, remember to resolve + * any invocations in scripts (e.g. PDT, ICANN reporting). + */ + public static final ImmutableMap> COMMAND_MAP = + ImmutableMap.of("generate_sql_schema", GenerateSqlSchemaCommand.class); + + public static void main(String[] args) throws Exception { + RegistryToolEnvironment.parseFromArgs(args).setup(); + try (RegistryCli cli = new RegistryCli("devtool", COMMAND_MAP)) { + cli.run(args); + } + } +} diff --git a/core/src/main/java/google/registry/tools/GenerateSqlSchemaCommand.java b/core/src/nonprod/java/google/registry/tools/GenerateSqlSchemaCommand.java similarity index 100% rename from core/src/main/java/google/registry/tools/GenerateSqlSchemaCommand.java rename to core/src/nonprod/java/google/registry/tools/GenerateSqlSchemaCommand.java diff --git a/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java b/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java index fd649a71d..79cddbcdc 100644 --- a/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java +++ b/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.testcontainers.containers.PostgreSQLContainer; -/** Unit tests for {@link google.registry.tools.GenerateSqlSchemaCommand}. */ +/** Unit tests for {@link GenerateSqlSchemaCommand}. */ @RunWith(JUnit4.class) public class GenerateSqlSchemaCommandTest extends CommandTestCase { diff --git a/core/src/test/java/google/registry/tools/RegistryToolTest.java b/core/src/test/java/google/registry/tools/ToolsTest.java similarity index 65% rename from core/src/test/java/google/registry/tools/RegistryToolTest.java rename to core/src/test/java/google/registry/tools/ToolsTest.java index 33ec880de..8f3e83e1e 100644 --- a/core/src/test/java/google/registry/tools/RegistryToolTest.java +++ b/core/src/test/java/google/registry/tools/ToolsTest.java @@ -21,24 +21,29 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import com.beust.jcommander.Parameters; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.collect.Sets.SetView; import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath.ClassInfo; import com.google.common.truth.Expect; import google.registry.testing.SystemPropertyRule; import java.io.IOException; import java.lang.reflect.Modifier; +import java.util.List; import java.util.Map; +import junitparams.JUnitParamsRunner; +import junitparams.naming.TestCaseName; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -/** Unit tests for {@link RegistryTool}. */ -@RunWith(JUnit4.class) -public class RegistryToolTest { +/** Unit tests for {@link RegistryTool} and {@link DevTool}. */ +@RunWith(JUnitParamsRunner.class) +public class ToolsTest { @Rule public final Expect expect = Expect.create(); @@ -50,28 +55,39 @@ public class RegistryToolTest { RegistryToolEnvironment.UNITTEST.setup(systemPropertyRule); } - @Test - public void test_commandMap_namesAreInAlphabeticalOrder() { - assertThat(RegistryTool.COMMAND_MAP.keySet()).isInStrictOrder(); - } - @Test public void test_commandMap_includesAllCommands() throws Exception { - ImmutableSet commandMapClasses = ImmutableSet.copyOf(RegistryTool.COMMAND_MAP.values()); + ImmutableSet registryToolCommands = ImmutableSet.copyOf(RegistryTool.COMMAND_MAP.values()); + ImmutableSet devToolCommands = ImmutableSet.copyOf(DevTool.COMMAND_MAP.values()); + assertWithMessage("RegistryTool and DevTool have overlapping commands") + .that(Sets.intersection(registryToolCommands, devToolCommands)) + .isEmpty(); + SetView allCommandsInTools = Sets.union(registryToolCommands, devToolCommands); ImmutableSet classLoaderClasses = getAllCommandClasses(); // Not using plain old containsExactlyElementsIn() since it produces a huge unreadable blob. - assertWithMessage("command classes in RegistryTool.COMMAND_MAP but not found by class loader") - .that(Sets.difference(commandMapClasses, classLoaderClasses)) + assertWithMessage("command classes in COMMAND_MAP but not found by class loader") + .that(Sets.difference(allCommandsInTools, classLoaderClasses)) .isEmpty(); - assertWithMessage("command classes found by class loader but not in RegistryTool.COMMAND_MAP") - .that(Sets.difference(classLoaderClasses, commandMapClasses)) + assertWithMessage("command classes found by class loader but not in COMMAND_MAP") + .that(Sets.difference(classLoaderClasses, allCommandsInTools)) .isEmpty(); } @Test - public void test_commandMap_namesAreDerivedFromClassNames() { + @junitparams.Parameters(method = "getToolCommandMap") + @TestCaseName("{method}_{0}") + public void test_commandMap_namesAreInAlphabeticalOrder( + String toolName, ImmutableMap> commandMap) { + assertThat(commandMap.keySet()).isInStrictOrder(); + } + + @Test + @junitparams.Parameters(method = "getToolCommandMap") + @TestCaseName("{method}_{0}") + public void test_commandMap_namesAreDerivedFromClassNames( + String toolName, ImmutableMap> commandMap) { for (Map.Entry> commandEntry : - RegistryTool.COMMAND_MAP.entrySet()) { + commandMap.entrySet()) { String className = commandEntry.getValue().getSimpleName(); expect.that(commandEntry.getKey()) // JCommander names should match the class name, up to "Command" and case formatting. @@ -80,15 +96,25 @@ public class RegistryToolTest { } @Test - public void test_commandMap_allCommandsHaveDescriptions() { + @junitparams.Parameters(method = "getToolCommandMap") + @TestCaseName("{method}_{0}") + public void test_commandMap_allCommandsHaveDescriptions( + String toolName, ImmutableMap> commandMap) { for (Map.Entry> commandEntry : - RegistryTool.COMMAND_MAP.entrySet()) { + commandMap.entrySet()) { Parameters parameters = commandEntry.getValue().getAnnotation(Parameters.class); assertThat(parameters).isNotNull(); assertThat(parameters.commandDescription()).isNotEmpty(); } } + @SuppressWarnings("unused") + private List> getToolCommandMap() { + return ImmutableList.of( + ImmutableList.of("RegistryTool", RegistryTool.COMMAND_MAP), + ImmutableList.of("DevTool", DevTool.COMMAND_MAP)); + } + /** * Gets the set of all non-abstract classes implementing the {@link Command} interface (abstract * class and interface subtypes of Command aren't expected to have cli commands). Note that this diff --git a/dependencies.gradle b/dependencies.gradle index bd71919cb..0e5d2e05d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -138,6 +138,7 @@ ext { 'org.testcontainers:selenium:1.12.1', 'org.testcontainers:testcontainers:1.12.1', 'org.yaml:snakeyaml:1.17', + 'pl.pragmatists:JUnitParams:1.1.1', 'xerces:xmlParserAPIs:2.6.2', 'xpp3:xpp3:1.1.4c' ] diff --git a/java_common.gradle b/java_common.gradle index 1f19579e9..d81981937 100644 --- a/java_common.gradle +++ b/java_common.gradle @@ -58,10 +58,8 @@ configurations { it.name in ['runtimeClasspath', 'compileClasspath'] }.each { // JUnit is from org.apache.beam:beam-runners-google-cloud-dataflow-java, - // testcontainer (which we use in the nomulus tool), and json-simple. - // We should really be excluding this, however GenerateSqlCommand in - // nomulus-tool currently uses testcontainers which, in turn, needs junit. - //exclude group: 'junit' + // and json-simple. + it.exclude group: 'junit' // Mockito is from org.apache.beam:beam-runners-google-cloud-dataflow-java // See https://issues.apache.org/jira/browse/BEAM-8862 it.exclude group: 'org.mockito', module: 'mockito-core' diff --git a/services/backend/gradle/dependency-locks/compile.lockfile b/services/backend/gradle/dependency-locks/compile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/compile.lockfile +++ b/services/backend/gradle/dependency-locks/compile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/compileClasspath.lockfile b/services/backend/gradle/dependency-locks/compileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/backend/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/compileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/default.lockfile b/services/backend/gradle/dependency-locks/default.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/default.lockfile +++ b/services/backend/gradle/dependency-locks/default.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/runtime.lockfile b/services/backend/gradle/dependency-locks/runtime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/runtime.lockfile +++ b/services/backend/gradle/dependency-locks/runtime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/testCompile.lockfile b/services/backend/gradle/dependency-locks/testCompile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/testCompile.lockfile +++ b/services/backend/gradle/dependency-locks/testCompile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile b/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/testCompileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/testRuntime.lockfile b/services/backend/gradle/dependency-locks/testRuntime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/testRuntime.lockfile +++ b/services/backend/gradle/dependency-locks/testRuntime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/backend/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/compile.lockfile b/services/default/gradle/dependency-locks/compile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/compile.lockfile +++ b/services/default/gradle/dependency-locks/compile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/compileClasspath.lockfile b/services/default/gradle/dependency-locks/compileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/default/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/default/gradle/dependency-locks/compileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/default.lockfile b/services/default/gradle/dependency-locks/default.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/default.lockfile +++ b/services/default/gradle/dependency-locks/default.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/runtime.lockfile b/services/default/gradle/dependency-locks/runtime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/runtime.lockfile +++ b/services/default/gradle/dependency-locks/runtime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/runtimeClasspath.lockfile b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/testCompile.lockfile b/services/default/gradle/dependency-locks/testCompile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/testCompile.lockfile +++ b/services/default/gradle/dependency-locks/testCompile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/testCompileClasspath.lockfile b/services/default/gradle/dependency-locks/testCompileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/default/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/default/gradle/dependency-locks/testCompileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/testRuntime.lockfile b/services/default/gradle/dependency-locks/testRuntime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/testRuntime.lockfile +++ b/services/default/gradle/dependency-locks/testRuntime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/default/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/compile.lockfile b/services/pubapi/gradle/dependency-locks/compile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/compile.lockfile +++ b/services/pubapi/gradle/dependency-locks/compile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile b/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/compileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/default.lockfile b/services/pubapi/gradle/dependency-locks/default.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/default.lockfile +++ b/services/pubapi/gradle/dependency-locks/default.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/runtime.lockfile b/services/pubapi/gradle/dependency-locks/runtime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/runtime.lockfile +++ b/services/pubapi/gradle/dependency-locks/runtime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/testCompile.lockfile b/services/pubapi/gradle/dependency-locks/testCompile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/testCompile.lockfile +++ b/services/pubapi/gradle/dependency-locks/testCompile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile b/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/testCompileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/testRuntime.lockfile b/services/pubapi/gradle/dependency-locks/testRuntime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/testRuntime.lockfile +++ b/services/pubapi/gradle/dependency-locks/testRuntime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/pubapi/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/compile.lockfile b/services/tools/gradle/dependency-locks/compile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/compile.lockfile +++ b/services/tools/gradle/dependency-locks/compile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/compileClasspath.lockfile b/services/tools/gradle/dependency-locks/compileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/tools/gradle/dependency-locks/compileClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/compileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/default.lockfile b/services/tools/gradle/dependency-locks/default.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/default.lockfile +++ b/services/tools/gradle/dependency-locks/default.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/runtime.lockfile b/services/tools/gradle/dependency-locks/runtime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/runtime.lockfile +++ b/services/tools/gradle/dependency-locks/runtime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/testCompile.lockfile b/services/tools/gradle/dependency-locks/testCompile.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/testCompile.lockfile +++ b/services/tools/gradle/dependency-locks/testCompile.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile b/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile index 45a02c0db..eecf6c503 100644 --- a/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/testCompileClasspath.lockfile @@ -175,7 +175,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -205,7 +204,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/testRuntime.lockfile b/services/tools/gradle/dependency-locks/testRuntime.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/testRuntime.lockfile +++ b/services/tools/gradle/dependency-locks/testRuntime.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final diff --git a/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile b/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile index 8cb6f1e39..d3e7ad1c9 100644 --- a/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/services/tools/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -176,7 +176,6 @@ javax.validation:validation-api:1.0.0.GA javax.xml.bind:jaxb-api:2.3.1 jline:jline:1.0 joda-time:joda-time:2.10.3 -junit:junit:4.12 net.bytebuddy:byte-buddy:1.9.11 net.java.dev.jna:jna-platform:5.3.1 net.java.dev.jna:jna:5.3.1 @@ -206,7 +205,6 @@ org.dom4j:dom4j:2.1.1 org.easymock:easymock:3.0 org.glassfish.jaxb:jaxb-runtime:2.3.1 org.glassfish.jaxb:txw2:2.3.1 -org.hamcrest:hamcrest-core:1.3 org.hibernate.common:hibernate-commons-annotations:5.1.0.Final org.hibernate:hibernate-core:5.4.4.Final org.hibernate:hibernate-hikaricp:5.4.4.Final