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/30 22:06:14 UTC
[1/2] incubator-beam git commit: [BEAM-77] Using wrap modules for
sdks and examples
Repository: incubator-beam
Updated Branches:
refs/heads/master 17863c851 -> 636ad413a
[BEAM-77] Using wrap modules for sdks and examples
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/c6c28365
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/c6c28365
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/c6c28365
Branch: refs/heads/master
Commit: c6c283653ffa5c1c696a234a87bfcefc47a23cf7
Parents: 17863c8
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Mar 30 00:23:10 2016 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Mar 30 17:10:51 2016 +0200
----------------------------------------------------------------------
examples/pom.xml | 53 +++++++++++++++++++++++
pom.xml | 23 +---------
runners/pom.xml | 1 +
sdks/java/core/pom.xml | 6 +--
sdks/java/java8tests/pom.xml | 6 +--
sdks/java/maven-archetypes/examples/pom.xml | 2 +-
sdks/java/maven-archetypes/pom.xml | 6 +--
sdks/java/maven-archetypes/starter/pom.xml | 2 +-
sdks/java/pom.xml | 54 ++++++++++++++++++++++++
sdks/pom.xml | 41 ++++++++++++++++++
10 files changed, 162 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
new file mode 100644
index 0000000..26b6720
--- /dev/null
+++ b/examples/pom.xml
@@ -0,0 +1,53 @@
+<?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>examples-parent</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Beam :: Examples</name>
+
+ <modules>
+ <module>java</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <modules>
+ <module>java8</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b79ddf6..3cae1a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,32 +125,13 @@
<packaging>pom</packaging>
<modules>
- <module>sdks/java/core</module>
+ <module>sdks</module>
<module>runners</module>
- <module>examples/java</module>
- <module>sdks/java/maven-archetypes</module>
+ <module>examples</module>
</modules>
<profiles>
<profile>
- <id>java8-tests</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <modules>
- <module>sdks/java/java8tests</module>
- </modules>
- </profile>
- <profile>
- <id>java8-examples</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <modules>
- <module>examples/java8</module>
- </modules>
- </profile>
- <profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/runners/pom.xml
----------------------------------------------------------------------
diff --git a/runners/pom.xml b/runners/pom.xml
index fc379ce..cba25a3 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -25,6 +25,7 @@
<groupId>org.apache.beam</groupId>
<artifactId>parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>runners-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/java/core/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index 2b9e4a9..f788c0d 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.beam</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>java-sdk-parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>java-sdk-all</artifactId>
- <name>Apache Beam :: SDK :: Java All</name>
+ <name>Apache Beam :: SDKs :: Java :: Core</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>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/java/java8tests/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml
index 0338702..61e4785 100644
--- a/sdks/java/java8tests/pom.xml
+++ b/sdks/java/java8tests/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.beam</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>java-sdk-parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>java8tests-all</artifactId>
- <name>Apache Beam :: Tests :: Java 8 All</name>
+ <name>Apache Beam :: SDKs :: Java :: Tests</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
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/java/maven-archetypes/examples/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml
index 7e74b9d..3b513da 100644
--- a/sdks/java/maven-archetypes/examples/pom.xml
+++ b/sdks/java/maven-archetypes/examples/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>maven-archetypes-examples</artifactId>
- <name>Apache Beam :: Maven Archetypes :: Examples</name>
+ <name>Apache Beam :: SDKs :: Java :: Maven Archetypes :: Examples</name>
<description>A Maven Archetype to create a project containing all the
example pipelines from the Apache Beam Java SDK.</description>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/java/maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
index 59efe50..5ca091c 100644
--- a/sdks/java/maven-archetypes/pom.xml
+++ b/sdks/java/maven-archetypes/pom.xml
@@ -23,15 +23,15 @@
<parent>
<groupId>org.apache.beam</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>java-sdk-parent</artifactId>
<version>0.1.0-incubating-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>maven-archetypes-parent</artifactId>
<packaging>pom</packaging>
- <name>Apache Beam :: Maven Archetypes</name>
+ <name>Apache Beam :: SDKs :: Java :: Maven Archetypes</name>
<modules>
<module>starter</module>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/java/maven-archetypes/starter/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml
index 933e8b1..2c7b6b9 100644
--- a/sdks/java/maven-archetypes/starter/pom.xml
+++ b/sdks/java/maven-archetypes/starter/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.beam</groupId>
<artifactId>maven-archetypes-starter</artifactId>
- <name>Apache Beam :: Maven Archetypes :: Starter</name>
+ <name>Apache Beam :: SDKs :: Java :: Maven Archetypes :: Starter</name>
<description>A Maven archetype to create a simple starter pipeline to
get started using the Apache Beam Java SDK. </description>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
new file mode 100644
index 0000000..03c462b
--- /dev/null
+++ b/sdks/java/pom.xml
@@ -0,0 +1,54 @@
+<?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>sdks-parent</artifactId>
+ <version>0.1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>java-sdk-parent</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Beam :: SDKs :: Java</name>
+
+ <modules>
+ <module>core</module>
+ <module>maven-archetypes</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>java8-tests</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <modules>
+ <module>java8tests</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/c6c28365/sdks/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/pom.xml b/sdks/pom.xml
new file mode 100644
index 0000000..808f0d3
--- /dev/null
+++ b/sdks/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>sdks-parent</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Beam :: SDKs</name>
+
+ <modules>
+ <module>java</module>
+ </modules>
+
+</project>
\ No newline at end of file
[2/2] incubator-beam git commit: This closes #90
Posted by da...@apache.org.
This closes #90
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/636ad413
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/636ad413
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/636ad413
Branch: refs/heads/master
Commit: 636ad413a9e6cb10dd20e866fed55fc0683b558f
Parents: 17863c8 c6c2836
Author: Davor Bonaci <da...@google.com>
Authored: Wed Mar 30 12:51:50 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Wed Mar 30 12:51:50 2016 -0700
----------------------------------------------------------------------
examples/pom.xml | 53 +++++++++++++++++++++++
pom.xml | 23 +---------
runners/pom.xml | 1 +
sdks/java/core/pom.xml | 6 +--
sdks/java/java8tests/pom.xml | 6 +--
sdks/java/maven-archetypes/examples/pom.xml | 2 +-
sdks/java/maven-archetypes/pom.xml | 6 +--
sdks/java/maven-archetypes/starter/pom.xml | 2 +-
sdks/java/pom.xml | 54 ++++++++++++++++++++++++
sdks/pom.xml | 41 ++++++++++++++++++
10 files changed, 162 insertions(+), 32 deletions(-)
----------------------------------------------------------------------