Repository: beam Updated Branches: refs/heads/master 4bce39225 -> 25f6358d6
[BEAM-2179] Archetype generate-sources.sh cleanup the existing sources before rsync Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/67831c39 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/67831c39 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/67831c39 Branch: refs/heads/master Commit: 67831c39c38a5f040d3c5f21dfbb4be34c88be09 Parents: 4bce392 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri May 5 18:00:30 2017 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu May 11 21:29:36 2017 +0200 ---------------------------------------------------------------------- .../maven-archetypes/examples-java8/generate-sources.sh | 12 +++++++----- sdks/java/maven-archetypes/examples/generate-sources.sh | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/67831c39/sdks/java/maven-archetypes/examples-java8/generate-sources.sh ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples-java8/generate-sources.sh b/sdks/java/maven-archetypes/examples-java8/generate-sources.sh index 7b85e85..58c5f22 100755 --- a/sdks/java/maven-archetypes/examples-java8/generate-sources.sh +++ b/sdks/java/maven-archetypes/examples-java8/generate-sources.sh @@ -31,19 +31,21 @@ JAVA8_EXAMPLES_ROOT="${HERE}/../../../../examples/java8" # The root of the examples archetype ARCHETYPE_ROOT="${HERE}/src/main/resources/archetype-resources" -mkdir -p "$ARCHETYPE_ROOT/src/main/java" -mkdir -p "$ARCHETYPE_ROOT/src/test/java" +mkdir -p "${ARCHETYPE_ROOT}/src/main/java" +mkdir -p "${ARCHETYPE_ROOT}/src/test/java" # # Copy the Java 7 subset of the examples project verbatim. # rsync -a --exclude cookbook --exclude complete \ "${EXAMPLES_ROOT}"/src/main/java/org/apache/beam/examples/ \ - "${ARCHETYPE_ROOT}/src/main/java" + "${ARCHETYPE_ROOT}/src/main/java" \ + --delete rsync -a --exclude cookbook --exclude complete --exclude '*IT.java' \ - "${EXAMPLES_ROOT}"/src/test/java/org/apache/beam/examples/ \ - "${ARCHETYPE_ROOT}/src/test/java" + "${EXAMPLES_ROOT}"/src/test/java/org/apache/beam/examples/ \ + "${ARCHETYPE_ROOT}/src/test/java" \ + --delete # # Copy in MinimalWordCountJava8 and mobile gaming example http://git-wip-us.apache.org/repos/asf/beam/blob/67831c39/sdks/java/maven-archetypes/examples/generate-sources.sh ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/generate-sources.sh b/sdks/java/maven-archetypes/examples/generate-sources.sh index b1a86a7..d9109ac 100755 --- a/sdks/java/maven-archetypes/examples/generate-sources.sh +++ b/sdks/java/maven-archetypes/examples/generate-sources.sh @@ -37,11 +37,13 @@ mkdir -p "${ARCHETYPE_ROOT}/src/test/java" # rsync -a --exclude cookbook --exclude complete \ "${EXAMPLES_ROOT}"/src/main/java/org/apache/beam/examples/ \ - "${ARCHETYPE_ROOT}/src/main/java" + "${ARCHETYPE_ROOT}/src/main/java" \ + --delete rsync -a --exclude cookbook --exclude complete --exclude '*IT.java' \ - "${EXAMPLES_ROOT}"/src/test/java/org/apache/beam/examples/ \ - "${ARCHETYPE_ROOT}/src/test/java" + "${EXAMPLES_ROOT}"/src/test/java/org/apache/beam/examples/ \ + "${ARCHETYPE_ROOT}/src/test/java" \ + --delete # # Replace 'package org.apache.beam.examples' with 'package ${package}' in all Java code
