Skip to content

Commit

Permalink
Fix artifacts publishing (apache#6)
Browse files Browse the repository at this point in the history
* Pin scalatra dependency, remove non required subprojects, stop publishing checksum files

* Include test dependencies
  • Loading branch information
dxichen committed Sep 10, 2021
1 parent 3286f52 commit fbc0a7f
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 60 deletions.
Expand Up @@ -363,7 +363,7 @@ class BeamModulePlugin implements Plugin<Project> {

// Automatically use the official release version if we are performing a release
// otherwise append '-SNAPSHOT'
project.version = '2.28.0.1'
project.version = '2.28.0.2'
if (!isRelease(project)) {
project.version += '-SNAPSHOT'
}
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Expand Up @@ -24,6 +24,9 @@ offlineRepositoryRoot=offline-repository
signing.gnupg.executable=gpg
signing.gnupg.useLegacyGpg=true

# Disable checksum SHA256 and SHA512 checksums upload for LI artifactory
systemProp.org.gradle.internal.publish.checksums.insecure=true

version=2.28.0-SNAPSHOT
sdk_version=2.28.0.dev

Expand Down
2 changes: 2 additions & 0 deletions runners/samza/build.gradle
Expand Up @@ -73,7 +73,9 @@ dependencies {
compile "org.apache.samza:samza-kv_2.11:$samza_version"
compile "org.apache.samza:samza-kv-rocksdb_2.11:$samza_version"
compile "org.apache.samza:samza-kv-inmemory_2.11:$samza_version"
// Pin scalatra version to avoid samza-yarn transitively pulling in an unsafe version
compile "org.scalatra:scalatra_2.11:2.7.1"
compile "org.scalatra:scalatra-scalate_2.11:2.7.1"
compile "org.apache.samza:samza-yarn_2.11:$samza_version"
runtimeOnly "org.apache.kafka:kafka-clients:2.0.1"
compile library.java.vendored_grpc_1_26_0
Expand Down
118 changes: 59 additions & 59 deletions settings.gradle
Expand Up @@ -60,34 +60,34 @@ include ":runners:core-java"
include ":runners:direct-java"
include ":runners:extensions-java:metrics"
/* Begin Flink Runner related settings */
// Flink 1.8
include ":runners:flink:1.8"
include ":runners:flink:1.8:job-server"
include ":runners:flink:1.8:job-server-container"
// Flink 1.9
include ":runners:flink:1.9"
include ":runners:flink:1.9:job-server"
include ":runners:flink:1.9:job-server-container"
// Flink 1.10
//// Flink 1.8
//include ":runners:flink:1.8"
//include ":runners:flink:1.8:job-server"
//include ":runners:flink:1.8:job-server-container"
//// Flink 1.9
//include ":runners:flink:1.9"
//include ":runners:flink:1.9:job-server"
//include ":runners:flink:1.9:job-server-container"
//// Flink 1.10
include ":runners:flink:1.10"
include ":runners:flink:1.10:job-server"
include ":runners:flink:1.10:job-server-container"
// Flink 1.11
include ":runners:flink:1.11"
include ":runners:flink:1.11:job-server"
include ":runners:flink:1.11:job-server-container"
// Flink 1.12
include ":runners:flink:1.12"
include ":runners:flink:1.12:job-server"
include ":runners:flink:1.12:job-server-container"
//// Flink 1.11
//include ":runners:flink:1.11"
//include ":runners:flink:1.11:job-server"
//include ":runners:flink:1.11:job-server-container"
//// Flink 1.12
//include ":runners:flink:1.12"
//include ":runners:flink:1.12:job-server"
//include ":runners:flink:1.12:job-server-container"
/* End Flink Runner related settings */
include ":runners:twister2"
//include ":runners:twister2"
include ":runners:google-cloud-dataflow-java"
include ":runners:google-cloud-dataflow-java:examples"
include ":runners:google-cloud-dataflow-java:examples-streaming"
include ":runners:java-fn-execution"
include ":runners:java-job-service"
include ":runners:jet"
//include ":runners:jet"
include ":runners:local-java"
include ":runners:portability:java"
include ":runners:spark"
Expand All @@ -96,83 +96,83 @@ include ":runners:spark:job-server:container"
include ":runners:samza"
include ":runners:samza:job-server"
include ":sdks:go"
include ":sdks:go:container"
include ":sdks:go:examples"
include ":sdks:go:test"
include ":sdks:go:test:load"
//include ":sdks:go:container"
//include ":sdks:go:examples"
//include ":sdks:go:test"
//include ":sdks:go:test:load"
include ":sdks:java:bom"
include ":sdks:java:build-tools"
include ":sdks:java:container"
include ":sdks:java:container:java8"
include ":sdks:java:container:java11"
include ":sdks:java:core"
include ":sdks:java:expansion-service"
include ":sdks:java:extensions:euphoria"
include ":sdks:java:extensions:kryo"
//include ":sdks:java:extensions:euphoria"
//include ":sdks:java:extensions:kryo"
include ":sdks:java:extensions:google-cloud-platform-core"
include ":sdks:java:extensions:jackson"
//include ":sdks:java:extensions:jackson"
include ":sdks:java:extensions:join-library"
include ":sdks:java:extensions:ml"
include ":sdks:java:extensions:protobuf"
include ":sdks:java:extensions:schemaio-expansion-service"
include ":sdks:java:extensions:sketching"
//include ":sdks:java:extensions:schemaio-expansion-service"
//include ":sdks:java:extensions:sketching"
include ":sdks:java:extensions:sorter"
include ":sdks:java:extensions:sql"
include ":sdks:java:extensions:sql:perf-tests"
include ":sdks:java:extensions:sql:jdbc"
include ":sdks:java:extensions:sql:shell"
include ":sdks:java:extensions:sql:hcatalog"
//include ":sdks:java:extensions:sql:hcatalog"
include ":sdks:java:extensions:sql:datacatalog"
include ":sdks:java:extensions:sql:zetasql"
include ":sdks:java:extensions:sql:expansion-service"
include ":sdks:java:extensions:sql:udf"
include ":sdks:java:extensions:zetasketch"
include ":sdks:java:fn-execution"
include ":sdks:java:harness"
include ":sdks:java:io:amazon-web-services"
include ":sdks:java:io:amazon-web-services2"
include ":sdks:java:io:amqp"
include ":sdks:java:io:azure"
include ":sdks:java:io:cassandra"
include ":sdks:java:io:clickhouse"
//include ":sdks:java:io:amazon-web-services"
//include ":sdks:java:io:amazon-web-services2"
//include ":sdks:java:io:amqp"
//include ":sdks:java:io:azure"
//include ":sdks:java:io:cassandra"
//include ":sdks:java:io:clickhouse"
include ":sdks:java:io:common"
include ":sdks:java:io:contextualtextio"
include ":sdks:java:io:elasticsearch"
include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-2"
include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-5"
include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-6"
include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-7"
include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-common"
include ":sdks:java:io:expansion-service"
//include ":sdks:java:io:contextualtextio"
//include ":sdks:java:io:elasticsearch"
//include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-2"
//include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-5"
//include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-6"
//include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-7"
//include ":sdks:java:io:elasticsearch-tests:elasticsearch-tests-common"
//include ":sdks:java:io:expansion-service"
include ":sdks:java:io:file-based-io-tests"
include ':sdks:java:io:bigquery-io-perf-tests'
include ":sdks:java:io:google-cloud-platform"
include ":sdks:java:io:google-cloud-platform:expansion-service"
include ":sdks:java:io:hadoop-common"
include ":sdks:java:io:hadoop-file-system"
include ":sdks:java:io:hadoop-format"
include ":sdks:java:io:hbase"
include ":sdks:java:io:hcatalog"
//include ":sdks:java:io:hbase"
//include ":sdks:java:io:hcatalog"
include ":sdks:java:io:jdbc"
include ":sdks:java:io:jms"
//include ":sdks:java:io:jms"
include ":sdks:java:io:kafka"
include ":sdks:java:io:kinesis"
include ":sdks:java:io:kinesis:expansion-service"
include ":sdks:java:io:kudu"
//include ":sdks:java:io:kinesis:expansion-service"
//include ":sdks:java:io:kudu"
include ":sdks:java:io:mongodb"
include ":sdks:java:io:mqtt"
//include ":sdks:java:io:mqtt"
include ":sdks:java:io:parquet"
include ":sdks:java:io:rabbitmq"
include ":sdks:java:io:redis"
include ":sdks:java:io:solr"
include ":sdks:java:io:snowflake"
include ":sdks:java:io:snowflake:expansion-service"
include ":sdks:java:io:splunk"
include ":sdks:java:io:thrift"
include ":sdks:java:io:tika"
include ":sdks:java:io:xml"
//include ":sdks:java:io:rabbitmq"
//include ":sdks:java:io:redis"
//include ":sdks:java:io:solr"
//include ":sdks:java:io:snowflake"
//include ":sdks:java:io:snowflake:expansion-service"
//include ":sdks:java:io:splunk"
//include ":sdks:java:io:thrift"
//include ":sdks:java:io:tika"
//include ":sdks:java:io:xml"
include ":sdks:java:io:synthetic"
include ":sdks:java:io:influxdb"
//include ":sdks:java:io:influxdb"
include ":sdks:java:javadoc"
include ":sdks:java:maven-archetypes:examples"
include ":sdks:java:maven-archetypes:starter"
Expand Down

0 comments on commit fbc0a7f

Please sign in to comment.