You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nemo.apache.org by je...@apache.org on 2018/11/02 07:53:16 UTC
[incubator-nemo] branch master updated: [NEMO-242] Parent POM.xmls
for \compiler, \runtime, and \examples (#144)
This is an automated email from the ASF dual-hosted git repository.
jeongyoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git
The following commit(s) were added to refs/heads/master by this push:
new d2acb4f [NEMO-242] Parent POM.xmls for \compiler, \runtime, and \examples (#144)
d2acb4f is described below
commit d2acb4fd2274e3bd5169e5f1b9c73e114ab8b4ee
Author: Gyewon Lee <st...@gmail.com>
AuthorDate: Fri Nov 2 16:53:12 2018 +0900
[NEMO-242] Parent POM.xmls for \compiler, \runtime, and \examples (#144)
JIRA: NEMO-242: Parent POM.xmls for /compiler, /runtime, and /examples
Major changes:
Make parent pom.xmls for /compiler, /runtime, and /examples
Minor changes to note:
Tests for the changes:
Other comments:
Closes #144
---
compiler/backend/pom.xml | 4 ++--
compiler/frontend/beam/pom.xml | 4 ++--
compiler/frontend/spark/pom.xml | 4 ++--
compiler/optimizer/pom.xml | 4 ++--
{runtime/test => compiler}/pom.xml | 39 ++++++++++++++++++--------------------
compiler/test/pom.xml | 4 ++--
examples/beam/pom.xml | 4 ++--
{runtime/test => examples}/pom.xml | 35 ++++++++++++++--------------------
examples/spark/pom.xml | 4 ++--
pom.xml | 19 +++++--------------
runtime/common/pom.xml | 4 ++--
runtime/driver/pom.xml | 4 ++--
runtime/executor/pom.xml | 4 ++--
runtime/master/pom.xml | 4 ++--
runtime/{test => }/pom.xml | 38 +++++++++++++++++--------------------
runtime/test/pom.xml | 4 ++--
16 files changed, 78 insertions(+), 101 deletions(-)
diff --git a/compiler/backend/pom.xml b/compiler/backend/pom.xml
index cbccd68..25ca2c6 100644
--- a/compiler/backend/pom.xml
+++ b/compiler/backend/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-compiler</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-compiler-backend</artifactId>
diff --git a/compiler/frontend/beam/pom.xml b/compiler/frontend/beam/pom.xml
index e86565f..7911099 100644
--- a/compiler/frontend/beam/pom.xml
+++ b/compiler/frontend/beam/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-compiler</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../../</relativePath>
+ <relativePath>../../</relativePath>
</parent>
<artifactId>nemo-compiler-frontend-beam</artifactId>
diff --git a/compiler/frontend/spark/pom.xml b/compiler/frontend/spark/pom.xml
index c79a8e1..cf0993b 100644
--- a/compiler/frontend/spark/pom.xml
+++ b/compiler/frontend/spark/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-compiler</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../../</relativePath>
+ <relativePath>../../</relativePath>
</parent>
<artifactId>nemo-compiler-frontend-spark</artifactId>
diff --git a/compiler/optimizer/pom.xml b/compiler/optimizer/pom.xml
index 2ecc916..4b97996 100644
--- a/compiler/optimizer/pom.xml
+++ b/compiler/optimizer/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-compiler</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-compiler-optimizer</artifactId>
diff --git a/runtime/test/pom.xml b/compiler/pom.xml
similarity index 57%
copy from runtime/test/pom.xml
copy to compiler/pom.xml
index c0f09c7..ed5340e 100644
--- a/runtime/test/pom.xml
+++ b/compiler/pom.xml
@@ -20,28 +20,25 @@ 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.nemo</groupId>
- <artifactId>nemo-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
+ <parent>
+ <artifactId>nemo-project</artifactId>
+ <groupId>org.apache.nemo</groupId>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>nemo-runtime-test</artifactId>
- <name>Nemo Runtime Test</name>
+ <artifactId>nemo-compiler</artifactId>
+ <packaging>pom</packaging>
+ <name>Nemo Compiler</name>
+
+ <modules>
+ <module>backend</module>
+ <module>frontend/beam</module>
+ <module>frontend/spark</module>
+ <module>optimizer</module>
+ <module>test</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-runtime-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-compiler-optimizer</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/compiler/test/pom.xml b/compiler/test/pom.xml
index 036437f..daf5823 100644
--- a/compiler/test/pom.xml
+++ b/compiler/test/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-compiler</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-compiler-test</artifactId>
diff --git a/examples/beam/pom.xml b/examples/beam/pom.xml
index 345d453..30512f1 100644
--- a/examples/beam/pom.xml
+++ b/examples/beam/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-examples</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-examples-beam</artifactId>
diff --git a/runtime/test/pom.xml b/examples/pom.xml
similarity index 57%
copy from runtime/test/pom.xml
copy to examples/pom.xml
index c0f09c7..84d3fb3 100644
--- a/runtime/test/pom.xml
+++ b/examples/pom.xml
@@ -20,28 +20,21 @@ 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>
+ <artifactId>nemo-project</artifactId>
+ <groupId>org.apache.nemo</groupId>
+ <version>0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
+ <artifactId>nemo-examples</artifactId>
+ <packaging>pom</packaging>
+ <name>Nemo Examples</name>
+
+ <modules>
+ <module>beam</module>
+ <module>spark</module>
+ </modules>
- <artifactId>nemo-runtime-test</artifactId>
- <name>Nemo Runtime Test</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-runtime-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-compiler-optimizer</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml
index 9a9b0c0..80368aa 100644
--- a/examples/spark/pom.xml
+++ b/examples/spark/pom.xml
@@ -23,10 +23,10 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-examples</artifactId>
<groupId>org.apache.nemo</groupId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-examples-spark</artifactId>
diff --git a/pom.xml b/pom.xml
index 88ac6ec..3c57aef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,18 +66,9 @@ under the License.
<module>conf</module>
<module>client</module>
<module>common</module>
- <module>compiler/backend</module>
- <module>compiler/frontend/beam</module>
- <module>compiler/frontend/spark</module>
- <module>compiler/optimizer</module>
- <module>compiler/test</module>
- <module>examples/beam</module>
- <module>examples/spark</module>
- <module>runtime/common</module>
- <module>runtime/executor</module>
- <module>runtime/master</module>
- <module>runtime/driver</module>
- <module>runtime/test</module>
+ <module>compiler</module>
+ <module>examples</module>
+ <module>runtime</module>
</modules>
<dependencies>
@@ -289,8 +280,8 @@ under the License.
<exclude>**/target/**</exclude>
<!-- REEF run files -->
<exclude>**/REEF_LOCAL_RUNTIME/**</exclude>
- <!-- Resources under examples -->
- <exclude>examples/resources/**</exclude>
+ <!-- Resources -->
+ <exclude>**/resources/**</exclude>
<!-- Logs -->
<exclude>**/*.log</exclude>
<!-- EditorConfig -->
diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml
index 08e45d9..3daf6a9 100644
--- a/runtime/common/pom.xml
+++ b/runtime/common/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-runtime</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-runtime-common</artifactId>
diff --git a/runtime/driver/pom.xml b/runtime/driver/pom.xml
index 6810b36..ed09fc9 100644
--- a/runtime/driver/pom.xml
+++ b/runtime/driver/pom.xml
@@ -22,9 +22,9 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-runtime</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/runtime/executor/pom.xml b/runtime/executor/pom.xml
index 623cdba..f1d2565 100644
--- a/runtime/executor/pom.xml
+++ b/runtime/executor/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-runtime</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-runtime-executor</artifactId>
diff --git a/runtime/master/pom.xml b/runtime/master/pom.xml
index aaf4df7..f1f87be 100644
--- a/runtime/master/pom.xml
+++ b/runtime/master/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-runtime</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-runtime-master</artifactId>
diff --git a/runtime/test/pom.xml b/runtime/pom.xml
similarity index 57%
copy from runtime/test/pom.xml
copy to runtime/pom.xml
index c0f09c7..b31118f 100644
--- a/runtime/test/pom.xml
+++ b/runtime/pom.xml
@@ -20,28 +20,24 @@ 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>
+ <artifactId>nemo-project</artifactId>
+ <groupId>org.apache.nemo</groupId>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
+ <artifactId>nemo-runtime</artifactId>
+ <packaging>pom</packaging>
+ <name>Nemo Runtime</name>
- <artifactId>nemo-runtime-test</artifactId>
- <name>Nemo Runtime Test</name>
+ <modules>
+ <module>common</module>
+ <module>driver</module>
+ <module>executor</module>
+ <module>master</module>
+ <module>test</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-runtime-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nemo</groupId>
- <artifactId>nemo-compiler-optimizer</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</project>
diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml
index c0f09c7..61b9b3c 100644
--- a/runtime/test/pom.xml
+++ b/runtime/test/pom.xml
@@ -24,9 +24,9 @@ under the License.
<parent>
<groupId>org.apache.nemo</groupId>
- <artifactId>nemo-project</artifactId>
+ <artifactId>nemo-runtime</artifactId>
<version>0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>nemo-runtime-test</artifactId>