diff --git a/gradle/build.gradle b/gradle/build.gradle index 977ce12f6..9c8b11b2c 100644 --- a/gradle/build.gradle +++ b/gradle/build.gradle @@ -18,168 +18,12 @@ allprojects { dirs "${rootDir}/../third_party/objectify/v4_1" } } -} -subprojects { subproject -> + // Single version across all projects for now. version = '1.0' + // Java plugin: apply plugin: 'java' - apply plugin: 'java-library' - - // Relevant canned dependency labels: - // - implementation: Dependencies to be included in release distribution. - // - compileOnly: Dependencies used at compile time only for production code. They will not be - // included in release. - // - testImplementation: Dependencies needed for testing only. - dependencies { - implementation 'com.beust:jcommander:1.48' - implementation 'com.fasterxml.jackson.core:jackson-core:2.8.5' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.8.0' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.8.5' - implementation 'com.google.api-client:google-api-client:1.22.0' - implementation 'com.google.api-client:google-api-client-appengine:1.22.0' - implementation 'com.google.api-client:google-api-client-jackson2:1.20.0' - implementation 'com.google.monitoring-client:metrics:1.0.4' - implementation 'com.google.monitoring-client:stackdriver:1.0.4' - implementation 'com.google.api-client:google-api-client-java6:1.20.0' - implementation 'com.google.api-client:google-api-client-servlet:1.22.0' - implementation 'com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0' - implementation 'com.google.apis:google-api-services-bigquery:v2-rev325-1.22.0' - implementation 'com.google.apis:google-api-services-clouddebugger:v2-rev8-1.22.0' - implementation 'com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0' - implementation 'com.google.apis:google-api-services-cloudresourcemanager:v1-rev6-1.22.0' - implementation 'com.google.apis:google-api-services-dataflow:v1b3-rev196-1.22.0' - implementation 'com.google.apis:google-api-services-dns:v2beta1-rev6-1.22.0' - implementation 'com.google.apis:google-api-services-drive:v2-rev160-1.19.1' - implementation 'com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0' - implementation 'com.google.apis:google-api-services-monitoring:v3-rev11-1.22.0' - implementation 'com.google.apis:google-api-services-sheets:v4-rev483-1.22.0' - implementation 'com.google.apis:google-api-services-storage:v1-rev86-1.22.0' - // TODO(b/71631624): change appengine:appengine-api-1.0-sdk to testCompileOnly after - // BillingEmailUtilsTest.java is fixed. - implementation 'com.google.appengine:appengine-api-1.0-sdk:1.9.48' - implementation 'com.google.appengine:appengine-api-labs:1.9.48' - implementation 'com.google.appengine:appengine-api-stubs:1.9.48' - implementation 'com.google.appengine.tools:appengine-gcs-client:0.6' - implementation 'com.google.appengine.tools:appengine-mapreduce:0.8.5' - implementation 'com.google.appengine.tools:appengine-pipeline:0.2.13' - implementation 'com.google.appengine:appengine-tools-sdk:1.9.48' - implementation 'com.google.auth:google-auth-library-credentials:0.7.1' - implementation 'com.google.auth:google-auth-library-oauth2-http:0.7.1' - implementation 'com.google.auto:auto-common:0.8' - implementation 'com.google.auto.factory:auto-factory:1.0-beta3' - implementation 'com.google.auto.value:auto-value-annotations:1.6.2' - implementation 'com.google.cloud.bigdataoss:gcsio:1.4.5' - implementation 'com.google.cloud.bigdataoss:util:1.4.5' - implementation 'com.google.code.findbugs:jsr305:3.0.2' - implementation 'com.google.dagger:dagger:2.15' - implementation 'com.google.dagger:dagger-producers:2.15' - implementation 'com.google.errorprone:error_prone_annotations:2.1.3' - implementation 'com.google.errorprone:javac-shaded:9-dev-r4023-3' - implementation 'com.google.flogger:flogger:0.1' - implementation 'com.google.flogger:flogger-system-backend:0.1' - implementation 'com.google.gdata:core:1.47.1' - implementation 'com.google.googlejavaformat:google-java-format:1.4' - implementation 'com.google.guava:guava:25.1-jre' - implementation 'com.google.http-client:google-http-client:1.22.0' - implementation 'com.google.http-client:google-http-client-appengine:1.22.0' - implementation 'com.google.http-client:google-http-client-jackson2:1.22.0' - implementation 'com.google.oauth-client:google-oauth-client:1.22.0' - implementation 'com.google.oauth-client:google-oauth-client-appengine:1.22.0' - implementation 'com.google.oauth-client:google-oauth-client-java6:1.22.0' - implementation 'com.google.oauth-client:google-oauth-client-jetty:1.22.0' - implementation 'com.google.oauth-client:google-oauth-client-servlet:1.22.0' - implementation 'com.google.protobuf:protobuf-java:2.6.0' - implementation 'com.google.re2j:re2j:1.1' - implementation 'com.google.template:soy:2018-03-14' - implementation 'com.googlecode.charts4j:charts4j:1.3' - implementation 'com.googlecode.json-simple:json-simple:1.1.1' - implementation 'com.ibm.icu:icu4j:57.1' - implementation 'com.jcraft:jsch:0.1.53' - implementation 'com.jcraft:jzlib:1.1.3' - implementation 'com.squareup:javapoet:1.8.0' - implementation 'com.squareup:javawriter:2.5.1' - implementation 'com.sun.activation:javax.activation:1.2.0' - implementation 'com.thoughtworks.paranamer:paranamer:2.7' - implementation 'commons-codec:commons-codec:1.6' - implementation 'commons-logging:commons-logging:1.1.1' - implementation 'dnsjava:dnsjava:2.1.7' - implementation 'io.netty:netty-buffer:4.1.28.Final' - implementation 'io.netty:netty-codec:4.1.28.Final' - implementation 'io.netty:netty-codec-http:4.1.28.Final' - implementation 'io.netty:netty-common:4.1.28.Final' - implementation 'io.netty:netty-handler:4.1.28.Final' - implementation 'io.netty:netty-resolver:4.1.28.Final' - implementation 'io.netty:netty-tcnative:2.0.12.Final' - implementation 'io.netty:netty-tcnative-boringssl-static:2.0.12.Final' - implementation 'io.netty:netty-transport:4.1.28.Final' - implementation 'it.unimi.dsi:fastutil:6.5.16' - implementation 'javax.annotation:jsr250-api:1.0' - implementation 'javax.inject:javax.inject:1' - implementation 'javax.mail:mail:1.4' - implementation 'javax.servlet:servlet-api:2.5' - implementation 'javax.xml.bind:jaxb-api:2.3.0' - implementation 'javax.xml.soap:javax.xml.soap-api:1.4.0' - implementation 'jline:jline:1.0' - implementation 'joda-time:joda-time:2.3' - implementation 'org.apache.avro:avro:1.8.2' - implementation 'org.apache.beam:beam-runners-direct-java:2.2.0' - implementation 'org.apache.beam:beam-runners-google-cloud-dataflow-java:2.1.0' - implementation 'org.apache.beam:beam-sdks-common-runner-api:2.1.0' - implementation 'org.apache.beam:beam-sdks-java-core:2.2.0' - implementation 'org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.1.0' - implementation 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0' - implementation 'org.apache.commons:commons-compress:1.8.1' - implementation 'org.apache.ftpserver:ftpserver-core:1.0.6' - implementation 'org.apache.httpcomponents:httpclient:4.5.2' - implementation 'org.apache.httpcomponents:httpcore:4.4.4' - implementation 'org.apache.mina:mina-core:2.0.4' - implementation 'org.apache.sshd:sshd-core:2.0.0' - implementation 'org.apache.sshd:sshd-scp:2.0.0' - implementation 'org.apache.sshd:sshd-sftp:2.0.0' - implementation 'org.apache.tomcat:servlet-api:6.0.45' - implementation 'org.apache.tomcat:tomcat-annotations-api:8.0.5' - implementation 'org.bouncycastle:bcpg-jdk15on:1.52' - implementation 'org.bouncycastle:bcpkix-jdk15on:1.52' - implementation 'org.bouncycastle:bcprov-jdk15on:1.52' - implementation 'org.codehaus.jackson:jackson-core-asl:1.9.13' - implementation 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' - implementation 'org.joda:joda-money:0.10.0' - implementation 'org.json:json:20160810' - implementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1' - implementation 'org.mortbay.jetty:jetty:6.1.26' - implementation 'org.mortbay.jetty:servlet-api:2.5-20081211' - implementation 'org.mortbay.jetty:jetty-util:6.1.26' - implementation 'org.slf4j:slf4j-api:1.7.16' - implementation 'org.tukaani:xz:1.5' - implementation 'org.xerial.snappy:snappy-java:1.1.4-M3' - implementation 'org.yaml:snakeyaml:1.17' - implementation 'xerces:xmlParserAPIs:2.6.2' - implementation 'xpp3:xpp3:1.1.4c' - // Custom-built objectify jar at commit ecd5165, included in Nomulus release. - implementation name: 'objectify-4.1.3' - - compileOnly 'com.google.appengine:appengine-remote-api:1.9.48' // Also testImplementation - compileOnly 'com.google.auto.service:auto-service:1.0-rc4' - compileOnly 'org.osgi:org.osgi.core:4.3.0' - - annotationProcessor 'com.google.auto.value:auto-value:1.6.2' - testAnnotationProcessor 'com.google.auto.value:auto-value:1.6.2' - annotationProcessor 'com.google.dagger:dagger-compiler:2.15' - testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.15' - - testImplementation 'com.google.appengine:appengine-remote-api:1.9.48' // Also compileOnly - testImplementation 'com.google.appengine:appengine-testing:1.9.58' - testImplementation 'com.google.guava:guava-testlib:25.0-jre' - testImplementation 'com.google.monitoring-client:contrib:1.0.4' - testImplementation 'com.google.truth:truth:0.42' - testImplementation 'com.google.truth.extensions:truth-java8-extension:0.39' - testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'org.hamcrest:hamcrest-core:1.3' - testImplementation 'org.hamcrest:hamcrest-library:1.3' - testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-all:1.9.5' - testImplementation 'org.slf4j:slf4j-simple:1.7.16' // Not needed by Bazel - } } + diff --git a/gradle/core/build.gradle b/gradle/core/build.gradle index 494c52384..7a62e7728 100644 --- a/gradle/core/build.gradle +++ b/gradle/core/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'java-library' +} + def javaDir = "${rootDir}/../java" def javatestsDir = "${rootDir}/../javatests" @@ -40,7 +44,162 @@ configurations { soy } + +// Relevant canned dependency labels: +// - implementation: Dependencies to be included in release distribution. +// - compileOnly: Dependencies used at compile time only for production code. They will not be +// included in release. +// - testImplementation: Dependencies needed for testing only. dependencies { + implementation 'com.beust:jcommander:1.48' + implementation 'com.fasterxml.jackson.core:jackson-core:2.8.5' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.8.0' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.8.5' + implementation 'com.google.api-client:google-api-client:1.22.0' + implementation 'com.google.api-client:google-api-client-appengine:1.22.0' + implementation 'com.google.api-client:google-api-client-jackson2:1.20.0' + implementation 'com.google.monitoring-client:metrics:1.0.4' + implementation 'com.google.monitoring-client:stackdriver:1.0.4' + implementation 'com.google.api-client:google-api-client-java6:1.20.0' + implementation 'com.google.api-client:google-api-client-servlet:1.22.0' + implementation 'com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0' + implementation 'com.google.apis:google-api-services-bigquery:v2-rev325-1.22.0' + implementation 'com.google.apis:google-api-services-clouddebugger:v2-rev8-1.22.0' + implementation 'com.google.apis:google-api-services-cloudkms:v1-rev12-1.22.0' + implementation 'com.google.apis:google-api-services-cloudresourcemanager:v1-rev6-1.22.0' + implementation 'com.google.apis:google-api-services-dataflow:v1b3-rev196-1.22.0' + implementation 'com.google.apis:google-api-services-dns:v2beta1-rev6-1.22.0' + implementation 'com.google.apis:google-api-services-drive:v2-rev160-1.19.1' + implementation 'com.google.apis:google-api-services-groupssettings:v1-rev60-1.22.0' + implementation 'com.google.apis:google-api-services-monitoring:v3-rev11-1.22.0' + implementation 'com.google.apis:google-api-services-sheets:v4-rev483-1.22.0' + implementation 'com.google.apis:google-api-services-storage:v1-rev86-1.22.0' + // TODO(b/71631624): change appengine:appengine-api-1.0-sdk to testCompileOnly after + // BillingEmailUtilsTest.java is fixed. + implementation 'com.google.appengine:appengine-api-1.0-sdk:1.9.48' + implementation 'com.google.appengine:appengine-api-labs:1.9.48' + implementation 'com.google.appengine:appengine-api-stubs:1.9.48' + implementation 'com.google.appengine.tools:appengine-gcs-client:0.6' + implementation 'com.google.appengine.tools:appengine-mapreduce:0.8.5' + implementation 'com.google.appengine.tools:appengine-pipeline:0.2.13' + implementation 'com.google.appengine:appengine-tools-sdk:1.9.48' + implementation 'com.google.auth:google-auth-library-credentials:0.7.1' + implementation 'com.google.auth:google-auth-library-oauth2-http:0.7.1' + implementation 'com.google.auto:auto-common:0.8' + implementation 'com.google.auto.factory:auto-factory:1.0-beta3' + implementation 'com.google.auto.value:auto-value-annotations:1.6.2' + implementation 'com.google.cloud.bigdataoss:gcsio:1.4.5' + implementation 'com.google.cloud.bigdataoss:util:1.4.5' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation 'com.google.dagger:dagger:2.15' + implementation 'com.google.dagger:dagger-producers:2.15' + implementation 'com.google.errorprone:error_prone_annotations:2.1.3' + implementation 'com.google.errorprone:javac-shaded:9-dev-r4023-3' + implementation 'com.google.flogger:flogger:0.1' + implementation 'com.google.flogger:flogger-system-backend:0.1' + implementation 'com.google.gdata:core:1.47.1' + implementation 'com.google.googlejavaformat:google-java-format:1.4' + implementation 'com.google.guava:guava:25.1-jre' + implementation 'com.google.http-client:google-http-client:1.22.0' + implementation 'com.google.http-client:google-http-client-appengine:1.22.0' + implementation 'com.google.http-client:google-http-client-jackson2:1.22.0' + implementation 'com.google.oauth-client:google-oauth-client:1.22.0' + implementation 'com.google.oauth-client:google-oauth-client-appengine:1.22.0' + implementation 'com.google.oauth-client:google-oauth-client-java6:1.22.0' + implementation 'com.google.oauth-client:google-oauth-client-jetty:1.22.0' + implementation 'com.google.oauth-client:google-oauth-client-servlet:1.22.0' + implementation 'com.google.protobuf:protobuf-java:2.6.0' + implementation 'com.google.re2j:re2j:1.1' + implementation 'com.google.template:soy:2018-03-14' + implementation 'com.googlecode.charts4j:charts4j:1.3' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'com.ibm.icu:icu4j:57.1' + implementation 'com.jcraft:jsch:0.1.53' + implementation 'com.jcraft:jzlib:1.1.3' + implementation 'com.squareup:javapoet:1.8.0' + implementation 'com.squareup:javawriter:2.5.1' + implementation 'com.sun.activation:javax.activation:1.2.0' + implementation 'com.thoughtworks.paranamer:paranamer:2.7' + implementation 'commons-codec:commons-codec:1.6' + implementation 'commons-logging:commons-logging:1.1.1' + implementation 'dnsjava:dnsjava:2.1.7' + implementation 'io.netty:netty-buffer:4.1.28.Final' + implementation 'io.netty:netty-codec:4.1.28.Final' + implementation 'io.netty:netty-codec-http:4.1.28.Final' + implementation 'io.netty:netty-common:4.1.28.Final' + implementation 'io.netty:netty-handler:4.1.28.Final' + implementation 'io.netty:netty-resolver:4.1.28.Final' + implementation 'io.netty:netty-tcnative:2.0.12.Final' + implementation 'io.netty:netty-tcnative-boringssl-static:2.0.12.Final' + implementation 'io.netty:netty-transport:4.1.28.Final' + implementation 'it.unimi.dsi:fastutil:6.5.16' + implementation 'javax.annotation:jsr250-api:1.0' + implementation 'javax.inject:javax.inject:1' + implementation 'javax.mail:mail:1.4' + implementation 'javax.servlet:servlet-api:2.5' + implementation 'javax.xml.bind:jaxb-api:2.3.0' + implementation 'javax.xml.soap:javax.xml.soap-api:1.4.0' + implementation 'jline:jline:1.0' + implementation 'joda-time:joda-time:2.3' + implementation 'org.apache.avro:avro:1.8.2' + implementation 'org.apache.beam:beam-runners-direct-java:2.2.0' + implementation 'org.apache.beam:beam-runners-google-cloud-dataflow-java:2.1.0' + implementation 'org.apache.beam:beam-sdks-common-runner-api:2.1.0' + implementation 'org.apache.beam:beam-sdks-java-core:2.2.0' + implementation 'org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.1.0' + implementation 'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0' + implementation 'org.apache.commons:commons-compress:1.8.1' + implementation 'org.apache.ftpserver:ftpserver-core:1.0.6' + implementation 'org.apache.httpcomponents:httpclient:4.5.2' + implementation 'org.apache.httpcomponents:httpcore:4.4.4' + implementation 'org.apache.mina:mina-core:2.0.4' + implementation 'org.apache.sshd:sshd-core:2.0.0' + implementation 'org.apache.sshd:sshd-scp:2.0.0' + implementation 'org.apache.sshd:sshd-sftp:2.0.0' + implementation 'org.apache.tomcat:servlet-api:6.0.45' + implementation 'org.apache.tomcat:tomcat-annotations-api:8.0.5' + implementation 'org.bouncycastle:bcpg-jdk15on:1.52' + implementation 'org.bouncycastle:bcpkix-jdk15on:1.52' + implementation 'org.bouncycastle:bcprov-jdk15on:1.52' + implementation 'org.codehaus.jackson:jackson-core-asl:1.9.13' + implementation 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' + implementation 'org.joda:joda-money:0.10.0' + implementation 'org.json:json:20160810' + implementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1' + implementation 'org.mortbay.jetty:jetty:6.1.26' + implementation 'org.mortbay.jetty:servlet-api:2.5-20081211' + implementation 'org.mortbay.jetty:jetty-util:6.1.26' + implementation 'org.slf4j:slf4j-api:1.7.16' + implementation 'org.tukaani:xz:1.5' + implementation 'org.xerial.snappy:snappy-java:1.1.4-M3' + implementation 'org.yaml:snakeyaml:1.17' + implementation 'xerces:xmlParserAPIs:2.6.2' + implementation 'xpp3:xpp3:1.1.4c' + // Custom-built objectify jar at commit ecd5165, included in Nomulus release. + implementation name: 'objectify-4.1.3' + + compileOnly 'com.google.appengine:appengine-remote-api:1.9.48' // Also testImplementation + compileOnly 'com.google.auto.service:auto-service:1.0-rc4' + compileOnly 'org.osgi:org.osgi.core:4.3.0' + + annotationProcessor 'com.google.auto.value:auto-value:1.6.2' + testAnnotationProcessor 'com.google.auto.value:auto-value:1.6.2' + annotationProcessor 'com.google.dagger:dagger-compiler:2.15' + testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.15' + + testImplementation 'com.google.appengine:appengine-remote-api:1.9.48' // Also compileOnly + testImplementation 'com.google.appengine:appengine-testing:1.9.58' + testImplementation 'com.google.guava:guava-testlib:25.0-jre' + testImplementation 'com.google.monitoring-client:contrib:1.0.4' + testImplementation 'com.google.truth:truth:0.42' + testImplementation 'com.google.truth.extensions:truth-java8-extension:0.39' + testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.hamcrest:hamcrest-core:1.3' + testImplementation 'org.hamcrest:hamcrest-library:1.3' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-all:1.9.5' + testImplementation 'org.slf4j:slf4j-simple:1.7.16' // Not needed by Bazel + testImplementation project(':third_party') // Dependencies needed for jaxb compilation. diff --git a/gradle/third_party/build.gradle b/gradle/third_party/build.gradle index ef278e9c7..acaf8c817 100644 --- a/gradle/third_party/build.gradle +++ b/gradle/third_party/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'java-library' +} + sourceSets { main { java {