forked from apache/beam
-
Notifications
You must be signed in to change notification settings - Fork 6
Update li_trunk branch to no longer use internal samza-versions #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * License); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an AS IS BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // Plugins for configuring _this build_ of the module | ||
| plugins { | ||
| `java-gradle-plugin` | ||
| groovy | ||
| id("com.diffplug.spotless") version "5.6.1" | ||
| } | ||
|
|
||
| // Define the set of repositories required to fetch and enable plugins. | ||
| repositories { | ||
| jcenter() | ||
| maven { url = uri("https://plugins.gradle.org/m2/") } | ||
| maven { | ||
| url = uri("https://repo.spring.io/plugins-release/") | ||
| content { includeGroup("io.spring.gradle") } | ||
| } | ||
| } | ||
|
|
||
| // Dependencies on other plugins used when this plugin is invoked | ||
| dependencies { | ||
| compile(gradleApi()) | ||
| compile(localGroovy()) | ||
| compile("com.github.jengelman.gradle.plugins:shadow:6.1.0") | ||
| compile("gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0") | ||
|
|
||
| runtime("net.ltgt.gradle:gradle-apt-plugin:0.21") // Enable a Java annotation processor | ||
| runtime("com.google.protobuf:protobuf-gradle-plugin:0.8.13") // Enable proto code generation | ||
| runtime("io.spring.gradle:propdeps-plugin:0.0.9.RELEASE") // Enable provided and optional configurations | ||
| runtime("com.commercehub.gradle.plugin:gradle-avro-plugin:0.11.0") // Enable Avro code generation | ||
| runtime("com.diffplug.spotless:spotless-plugin-gradle:5.6.1") // Enable a code formatting plugin | ||
| runtime("gradle.plugin.com.github.blindpirate:gogradle:0.11.4") // Enable Go code compilation | ||
| runtime("gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.0") // Enable building Docker containers | ||
| runtime("gradle.plugin.com.dorongold.plugins:task-tree:1.5") // Adds a 'taskTree' task to print task dependency tree | ||
| runtime("com.github.jengelman.gradle.plugins:shadow:6.1.0") // Enable shading Java dependencies | ||
| runtime("ca.coglinc:javacc-gradle-plugin:2.4.0") // Enable the JavaCC parser generator | ||
| runtime("net.linguica.gradle:maven-settings-plugin:0.5") | ||
| runtime("gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.5.0") // Enable creating an offline repository | ||
| runtime("net.ltgt.gradle:gradle-errorprone-plugin:1.2.1") // Enable errorprone Java static analysis | ||
| runtime("org.ajoberstar.grgit:grgit-gradle:4.0.2") // Enable website git publish to asf-site branch | ||
| runtime("com.avast.gradle:gradle-docker-compose-plugin:0.13.2") // Enable docker compose tasks | ||
| runtime("ca.cutterslade.gradle:gradle-dependency-analyze:1.4.3") // Enable dep analysis | ||
| runtime("gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.4.11") // Enable dep vulnerability analysis | ||
| runtime("org.checkerframework:checkerframework-gradle-plugin:0.5.16") // Enable enhanced static checking plugin | ||
| runtime("org.jfrog.buildinfo:build-info-extractor-gradle:4.24.14") // Enable submission to jfrog artifactory | ||
| } | ||
|
|
||
| // Because buildSrc is built and tested automatically _before_ gradle | ||
| // does anything else, it is not possible to spotlessApply because | ||
| // spotlessCheck fails before that. So this hack allows disabling | ||
| // the check for the moment of application. | ||
| // | ||
| // ./gradlew :buildSrc:spotlessApply -PdisableSpotlessCheck=true | ||
| val disableSpotlessCheck: String by project | ||
| val isSpotlessCheckDisabled = project.hasProperty("disableSpotlessCheck") && | ||
| disableSpotlessCheck == "true" | ||
|
|
||
| spotless { | ||
| isEnforceCheck = !isSpotlessCheckDisabled | ||
| groovy { | ||
| excludeJava() | ||
| greclipse().configFile("greclipse.properties") | ||
| } | ||
| groovyGradle { | ||
| greclipse().configFile("greclipse.properties") | ||
| } | ||
| } | ||
|
|
||
| gradlePlugin { | ||
| plugins { | ||
| create("beamModule") { | ||
| id = "org.apache.beam.module" | ||
| implementationClass = "org.apache.beam.gradle.BeamModulePlugin" | ||
| } | ||
| create("vendorJava") { | ||
| id = "org.apache.beam.vendor-java" | ||
| implementationClass = "org.apache.beam.gradle.VendorJavaPlugin" | ||
| } | ||
| create("beamJenkins") { | ||
| id = "org.apache.beam.jenkins" | ||
| implementationClass = "org.apache.beam.gradle.BeamJenkinsPlugin" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,7 +63,6 @@ | |
| import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Sets; | ||
| import org.apache.samza.context.ContainerContext; | ||
| import org.apache.samza.context.JobContext; | ||
| import org.apache.samza.job.model.TaskModel; | ||
| import org.apache.samza.metrics.MetricsRegistry; | ||
| import org.apache.samza.serializers.Serde; | ||
| import org.apache.samza.storage.StorageEngineFactory; | ||
|
|
@@ -200,7 +199,6 @@ public static class TestStorageEngine extends InMemoryKeyValueStorageEngineFacto | |
| @Override | ||
| public KeyValueStore<byte[], byte[]> getKVStore( | ||
| String storeName, | ||
| TaskModel taskModel, | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We won't need this if we are on Samza 1.6
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is only available in samza 1.7 which is not yet released |
||
| File storeDir, | ||
| MetricsRegistry registry, | ||
| SystemStreamPartition changeLogSystemStreamPartition, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC, we need to update
runners/samza/job-server/build.gradleas wellThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also remove there as well, thanks for the reminder