Skip to content

Commit

Permalink
POM-49. Introduce compile and test platform for library platform depe…
Browse files Browse the repository at this point in the history 
…ndency.

issue: https://jira.kiji.org/browse/POM-49
review: https://review.kiji.org/r/2218
  • Loading branch information
@danburkert
danburkert committed Sep 3, 2014
1 parent 6bf2bd7 commit 3aa214b
Show file tree
Hide file tree
Showing 7 changed files with 144 additions and 335 deletions.
39 changes: 8 additions & 31 deletions cdh4/pom.xml
View file
Expand Up @@ -28,20 +28,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<relativePath>..</relativePath>
</parent>

<properties>
<hadoop.version>2.0.0-mr1-cdh4.3.0</hadoop.version>
<hadoop-common.version>2.0.0-cdh4.3.0</hadoop-common.version>
<hbase.version>0.94.6-cdh4.3.0</hbase.version>
</properties>

<dependencies>
<!-- Bring in the skeleton -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>kiji-rest</artifactId>
<version>${project.version}</version>
<classifier>release</classifier>
<type>tar.gz</type>
<classifier>release</classifier>
<version>${project.version}</version>
</dependency>

<dependency>
Expand All @@ -55,31 +49,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
<scope>runtime</scope>
<groupId>org.kiji.platforms</groupId>
<artifactId>kiji-4-3-platform</artifactId>
<type>pom</type>
<version>${kiji-platforms.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop-common.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>${hbase.version}</version>
<scope>runtime</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
Expand Down
26 changes: 7 additions & 19 deletions cdh5/pom.xml
View file
Expand Up @@ -34,9 +34,9 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>kiji-rest</artifactId>
<version>${project.version}</version>
<classifier>release</classifier>
<type>tar.gz</type>
<classifier>release</classifier>
<version>${project.version}</version>
</dependency>

<dependency>
Expand All @@ -52,24 +52,12 @@
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<scope>runtime</scope>
<groupId>org.kiji.platforms</groupId>
<artifactId>kiji-cdh5-0-platform</artifactId>
<type>pom</type>
<version>${kiji-platforms.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
<scope>runtime</scope>
</dependency>

</dependencies>

<build>
Expand Down
49 changes: 35 additions & 14 deletions kiji-rest/pom.xml
View file
Expand Up @@ -82,17 +82,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<groupId>org.kiji.platforms</groupId>
<artifactId>kiji-compile-platform</artifactId>
<type>pom</type>
<version>${kiji-platforms.version}</version>
<scope>provided</scope>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
with these excluded packages -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -117,8 +123,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<dependency>
<groupId>org.kiji.schema</groupId>
<artifactId>kiji-schema</artifactId>
<version>${kiji-schema.version}</version>
<type>test-jar</type>
<version>${kiji-schema.version}</version>
<scope>test</scope>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
Expand All @@ -134,8 +140,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<groupId>org.kiji.platforms</groupId>
<artifactId>kiji-test-platform</artifactId>
<type>pom</type>
<version>${kiji-platforms.version}</version>
<scope>test</scope>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
with these excluded packages -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.yammer.dropwizard</groupId>
Expand Down
31 changes: 17 additions & 14 deletions load-testing/pom.xml
View file
Expand Up @@ -76,22 +76,25 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>runtime</scope>
<groupId>org.kiji.platforms</groupId>
<artifactId>kiji-compile-platform</artifactId>
<type>pom</type>
<version>${kiji-platforms.version}</version>
<scope>provided</scope>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
with these excluded packages -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.jmeter</groupId>
Expand Down
115 changes: 37 additions & 78 deletions plugin-archetype/src/main/resources/archetype-resources/pom.xml
View file
Expand Up @@ -69,88 +69,52 @@
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<scope>compile</scope>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
with these excluded packages -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.kiji.platforms</groupId>
<artifactId>kiji-compile-platform</artifactId>
<type>pom</type>
<version>${kiji-platforms.version}</version>
<scope>provided</scope>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
<scope>compile</scope>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
with these excluded packages -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- These conflict with the servlet package in DropWizard -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<!-- These were for some reason forcing out the newer org.codehaus.jackson which
is needed for JSON serialization in kiji-schema -->
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>${hbase.version}</version>
<scope>compile</scope>
with these excluded packages -->
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- These conflict with the servlet package in DropWizard -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<!-- These were for some reason forcing out the newer org.codehaus.jackson
which is needed for JSON serialization in kiji-schema -->
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<exclusions>
<!-- Dropwizard works with the internals of logback which conflict
with these excluded packages -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!-- Just to save some space in the final package -->
<exclusion>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
</exclusion>
<!-- These conflict with the servlet package in DropWizard -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Expand All @@ -159,10 +123,6 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
<artifactId>servlet-api-2.5</artifactId>
<groupId>org.mortbay.jetty</groupId>
</exclusion>
</exclusions>
</dependency>

Expand All @@ -187,7 +147,6 @@
<version>${fake-hbase.version}</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down

0 comments on commit 3aa214b

Please sign in to comment.