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
[BEAM-78] Rename com.google.cloud.dataflow to org.apache.beam #176
Conversation
Move files, instead of remove & add. |
Applied this script: mkdir -p $1/org/apache/beam; git mv $1/com/google/cloud/dataflow/* $1/org/apache; rmdir -p $1/com/google/cloud/dataflow; To these directories: - sdks/java/core/src/{main,test} - sdks/java/java8tests/src/test - runners/google-cloud-dataflow-java/src/{main,test} - contrib/{join-library,hadoop}/src/{main,test} - examples/java{,8}/src/{main,test}
Performed using the following script find . -iname "*.java" -exec sed -i -e \ "s/package com.google.cloud.dataflow/package org.apache.beam/" {} +
Performed using the following command: find . -iname "*.java" -exec sed -i -e \ "s/com.google.cloud.dataflow/org.apache.beam/" {} + Revert changes to imports of proto2 coders (deployed to maven)
aa4adc3
to
d07d775
Compare
Done. This required rebuilding the entire PR -- Git doesn't have a notion of "move". It detects this within each commit. Since the commit has so many files modified, it bypasses the "detect moves in files with N% changed". I had to restructure it as a commit that moves everything without changing contents (so it can detect diffs by just looking at the MD5 hashes) and then a series of commits to fix the build. Important note: When merging, we cannot squash any changes into the commit that does the moves. Any modified files will not be recorded as moves. |
R: @lukecwik |
When merging, note that each of the fixup! commits can be squashed, but contains a description of the changes that needed to be performed (and/or scripts used) to make edits. It may be worth preserving those for historical purposes. |
A few minor comments:
All this is minor and can be addressed later. Merge in progress. |
Explicitly track the Source a ReadEvaluator is using
…tations [euphoria-core] add API audience annotations to core
Please approve this CL. It will be submitted automatically, and its GitHub pull request will be marked as merged. Imported from GitHub PR apache#176 This PR adds Kafka to PubSub Flex template. Copybara import of the project: - 7aceebf9219d17becb789b6ccff647ee6ded6420 Implemented Kafka to Pub/Sub template by Artur Khanin <artur.khanin@akvelon.com> COPYBARA_INTEGRATE_REVIEW=GoogleCloudPlatform/DataflowTemplates#176 from akvelon:KafkaToPubsubTemplate 7aceebf9219d17becb789b6ccff647ee6ded6420 PiperOrigin-RevId: 343484865
PiperOrigin-RevId: 343754906
Please approve this CL. It will be submitted automatically, and its GitHub pull request will be marked as merged. Imported from GitHub PR apache#176 This PR adds Kafka to PubSub Flex template. PiperOrigin-RevId: 345486564
Co-authored-by: Tres Seaver <tseaver@palladion.com>
Be sure to do all of the following to help us incorporate your contribution
quickly and easily:
[BEAM-<Jira issue #>] Description of pull request
mvn clean verify
. (Even better, enableTravis-CI on your fork and ensure the whole test matrix passes).
<Jira issue #>
in the title with the actual Jira issuenumber, if there is one.
Individual Contributor License Agreement.
Note that this doesn't rename everything possible. Follow-up work that remains includes at least:
README.md
sProtoCoder
tests to use them.