Repository: jena Updated Branches: refs/heads/master 01f852309 -> 2d18e707d
Use Jena's junit dependency. Use project.version for jena-arq. Use same license comment. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/14f05822 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/14f05822 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/14f05822 Branch: refs/heads/master Commit: 14f058222368974a729dea68157285476eba6c9c Parents: 01f8523 Author: Andy Seaborne <[email protected]> Authored: Tue Jul 21 21:53:33 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Jul 21 21:53:33 2015 +0100 ---------------------------------------------------------------------- jena-elephas/jena-elephas-common/pom.xml | 13 +++--- jena-elephas/jena-elephas-io/pom.xml | 21 ++++++---- jena-elephas/jena-elephas-mapreduce/pom.xml | 31 +++++++------- jena-elephas/pom.xml | 52 ++++++++++++------------ 4 files changed, 62 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/14f05822/jena-elephas/jena-elephas-common/pom.xml ---------------------------------------------------------------------- diff --git a/jena-elephas/jena-elephas-common/pom.xml b/jena-elephas/jena-elephas-common/pom.xml index befb5be..dd7034e 100644 --- a/jena-elephas/jena-elephas-common/pom.xml +++ b/jena-elephas/jena-elephas-common/pom.xml @@ -26,24 +26,25 @@ <name>Apache Jena - Elephas - Common API</name> <description>Common code for RDF on Hadoop such as writable types for RDF primitives</description> - <!-- Note that versions are managed by parent POMs --> + <!-- Note that versions are managed by parent POMs --> <dependencies> - <!-- Hadoop Dependencies --> - <!-- Note these will be provided on the Hadoop cluster hence the provided - scope --> + <!-- Hadoop Dependencies --> + <!-- Note these will be provided on the Hadoop cluster + hence the provided scope + --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>provided</scope> </dependency> - <!-- Jena dependencies --> + <!-- Jena dependencies --> <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-arq</artifactId> </dependency> - <!-- Test Dependencies --> + <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/jena/blob/14f05822/jena-elephas/jena-elephas-io/pom.xml ---------------------------------------------------------------------- diff --git a/jena-elephas/jena-elephas-io/pom.xml b/jena-elephas/jena-elephas-io/pom.xml index 64999e8..84bb26e 100644 --- a/jena-elephas/jena-elephas-io/pom.xml +++ b/jena-elephas/jena-elephas-io/pom.xml @@ -21,23 +21,26 @@ <groupId>org.apache.jena</groupId> <artifactId>jena-elephas</artifactId> <version>3.0.0-SNAPSHOT</version> + <relativePath>../</relativePath> </parent> <artifactId>jena-elephas-io</artifactId> <name>Apache Jena - Elephas - I/O</name> <description>RDF Input/Output formats library for Hadoop</description> - <!-- Note that versions are managed by parent POMs --> + <!-- Note that versions are managed by parent POMs --> <dependencies> - <!-- Internal Project Dependencies --> + <!-- Internal Project Dependencies --> + <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-elephas-common</artifactId> <version>${project.version}</version> </dependency> - - <!-- Hadoop Dependencies --> - <!-- Note these will be provided on the Hadoop cluster hence the provided - scope --> + + <!-- Hadoop Dependencies --> + <!-- Note these will be provided on the Hadoop cluster hence + the provided scope + --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> @@ -50,13 +53,13 @@ <scope>provided</scope> </dependency> - <!-- Jena dependencies --> + <!-- Jena dependencies --> <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-arq</artifactId> </dependency> - <!-- Test Dependencies --> + <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -80,7 +83,7 @@ <links> <link>http://jena.apache.org/documentation/javadoc/jena/</link> <link>http://jena.apache.org/documentation/javadoc/arq/</link> - <link>http://jena.apahce.org/documentation/javadoc/elephas/common/</link> + <link>http://jena.apache.org/documentation/javadoc/elephas/common/</link> </links> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/jena/blob/14f05822/jena-elephas/jena-elephas-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/jena-elephas/jena-elephas-mapreduce/pom.xml b/jena-elephas/jena-elephas-mapreduce/pom.xml index 9d44a0a..10a16bd 100644 --- a/jena-elephas/jena-elephas-mapreduce/pom.xml +++ b/jena-elephas/jena-elephas-mapreduce/pom.xml @@ -1,20 +1,21 @@ <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + 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.jena</groupId> http://git-wip-us.apache.org/repos/asf/jena/blob/14f05822/jena-elephas/pom.xml ---------------------------------------------------------------------- diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml index c11ce31..1707308 100644 --- a/jena-elephas/pom.xml +++ b/jena-elephas/pom.xml @@ -1,13 +1,19 @@ -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +<!-- + 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> <artifactId>jena-elephas</artifactId> @@ -34,8 +40,6 @@ <!-- Properties common across all profiles --> <properties> <plugin.compiler.version>2.6.0</plugin.compiler.version> - <arq.version>3.0.0-SNAPSHOT</arq.version> - <junit.version>4.11</junit.version> <mrunit.version>1.0.0</mrunit.version> <airline.version>0.9.2</airline.version> </properties> @@ -73,13 +77,6 @@ <version>11.0.2</version> </dependency> - <!-- Jena Dependencies --> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-arq</artifactId> - <version>${arq.version}</version> - </dependency> - <!-- CLI Related Dependencies --> <dependency> <groupId>com.github.rvesse</groupId> @@ -87,22 +84,27 @@ <version>${airline.version}</version> </dependency> + <!-- Jena --> + <dependency> + <groupId>org.apache.jena</groupId> + <artifactId>jena-arq</artifactId> + <version>${project.version}</version> + </dependency> + <!-- Test Dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> + <version>${hadoop.version}</version> + <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.mrunit</groupId> <artifactId>mrunit</artifactId> <version>${mrunit.version}</version> <classifier>hadoop2</classifier> + <scope>test</scope> </dependency> </dependencies> </dependencyManagement>
