Author: rvesse
Date: Tue Jul 8 15:19:44 2014
New Revision: 1608830
URL: http://svn.apache.org/r1608830
Log:
Tweaks to POMs to add jena- prefix to artifactId and make it clear these
modules are not affiliated with Apache Hadoop but rather with Apache Jena
Modified:
jena/Experimental/hadoop-rdf/hadoop-rdf-common/pom.xml
jena/Experimental/hadoop-rdf/hadoop-rdf-io/pom.xml
jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml
jena/Experimental/hadoop-rdf/hadoop-rdf-stats/pom.xml
jena/Experimental/hadoop-rdf/pom.xml
Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-common/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-common/pom.xml?rev=1608830&r1=1608829&r2=1608830&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/hadoop-rdf-common/pom.xml (original)
+++ jena/Experimental/hadoop-rdf/hadoop-rdf-common/pom.xml Tue Jul 8 15:19:44
2014
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf</artifactId>
+ <artifactId>jena-hadoop-rdf</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <artifactId>hadoop-rdf-common</artifactId>
- <name>Apache Jena - Hadoop RDF - Common API</name>
- <description>Common code for Hadoop RDF such as writable types for
RDF</description>
+ <artifactId>jena-hadoop-rdf-common</artifactId>
+ <name>Apache Jena - RDF Tools for Hadoop - 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 -->
<dependencies>
@@ -37,11 +37,6 @@
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Jena dependencies -->
<dependency>
Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-io/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/pom.xml?rev=1608830&r1=1608829&r2=1608830&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/hadoop-rdf-io/pom.xml (original)
+++ jena/Experimental/hadoop-rdf/hadoop-rdf-io/pom.xml Tue Jul 8 15:19:44 2014
@@ -20,29 +20,64 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf</artifactId>
+ <artifactId>jena-hadoop-rdf</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <artifactId>hadoop-rdf-io</artifactId>
- <name>Apache Jena - Hadoop RDF - I/O</name>
- <description>Input/Output formats library for Hadoop</description>
+ <artifactId>jena-hadoop-rdf-io</artifactId>
+ <name>Apache Jena - RDF Tools for Hadoop - I/O</name>
+ <description>RDF Input/Output formats library for Hadoop</description>
<!-- Note that versions are managed by parent POMs -->
<dependencies>
<!-- Internal Project Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf-common</artifactId>
+ <artifactId>jena-hadoop-rdf-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- Hadoop Dependencies -->
- <!-- Note these will be provided on the Hadoop cluster hence
the provided scope -->
+ <!-- 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>
+<!-- <exclusions>
+ hadoop-common apparently has all sorts of
dependency convergence
+ issues as of 2.4.0
+ Exclude this since it transitively has an
outdated jackson-core-asl
+ dependency
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ Exclude these since they have outdated
commons-logging dependencies
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+
<artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ Exclude these since it has an outdated
dependency on servlet-api
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ Exclude these since it has an outdated
dependency on commons-codec
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions> -->
</dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId>
Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml?rev=1608830&r1=1608829&r2=1608830&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml (original)
+++ jena/Experimental/hadoop-rdf/hadoop-rdf-mapreduce/pom.xml Tue Jul 8
15:19:44 2014
@@ -19,18 +19,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf</artifactId>
+ <artifactId>jena-hadoop-rdf</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <artifactId>hadoop-rdf-mapreduce</artifactId>
- <name>Apache Jena - Hadoop RDF - Map/Reduce</name>
+ <artifactId>jena-hadoop-rdf-mapreduce</artifactId>
+ <name>Apache Jena - RDF Tools for Hadoop - Map/Reduce</name>
<description>Contains some basic Map/Reduce implementations for working
with RDF on Hadoop</description>
<dependencies>
<!-- Internal Project Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf-common</artifactId>
+ <artifactId>jena-hadoop-rdf-common</artifactId>
<version>${project.version}</version>
</dependency>
Modified: jena/Experimental/hadoop-rdf/hadoop-rdf-stats/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-stats/pom.xml?rev=1608830&r1=1608829&r2=1608830&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/hadoop-rdf-stats/pom.xml (original)
+++ jena/Experimental/hadoop-rdf/hadoop-rdf-stats/pom.xml Tue Jul 8 15:19:44
2014
@@ -20,23 +20,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf</artifactId>
+ <artifactId>jena-hadoop-rdf</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
- <artifactId>hadoop-rdf-stats</artifactId>
- <name>Apache Jena - Hadoop RDF - Statistics Demo App</name>
+ <artifactId>jena-hadoop-rdf-stats</artifactId>
+ <name>Apache Jena - RDF Tools for Hadoop - Statistics Demo App</name>
<description>A demo application that can be run on Hadoop to produce a
statistical analysis on arbitrary RDF inputs</description>
<dependencies>
<!-- Internal Project Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf-io</artifactId>
+ <artifactId>jena-hadoop-rdf-io</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf-mapreduce</artifactId>
+ <artifactId>jena-hadoop-rdf-mapreduce</artifactId>
<version>${project.version}</version>
</dependency>
@@ -64,7 +64,7 @@
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf-mapreduce</artifactId>
+ <artifactId>jena-hadoop-rdf-mapreduce</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
@@ -83,7 +83,6 @@
dependencies contained therein -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
<configuration>
<descriptors>
<descriptor>hadoop-job.xml</descriptor>
Modified: jena/Experimental/hadoop-rdf/pom.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/pom.xml?rev=1608830&r1=1608829&r2=1608830&view=diff
==============================================================================
--- jena/Experimental/hadoop-rdf/pom.xml (original)
+++ jena/Experimental/hadoop-rdf/pom.xml Tue Jul 8 15:19:44 2014
@@ -18,12 +18,19 @@
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>
<groupId>org.apache.jena</groupId>
- <artifactId>hadoop-rdf</artifactId>
+ <artifactId>jena-hadoop-rdf</artifactId>
<version>0.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>Apache Jena - Hadoop RDF</name>
- <description>A collection of libraries for working with RDF on the
Hadoop platform</description>
+
+<!-- <parent>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-parent</artifactId>
+ <version>10-SNAPSHOT</version>
+ <relativePath />
+ </parent> -->
+
+ <name>Apache Jena - RDF Tools for Hadoop</name>
+ <description>A collection of tools for working with RDF on the Hadoop
platform</description>
<modules>
<module>hadoop-rdf-io</module>
@@ -35,7 +42,7 @@
<!-- Properties common across all profiles -->
<properties>
<plugin.compiler.version>2.5.1</plugin.compiler.version>
- <arq.version>2.11.1</arq.version>
+ <arq.version>2.12.0-SNAPSHOT</arq.version>
<junit.version>4.11</junit.version>
<mrunit.version>1.0.0</mrunit.version>
</properties>
@@ -52,7 +59,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <hadoop.version>2.2.0</hadoop.version>
+ <hadoop.version>2.4.1</hadoop.version>
</properties>
</profile>
@@ -108,18 +115,29 @@
<build>
<plugins>
- <!-- Compiler Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${plugin.compiler.version}</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <!-- Explicitly set UTF-8 encoding
though should be set by property
- anyway -->
- <encoding>UTF-8</encoding>
- </configuration>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+
<requireJavaVersion>
+
<version>1.7.0</version>
+
</requireJavaVersion>
+ </rules>
+ <!-- Hadoop
dependencies introduce a huge range of dependency convergence
+ issues.
Therefore we don't fail the builds for these modules which is less
+ than ideal but
far easier than trying to fix the mess that is Hadoops transitive
+ dependencies -->
+ <fail>false</fail>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
