Repository: incubator-beam Updated Branches: refs/heads/master 731c03036 -> 6c338da0d
[BEAM-254] Add apache-rat-plugin execution and fix files with missing license header Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/e26cf308 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/e26cf308 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/e26cf308 Branch: refs/heads/master Commit: e26cf308ec5c83e1238645379526ebef288f1fec Parents: 731c030 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri May 6 09:05:00 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue May 31 19:19:11 2016 +0200 ---------------------------------------------------------------------- .github/PULL_REQUEST_TEMPLATE.md | 19 +++++++++ .travis.yml | 17 ++++++++ README.md | 19 +++++++++ examples/java/README.md | 19 +++++++++ .../org/apache/beam/examples/complete/README.md | 18 +++++++++ .../org/apache/beam/examples/cookbook/README.md | 18 +++++++++ .../beam/examples/complete/game/README.md | 18 +++++++++ pom.xml | 42 ++++++++++++++++++++ runners/flink/README.md | 19 +++++++++ runners/spark/README.md | 19 +++++++++ .../src/main/resources/beam/checkstyle.xml | 15 ------- .../src/main/resources/beam/header-file.txt | 17 -------- sdks/java/core/src/main/proto/README.md | 23 ++++++++++- .../org/apache/beam/sdk/sdk.properties | 19 ++++++++- sdks/java/extensions/join-library/README.md | 29 +++++++++++--- sdks/java/io/hdfs/README.md | 19 +++++++++ sdks/java/javadoc/README.md | 19 +++++++++ sdks/java/javadoc/overview.html | 26 +++++++++--- .../META-INF/maven/archetype-metadata.xml | 16 ++++++++ .../projects/basic/archetype.properties | 16 ++++++++ .../META-INF/maven/archetype-metadata.xml | 16 ++++++++ .../main/resources/archetype-resources/pom.xml | 17 ++++++++ .../projects/basic/archetype.properties | 16 ++++++++ .../resources/projects/basic/reference/pom.xml | 17 ++++++++ travis/README.md | 19 +++++++++ travis/test_wordcount.sh | 16 ++++++++ 26 files changed, 463 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/.github/PULL_REQUEST_TEMPLATE.md ---------------------------------------------------------------------- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b17f620..7db5d32 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + Be sure to do all of the following to help us incorporate your contribution quickly and easily: http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 8aad36e..ddf3204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,20 @@ +# +# 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. +# + language: java sudo: false http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 4419464..fa00e82 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + # Apache Beam [Apache Beam](http://beam.incubator.apache.org) is a unified model for defining both batch and streaming data-parallel processing pipelines, as well as a set of language-specific SDKs for constructing pipelines and Runners for executing them on distributed processing backends like [Apache Spark](http://spark.apache.org/), [Apache Flink](http://flink.apache.org), and [Google Cloud Dataflow](http://cloud.google.com/dataflow). http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/examples/java/README.md ---------------------------------------------------------------------- diff --git a/examples/java/README.md b/examples/java/README.md index 4533303..4694103 100644 --- a/examples/java/README.md +++ b/examples/java/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + # Example Pipelines The examples included in this module serve to demonstrate the basic http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/examples/java/src/main/java/org/apache/beam/examples/complete/README.md ---------------------------------------------------------------------- diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/README.md b/examples/java/src/main/java/org/apache/beam/examples/complete/README.md index 5fba154..99c93ef 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/complete/README.md +++ b/examples/java/src/main/java/org/apache/beam/examples/complete/README.md @@ -1,3 +1,21 @@ +<!-- + 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. +--> # "Complete" Examples http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/examples/java/src/main/java/org/apache/beam/examples/cookbook/README.md ---------------------------------------------------------------------- diff --git a/examples/java/src/main/java/org/apache/beam/examples/cookbook/README.md b/examples/java/src/main/java/org/apache/beam/examples/cookbook/README.md index 99f3080..77b72f3 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/cookbook/README.md +++ b/examples/java/src/main/java/org/apache/beam/examples/cookbook/README.md @@ -1,3 +1,21 @@ +<!-- + 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. +--> # "Cookbook" Examples http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/examples/java8/src/main/java/org/apache/beam/examples/complete/game/README.md ---------------------------------------------------------------------- diff --git a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/README.md b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/README.md index 79b55ce..25e31f5 100644 --- a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/README.md +++ b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/README.md @@ -1,3 +1,21 @@ +<!-- + 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. +--> # 'Gaming' examples http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index edddc8f..2a47265 100644 --- a/pom.xml +++ b/pom.xml @@ -219,8 +219,49 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.11</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile> + <excludeSubProjects>false</excludeSubProjects> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <!-- Keep exclude sync with .gitignore --> + <exclude>**/target/**/*</exclude> + <exclude>**/dependency-reduced-pom.xml</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/package-list</exclude> + <exclude>**/user.avsc</exclude> + <exclude>**/test/resources/**/*.txt</exclude> + <exclude>**/test/**/.placeholder</exclude> + <exclude>.repository/**/*</exclude> + </excludes> + </configuration> + </plugin> </plugins> </pluginManagement> + + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + </plugin> + </plugins> </build> </profile> @@ -233,6 +274,7 @@ <dataflow.javadoc_opts>-Xdoclint:-missing</dataflow.javadoc_opts> </properties> </profile> + </profiles> <dependencyManagement> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/runners/flink/README.md ---------------------------------------------------------------------- diff --git a/runners/flink/README.md b/runners/flink/README.md index 457e2a6..8256c04 100644 --- a/runners/flink/README.md +++ b/runners/flink/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + Flink Beam Runner (Flink-Runner) ------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/runners/spark/README.md ---------------------------------------------------------------------- diff --git a/runners/spark/README.md b/runners/spark/README.md index 5b2e732..457f0a9 100644 --- a/runners/spark/README.md +++ b/runners/spark/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + Spark Beam Runner (Spark-Runner) ================================ http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml ---------------------------------------------------------------------- diff --git a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml index 44897d3..311f599 100644 --- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml +++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml @@ -25,21 +25,6 @@ page at http://checkstyle.sourceforge.net/config.html --> <module name="Checker"> - <!-- Requires the Apache copyright header in each file. - Code intended to be open-sourced may have a multi-line copyright - notice, so that this required text appears on the second line: - <pre> - /* - * Licensed to the Apache Software Foundation (ASF) under one - * ... - </pre> - See http://checkstyle.sf.net/config_header.html --> - <module name="Header"> - <property name="headerFile" value="${checkstyle.header.file}"/> - <property name="ignoreLines" value="2"/> - <property name="fileExtensions" value="java, scala"/> - </module> - <module name="FileTabCharacter"> <!-- Checks that there are no tab characters in the file. --> </module> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/build-tools/src/main/resources/beam/header-file.txt ---------------------------------------------------------------------- diff --git a/sdks/java/build-tools/src/main/resources/beam/header-file.txt b/sdks/java/build-tools/src/main/resources/beam/header-file.txt deleted file mode 100644 index d551913..0000000 --- a/sdks/java/build-tools/src/main/resources/beam/header-file.txt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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. - */ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/core/src/main/proto/README.md ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/proto/README.md b/sdks/java/core/src/main/proto/README.md index fa4e925..858441b 100644 --- a/sdks/java/core/src/main/proto/README.md +++ b/sdks/java/core/src/main/proto/README.md @@ -1,8 +1,29 @@ -## Protocol Buffers in Google Cloud Dataflow +<!-- + 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. +--> This directory contains the Protocol Buffer messages used in Google Cloud Dataflow. +## Protocol Buffers in Apache Beam + +This directory contains the Protocol Buffer messages used in Apache Beam. + They aren't, however, used during the Maven build process, and are included here for completeness only. Instead, the following artifact on Maven Central contains the binary version of the generated code from these Protocol Buffers: http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties b/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties index 5b0a720..21e314d 100644 --- a/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties +++ b/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties @@ -1,4 +1,21 @@ -# SDK source version. +# +# 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. +# +# SDK source version + version=${pom.version} build.date=${timestamp} http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/extensions/join-library/README.md ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/join-library/README.md b/sdks/java/extensions/join-library/README.md index 8e2a011..fe8466a 100644 --- a/sdks/java/extensions/join-library/README.md +++ b/sdks/java/extensions/join-library/README.md @@ -1,12 +1,31 @@ +<!-- + 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. +--> + Join-library ============ Join-library provides inner join, outer left and right join functions to -Google Cloud Dataflow. The aim is to simplify the most common cases of join to a +Apache Beam. The aim is to simplify the most common cases of join to a simple function call. The functions are generic so it supports join of any types supported by -Dataflow. Input to the join functions are PCollections of Key/Values. Both the +Beam. Input to the join functions are PCollections of Key/Values. Both the left and right PCollections need the same type for the key. All the join functions return a Key/Value where Key is the join key and value is a Key/Value where the key is the left value and right is the value. @@ -25,9 +44,9 @@ Example how to use join-library: Join-library can be found on maven-central: <dependency> - <groupId>org.linuxalert.dataflow</groupId> - <artifactId>google-cloud-dataflow-java-contrib-joinlibrary</artifactId> - <version>0.0.3</version> + <groupId>org.apache.beam</groupId> + <artifactId>join-library</artifactId> + <version>0.1-incubating-SNAPSHOT</version> </dependency> Questions or comments: `M.Runesson [at] gmail [dot] com` http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/io/hdfs/README.md ---------------------------------------------------------------------- diff --git a/sdks/java/io/hdfs/README.md b/sdks/java/io/hdfs/README.md index 7149cda..1c6134f 100644 --- a/sdks/java/io/hdfs/README.md +++ b/sdks/java/io/hdfs/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + # HDFS IO This library provides HDFS sources and sinks to make it possible to read and http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/javadoc/README.md ---------------------------------------------------------------------- diff --git a/sdks/java/javadoc/README.md b/sdks/java/javadoc/README.md index 8240d3c..bb17c3f 100644 --- a/sdks/java/javadoc/README.md +++ b/sdks/java/javadoc/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + # SDK Javadoc This directory contains package-info files for external javadoc we would like http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/sdks/java/javadoc/overview.html b/sdks/java/javadoc/overview.html index 0c9bd17..511eeb4 100644 --- a/sdks/java/javadoc/overview.html +++ b/sdks/java/javadoc/overview.html @@ -1,20 +1,34 @@ +<!-- + 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. +--> <!DOCTYPE html> <html> <head> - <title>Google Cloud Dataflow Java SDK</title> + <title>Apache Beam Java SDK</title> </head> <body> - <p>The Google Cloud Dataflow SDK for Java provides a simple and elegant + <p>The Apache Beam SDK for Java provides a simple and elegant programming model to express your data processing pipelines; see <a href="https://cloud.google.com/dataflow/";>our product page</a> for more information and getting started instructions.</p> - <p>The easiest way to use the Google Cloud Dataflow SDK for Java is via + <p>The easiest way to use the Apache Beam SDK for Java is via one of the released artifacts from the - <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.cloud.dataflow%22";> + <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.beam%22";> Maven Central Repository</a>. - See our <a href="https://cloud.google.com/dataflow/release-notes/java";> - release notes</a> for more information about each released version.<p> <p>Version numbers use the form <i>major</i>.<i>minor</i>.<i>incremental</i> and are incremented as follows:<p> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml index 7742af4..a130b65 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; name="Google Cloud Dataflow Example Pipelines Archetype" http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties index c59e77a..35eb1b3 100644 --- a/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties +++ b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,19 @@ +# +# 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. +# package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml b/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml index bf75798..46c21c3 100644 --- a/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; name="Google Cloud Dataflow Starter Pipeline Archetype" http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml index 19e7d2d..b3cf4b5 100644 --- a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml @@ -1,3 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties index c59e77a..35eb1b3 100644 --- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties +++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties @@ -1,3 +1,19 @@ +# +# 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. +# package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml index d29424a..c9217c9 100644 --- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml @@ -1,3 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/travis/README.md ---------------------------------------------------------------------- diff --git a/travis/README.md b/travis/README.md index f7d8999..e0c13f2 100644 --- a/travis/README.md +++ b/travis/README.md @@ -1,3 +1,22 @@ +<!-- + 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. +--> + # Travis Scripts This directory contains scripts used for [Travis CI](https://travis-ci.org/GoogleCloudPlatform/DataflowJavaSDK) http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e26cf308/travis/test_wordcount.sh ---------------------------------------------------------------------- diff --git a/travis/test_wordcount.sh b/travis/test_wordcount.sh index 89657a9..3efd37c 100755 --- a/travis/test_wordcount.sh +++ b/travis/test_wordcount.sh @@ -1,4 +1,20 @@ #!/bin/bash +# +# 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. +# # This script runs WordCount example locally in a few different ways. # Specifically, all combinations of:
