You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/03/24 00:36:21 UTC
[1/3] incubator-beam git commit: BEAM-78 - Rename,
polish and update pom.xml
Repository: incubator-beam
Updated Branches:
refs/heads/master 9247ad78d -> 9f8dd182c
BEAM-78 - Rename, polish and update pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/d510b4e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/d510b4e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/d510b4e0
Branch: refs/heads/master
Commit: d510b4e09ed6fc57bd491a7f2bf586b14a4bfe8c
Parents: 9247ad7
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Mar 21 15:21:08 2016 +0100
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Mar 23 15:46:30 2016 -0700
----------------------------------------------------------------------
examples/pom.xml | 60 +++++-----
java8examples/pom.xml | 59 +++++-----
java8tests/pom.xml | 55 +++++-----
maven-archetypes/examples/pom.xml | 48 ++++----
.../main/resources/archetype-resources/pom.xml | 6 +-
maven-archetypes/pom.xml | 41 +++++++
maven-archetypes/starter/pom.xml | 49 +++++----
.../main/resources/archetype-resources/pom.xml | 6 +-
.../resources/projects/basic/reference/pom.xml | 6 +-
pom.xml | 109 ++++++++++++-------
runners/flink/examples/pom.xml | 52 ++++-----
runners/flink/pom.xml | 55 ++++------
runners/flink/runner/pom.xml | 57 ++++------
runners/pom.xml | 45 ++++----
runners/spark/pom.xml | 101 ++++-------------
sdk/pom.xml | 51 ++++-----
16 files changed, 397 insertions(+), 403 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index ea44b01..8b17dfe 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
- <name>Google Cloud Dataflow Java Examples - All</name>
- <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
- interface for processing virtually any size data using Google cloud
- resources. This artifact includes all Dataflow Java SDK
- examples.</description>
- <url>http://cloud.google.com/dataflow</url>
+ <artifactId>java-examples-all</artifactId>
+ <name>Apache Beam :: Examples :: Java All</name>
+ <description>Apache Beam SDK provides a simple, Java-based
+ interface for processing virtually any size data. This
+ artifact includes all Apache Beam Java SDK examples.</description>
<packaging>jar</packaging>
@@ -112,8 +112,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <windowtitle>Google Cloud Dataflow Examples</windowtitle>
- <doctitle>Google Cloud Dataflow Examples</doctitle>
+ <windowtitle>Apache Beam Examples</windowtitle>
+ <doctitle>Apache Beam Examples</doctitle>
<subpackages>com.google.cloud.dataflow.examples</subpackages>
<additionalparam>-exclude com.google.cloud.dataflow.sdk.runners.worker:com.google.cloud.dataflow.sdk.runners.dataflow:com.google.cloud.dataflow.sdk.util ${dataflow.javadoc_opts}</additionalparam>
@@ -237,8 +237,8 @@
<dependencies>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/java8examples/pom.xml
----------------------------------------------------------------------
diff --git a/java8examples/pom.xml b/java8examples/pom.xml
index 60d7e0f..eb3ef01 100644
--- a/java8examples/pom.xml
+++ b/java8examples/pom.xml
@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-java8examples-all</artifactId>
- <name>Google Cloud Dataflow Java 8 Examples - All</name>
- <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
- interface for processing virtually any size data using Google cloud
- resources. This artifact includes examples of the SDK from a Java 8
+ <artifactId>java8examples-all</artifactId>
+ <name>Apache Beam :: Examples :: Java 8 All</name>
+ <description>Apache Beam Java SDK provides a simple, Java-based
+ interface for processing virtually any size data.
+ This artifact includes examples of the SDK from a Java 8
user.</description>
- <url>http://cloud.google.com/dataflow</url>
<packaging>jar</packaging>
@@ -151,14 +152,14 @@
<dependencies>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-examples-all</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/java8tests/pom.xml
----------------------------------------------------------------------
diff --git a/java8tests/pom.xml b/java8tests/pom.xml
index de44ed4..1d253dc 100644
--- a/java8tests/pom.xml
+++ b/java8tests/pom.xml
@@ -1,38 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-java8tests-all</artifactId>
- <name>Google Cloud Dataflow Java 8 Tests - All</name>
- <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
- interface for processing virtually any size data using Google cloud
- resources. This artifact includes tests of the SDK from a Java 8
+ <artifactId>java8tests-all</artifactId>
+ <name>Apache Beam :: Tests :: Java 8 All</name>
+ <description>Apache Beam Java SDK provides a simple, Java-based
+ interface for processing virtually any size data.
+ This artifact includes tests of the SDK from a Java 8
user.</description>
- <url>http://cloud.google.com/dataflow</url>
<packaging>jar</packaging>
@@ -149,8 +150,8 @@
<dependencies>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/maven-archetypes/examples/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/examples/pom.xml b/maven-archetypes/examples/pom.xml
index 4e99908..7e74b9d 100644
--- a/maven-archetypes/examples/pom.xml
+++ b/maven-archetypes/examples/pom.xml
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>maven-archetypes-parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-archetypes-examples</artifactId>
- <name>Google Cloud Dataflow Java SDK - Examples Archetype</name>
+ <artifactId>maven-archetypes-examples</artifactId>
+ <name>Apache Beam :: Maven Archetypes :: Examples</name>
<description>A Maven Archetype to create a project containing all the
- example pipelines from the Google Cloud Dataflow Java SDK.</description>
- <url>http://cloud.google.com/dataflow</url>
+ example pipelines from the Apache Beam Java SDK.</description>
<packaging>maven-archetype</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index bffa376..a1ef779 100644
--- a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -92,9 +92,9 @@
<dependencies>
<!-- Adds a dependency on a specific version of the Dataflow SDK. -->
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
- <version>[1.0.0, 2.0.0)</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
+ <version>[0, 2)</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/pom.xml b/maven-archetypes/pom.xml
new file mode 100644
index 0000000..4565253
--- /dev/null
+++ b/maven-archetypes/pom.xml
@@ -0,0 +1,41 @@
+<?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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>maven-archetypes-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Apache Beam :: Maven Archetypes</name>
+
+ <modules>
+ <module>starter</module>
+ <module>examples</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/maven-archetypes/starter/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/starter/pom.xml b/maven-archetypes/starter/pom.xml
index 0aa71c4..933e8b1 100644
--- a/maven-archetypes/starter/pom.xml
+++ b/maven-archetypes/starter/pom.xml
@@ -1,37 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>maven-archetypes-parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-archetypes-starter</artifactId>
- <name>Google Cloud Dataflow Java SDK - Starter Archetype</name>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>maven-archetypes-starter</artifactId>
+ <name>Apache Beam :: Maven Archetypes :: Starter</name>
<description>A Maven archetype to create a simple starter pipeline to
- get started using the Google Cloud Dataflow Java SDK. </description>
- <url>http://cloud.google.com/dataflow</url>
+ get started using the Apache Beam Java SDK. </description>
<packaging>maven-archetype</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
index bb679a0..385ddc8 100644
--- a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
@@ -23,9 +23,9 @@
<dependencies>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
- <version>[1.0.0, 2.0.0)</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
+ <version>[0, 2)</version>
</dependency>
<!-- slf4j API frontend binding with JUL backend -->
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
index d8c563d..2b28b9d 100644
--- a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
+++ b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
@@ -23,9 +23,9 @@
<dependencies>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
- <version>[1.0.0, 2.0.0)</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
+ <version>[0, 2)</version>
</dependency>
<!-- slf4j API frontend binding with JUL backend -->
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da4c24f..b8944d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,41 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google</groupId>
- <artifactId>google</artifactId>
- <version>5</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>17</version>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <name>Google Cloud Dataflow Java SDK - Parent</name>
- <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
- interface for processing virtually any size data using Google cloud
- resources. This artifact includes the parent POM for other Dataflow
- artifacts.</description>
- <url>http://cloud.google.com/dataflow</url>
- <inceptionYear>2013</inceptionYear>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <name>Apache Beam :: Parent</name>
+ <description>Apache Beam provides a simple, Java-based interface
+ for processing virtually any size data. This artifact includes the parent POM
+ for other Beam artifacts.</description>
+ <url>http://beam.incubator.apache.org</url>
+ <inceptionYear>2016</inceptionYear>
- <version>1.6.0-SNAPSHOT</version>
+ <version>0.1.0-incubating-SNAPSHOT</version>
<licenses>
<license>
@@ -45,19 +46,51 @@
</license>
</licenses>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-beam.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-beam.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf?p=incubator-beam.git;a=summary</url>
+ </scm>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/BEAM</url>
+ </issueManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>Beam Dev</name>
+ <subscribe>dev-subscribe@beam.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@beam.incubator.apache.org</unsubscribe>
+ <post>dev@beam.incubator.apache.org</post>
+ <archive>http://www.mail-archive.com/dev%beam.incubator.apache.org</archive>
+ </mailingList>
+ <mailingList>
+ <name>Beam User</name>
+ <subscribe>user-subscribe@beam.incubator.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@beam.incubator.apache.org</unsubscribe>
+ <post>user@beam.incubator.apache.org</post>
+ <archive>http://www.mail-archive.com/user%beam.incubator.apache.org</archive>
+ </mailingList>
+ <mailingList>
+ <name>Beam Commits</name>
+ <subscribe>commits-subscribe@beam.incubator.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@beam.incubator.apache.org</unsubscribe>
+ <post>commits@beam.incubator.apache.org</post>
+ <archive>http://www.mail-archive.com/commits%beam.incubator.apache.org</archive>
+ </mailingList>
+ </mailingLists>
+
<developers>
<developer>
- <organization>Google Inc.</organization>
- <organizationUrl>http://www.google.com</organizationUrl>
+ <name>The Apache Beam Team</name>
+ <email>dev@beam.incubator.apache.org</email>
+ <url>http://beam.incubator.apache.org</url>
+ <organization>Apache Software Foundation</organization>
+ <organizationUrl>http://www.apache.org</organizationUrl>
</developer>
</developers>
- <scm>
- <connection>scm:git:git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git</connection>
- <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git</developerConnection>
- <url>git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git</url>
- </scm>
-
<prerequisites>
<maven>3.0.3</maven>
</prerequisites>
@@ -90,12 +123,12 @@
</properties>
<packaging>pom</packaging>
+
<modules>
<module>sdk</module>
<module>runners</module>
<module>examples</module>
- <module>maven-archetypes/starter</module>
- <module>maven-archetypes/examples</module>
+ <module>maven-archetypes</module>
</modules>
<profiles>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/runners/flink/examples/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml
index 91cc1b7..1c0a4dd 100644
--- a/runners/flink/examples/pom.xml
+++ b/runners/flink/examples/pom.xml
@@ -1,48 +1,38 @@
<?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.
+ 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>flink-runner-parent</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-runner-examples_2.10</artifactId>
- <version>0.4-SNAPSHOT</version>
- <name>Flink Beam Runner Examples</name>
- <packaging>jar</packaging>
-
- <inceptionYear>2015</inceptionYear>
+ <name>Apache Beam :: Runners :: Flink :: Examples</name>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <packaging>jar</packaging>
<properties>
<!-- Default parameters for mvn exec:exec -->
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 31713cd..608dc7c 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -1,59 +1,50 @@
<?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.
+ 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>runners-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-runner-parent</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.1.0-incubating-SNAPSHOT</version>
- <name>Flink Beam Runner</name>
- <packaging>pom</packaging>
+ <name>Apache Beam :: Runners :: Flink</name>
- <inceptionYear>2015</inceptionYear>
+ <packaging>pom</packaging>
<modules>
<module>runner</module>
<module>examples</module>
</modules>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<flink.version>1.0.0</flink.version>
- <beam.version>1.6.0-SNAPSHOT</beam.version>
+ <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/runners/flink/runner/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml
index ff4b368..109eb25 100644
--- a/runners/flink/runner/pom.xml
+++ b/runners/flink/runner/pom.xml
@@ -1,48 +1,39 @@
<?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
+ 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
+ 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.
+ 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>flink-runner-parent</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>flink-runner_2.10</artifactId>
- <version>0.4-SNAPSHOT</version>
- <name>Flink Beam Runner Core</name>
- <packaging>jar</packaging>
+ <name>Apache Beam :: Runners :: Flink :: Core</name>
- <inceptionYear>2015</inceptionYear>
+ <packaging>jar</packaging>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<dependencies>
<!-- Flink dependencies -->
@@ -72,10 +63,10 @@
<artifactId>flink-avro_2.10</artifactId>
<version>${flink.version}</version>
</dependency>
- <!--- Dataflow -->
+ <!--- Beam -->
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
<version>${beam.version}</version>
<exclusions>
<exclusion>
@@ -86,8 +77,8 @@
</dependency>
<!-- Test scoped -->
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-examples-all</artifactId>
<version>${beam.version}</version>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/runners/pom.xml
----------------------------------------------------------------------
diff --git a/runners/pom.xml b/runners/pom.xml
index b2e9eb1..fc379ce 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -1,40 +1,37 @@
<?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.
+ 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.beam</groupId>
<artifactId>runners-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Beam Runners</name>
+ <name>Apache Beam :: Runners</name>
<modules>
<module>flink</module>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 9d653a0..05a601a 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -1,63 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (c) 2014, Cloudera, Inc. All Rights Reserved.
-Cloudera, Inc. 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
-This software 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.
+ 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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>runners-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>0.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>spark-runner</artifactId>
- <version>0.4.3-SNAPSHOT</version>
- <name>Spark Beam Runner</name>
+ <name>Apache Beam :: Runners :: Spark</name>
<packaging>jar</packaging>
- <inceptionYear>2014</inceptionYear>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.7</java.version>
<spark.version>1.5.2</spark.version>
- <beam.version>1.6.0-SNAPSHOT</beam.version>
+ <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
</properties>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -89,8 +71,8 @@ License.
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-sdk-all</artifactId>
<version>${beam.version}</version>
<exclusions>
<!-- Use Hadoop/Spark's backend logger -->
@@ -101,8 +83,8 @@ License.
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>java-examples-all</artifactId>
<version>${beam.version}</version>
<exclusions>
<!-- Use Hadoop/Spark's backend logger -->
@@ -411,43 +393,8 @@ License.
</plugins>
</reporting>
-
- <developers>
- <developer>
- <name>Cloudera, Inc.</name>
- </developer>
- </developers>
-
- <scm>
- <connection>scm:git:https://github.com/cloudera/spark-dataflow.git</connection>
- <developerConnection>scm:git:https://github.com/cloudera/spark-dataflow.git</developerConnection>
- <url>scm:git:https://github.com/cloudera/spark-dataflow.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <prerequisites>
- <maven>3.2.1</maven>
- </prerequisites>
-
<profiles>
<profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>jacoco</id>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d510b4e0/sdk/pom.xml
----------------------------------------------------------------------
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 185abc2..13fe950 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -1,37 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Copyright (C) 2015 Google Inc.
- ~
- ~ Licensed 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.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+ 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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>com.google.cloud.dataflow</groupId>
- <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
- <name>Google Cloud Dataflow Java SDK - All</name>
- <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
- interface for processing virtually any size data using Google cloud
- resources. This artifact includes entire Dataflow Java SDK.</description>
- <url>http://cloud.google.com/dataflow</url>
+ <artifactId>java-sdk-all</artifactId>
+ <name>Apache Beam :: SDK :: Java All</name>
+ <description>Beam SDK Java All provides a simple, Java-based
+ interface for processing virtually any size data. This
+ artifact includes entire Apache Beam Java SDK.</description>
<packaging>jar</packaging>
[3/3] incubator-beam git commit: This closes #46
Posted by da...@apache.org.
This closes #46
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/9f8dd182
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/9f8dd182
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/9f8dd182
Branch: refs/heads/master
Commit: 9f8dd182c0e3517f248e876c6465c5240dbf0308
Parents: 9247ad7 8bce693
Author: Davor Bonaci <da...@google.com>
Authored: Wed Mar 23 16:35:38 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Mar 23 16:35:38 2016 -0700
----------------------------------------------------------------------
examples/pom.xml | 60 +++++-----
java8examples/pom.xml | 59 +++++-----
java8tests/pom.xml | 55 +++++-----
maven-archetypes/examples/pom.xml | 48 ++++----
.../main/resources/archetype-resources/pom.xml | 6 +-
maven-archetypes/pom.xml | 41 +++++++
maven-archetypes/starter/pom.xml | 49 +++++----
.../main/resources/archetype-resources/pom.xml | 6 +-
.../resources/projects/basic/reference/pom.xml | 6 +-
pom.xml | 109 ++++++++++++-------
runners/flink/examples/pom.xml | 52 ++++-----
runners/flink/pom.xml | 55 ++++------
runners/flink/runner/pom.xml | 57 ++++------
runners/pom.xml | 45 ++++----
runners/spark/pom.xml | 101 ++++-------------
sdk/pom.xml | 51 ++++-----
16 files changed, 397 insertions(+), 403 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-beam git commit: Fix up build
Posted by da...@apache.org.
Fix up build
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8bce6931
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8bce6931
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8bce6931
Branch: refs/heads/master
Commit: 8bce69316e623112c19bffb6a899a73467128492
Parents: d510b4e
Author: Davor Bonaci <da...@google.com>
Authored: Wed Mar 23 16:14:49 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Mar 23 16:33:54 2016 -0700
----------------------------------------------------------------------
.../examples/src/main/resources/archetype-resources/pom.xml | 2 +-
.../starter/src/main/resources/archetype-resources/pom.xml | 2 +-
.../starter/src/test/resources/projects/basic/reference/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8bce6931/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index a1ef779..d19d0c6 100644
--- a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>java-sdk-all</artifactId>
- <version>[0, 2)</version>
+ <version>[0-incubating, 2-incubating)</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8bce6931/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
index 385ddc8..19e7d2d 100644
--- a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>java-sdk-all</artifactId>
- <version>[0, 2)</version>
+ <version>[0-incubating, 1-incubating)</version>
</dependency>
<!-- slf4j API frontend binding with JUL backend -->
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8bce6931/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
index 2b28b9d..d29424a 100644
--- a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
+++ b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>java-sdk-all</artifactId>
- <version>[0, 2)</version>
+ <version>[0-incubating, 1-incubating)</version>
</dependency>
<!-- slf4j API frontend binding with JUL backend -->