jeongyooneo closed pull request #144: [NEMO-242] Parent POM.xmls for \compiler, \runtime, and \examples URL: https://github.com/apache/incubator-nemo/pull/144
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/compiler/backend/pom.xml b/compiler/backend/pom.xml index cbccd68b2..25ca2c64b 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 e86565f41..791109906 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 c79a8e152..cf0993bd1 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 2ecc916ac..4b97996a6 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/compiler/pom.xml b/compiler/pom.xml new file mode 100644 index 000000000..ed5340eb0 --- /dev/null +++ b/compiler/pom.xml @@ -0,0 +1,44 @@ +<?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"> + + <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-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> + +</project> diff --git a/compiler/test/pom.xml b/compiler/test/pom.xml index 036437fe7..daf5823d0 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 345d4534f..30512f168 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/examples/pom.xml b/examples/pom.xml new file mode 100644 index 000000000..84d3fb381 --- /dev/null +++ b/examples/pom.xml @@ -0,0 +1,40 @@ +<?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"> + <parent> + <artifactId>nemo-project</artifactId> + <groupId>org.apache.nemo</groupId> + <version>0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>nemo-examples</artifactId> + <packaging>pom</packaging> + <name>Nemo Examples</name> + + <modules> + <module>beam</module> + <module>spark</module> + </modules> + + +</project> diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml index 9a9b0c0be..80368aae1 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 88ac6ec31..3c57aef28 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 08e45d9e8..3daf6a990 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 6810b36e6..ed09fc9bd 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 623cdba55..f1d2565b5 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 aaf4df77b..f1f87befb 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/pom.xml b/runtime/pom.xml new file mode 100644 index 000000000..b31118fc9 --- /dev/null +++ b/runtime/pom.xml @@ -0,0 +1,43 @@ +<?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"> + <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</artifactId> + <packaging>pom</packaging> + <name>Nemo Runtime</name> + + <modules> + <module>common</module> + <module>driver</module> + <module>executor</module> + <module>master</module> + <module>test</module> + </modules> + +</project> diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index c0f09c7e5..61b9b3cbb 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> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services