Skip to content
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-77] Directory reorganization #72

Merged
merged 9 commits into from
Mar 24, 2016
Merged

[BEAM-77] Directory reorganization #72

merged 9 commits into from
Mar 24, 2016

Conversation

davorbonaci
Copy link
Member

This pull requests reorganizes directory structure. This is the first step towards the organization proposed in the document shared a few weeks ago.

We'll try to merge this quickly to limit complicated merges. This shouldn't prevent feedback -- please keep it coming -- we'll just address such feedback in a follow-up commit.

This is the first step only, and there are many things that are incomplete:

  • Some READMEs may now become out-of-date.
  • We need a few more aggregator pom.xml files; they are not added yet.

There's nothing in this pull request that renames Dataflow to Beam; it just moves files around without changing the content.

Aside: asfgit is very slow; the pull request pulls in a few commits merged into Apache repository that the GitHub mirror hasn't picked up yet. This should be properly rebased prior to merge.

R: @dhalperi; everyone else very welcome.

jbonofre and others added 9 commits March 23, 2016 15:46
Move Java SDK from "sdk/" into "sdks/java/core".
Move Java SDK-specific Javadoc information from "javadoc/" into "sdks/java/javadoc".
Move Java examples from "examples/" into "examples/java".
Move Java 8 examples from "java8examples/" into "examples/java8/".
Move Java 8-specific tests from "java8tests" into "sdks/java/java8tests/".
Move Java-specific archetypes from "maven-archetypes/" into "sdks/java/maven-archetypes/".
@kennknowles
Copy link
Member

Note on your aside: you will not need to rebase. The commits d510b4e, 8bce693, and 9f8dd18 will simply be added to GitHub and the master pointer updated. Then it will automatically look like the PR you intend.

@kennknowles
Copy link
Member

Also, performing an "offline" review of the new changes and pushing is perfectly safe. I found it easiest to read the changes via git diff --stat apache/master github/pr/72.

LGTM, though the Jenkins failure looks like it might be a real breakage of some sort.

@dhalperi
Copy link
Contributor

The changes LGTM.

Travis passes fully, but Jenkins fails only on the archetypes. I spent an hour trying to fix, but was not successful, and it looks like the cause may be related to the -incubating suffix and artifact resolution that was discussed ad nauseum on the list.

I think that in the interest of getting the big move in we should go ahead and merge, and fixup the Jenkins archetype issue as we go. It may require updating the version of Maven in Jenkins.

@dhalperi
Copy link
Contributor

asfgit is still slow, but this has been merged.

Travis is still useful as a signal of build success, and jenkins results should be manually inspected.

@dhalperi
Copy link
Contributor

And I've filed https://issues.apache.org/jira/browse/BEAM-148 for the Jenkins test issue.

@davorbonaci
Copy link
Member Author

Thanks @dhalperi and @kennknowles.

@asfgit asfgit merged commit 257a7a6 into apache:master Mar 24, 2016
asfgit pushed a commit that referenced this pull request Mar 24, 2016
@mxm
Copy link
Contributor

mxm commented Mar 24, 2016

LGTM from the Flink side.

@dhalperi dhalperi mentioned this pull request Apr 7, 2016
8 tasks
iemejia referenced this pull request in iemejia/beam Jan 12, 2018
ryucc pushed a commit to ryucc/beam that referenced this pull request Feb 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants