You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/07/10 00:34:01 UTC
accumulo-wikisearch git commit: ACCUMULO-2779 Clean up wikisearch
poms, amended patch from David.
Repository: accumulo-wikisearch
Updated Branches:
refs/heads/master 1990979f6 -> 9c30660f6
ACCUMULO-2779 Clean up wikisearch poms, amended patch from David.
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/9c30660f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/9c30660f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/9c30660f
Branch: refs/heads/master
Commit: 9c30660f67b6a759f72f9ee690ff399ec42c817e
Parents: 1990979
Author: Josh Elser <jo...@gmail.com>
Authored: Thu Jul 9 18:31:47 2015 -0400
Committer: Josh Elser <jo...@gmail.com>
Committed: Thu Jul 9 18:33:38 2015 -0400
----------------------------------------------------------------------
.gitignore | 2 +-
ingest/pom.xml | 14 +++++----
pom.xml | 81 +++++++++++++++++++++++++++++++++++++++++++++-----
query-war/pom.xml | 1 +
query/pom.xml | 19 ++++++++++--
5 files changed, 101 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/9c30660f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0f31ce3..698a832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
**/target
.idea
**/*.iml
-**/lib
\ No newline at end of file
+**/lib
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/9c30660f/ingest/pom.xml
----------------------------------------------------------------------
diff --git a/ingest/pom.xml b/ingest/pom.xml
index a6f3d70..1d17e27 100644
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@@ -30,10 +30,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
@@ -119,7 +115,13 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
+ <version>${version.hadoop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</profile>
@@ -137,7 +139,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${version.hadoop}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/9c30660f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c62609a..2e3cb3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,17 @@
-->
<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.accumulo</groupId>
- <artifactId>accumulo-examples</artifactId>
- <version>1.5.0</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>14</version>
</parent>
+
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-wikisearch</artifactId>
+ <version>1.5.0</version>
+
<packaging>pom</packaging>
<name>accumulo-wikisearch</name>
<modules>
@@ -33,12 +38,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.accumulo>${project.version}</version.accumulo>
+ <version.collections>3.2.1</version.collections>
<version.commons-codec>1.5</version.commons-codec>
<version.commons-jexl>2.0.1</version.commons-jexl>
<version.commons-lang>2.4</version.commons-lang>
<version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
<version.guava>11.0.2</version.guava>
+ <version.hadoop>1.0.4</version.hadoop>
<version.jaxrs>2.1.0.GA</version.jaxrs>
+ <version.junit>4.11</version.junit>
<version.kryo>1.04</version.kryo>
<version.log4j>1.2.16</version.log4j>
<version.log4j-extras>1.0</version.log4j-extras>
@@ -52,6 +60,42 @@
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <version>${version.accumulo}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${version.hadoop}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${version.collections}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${version.zookeeper}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -144,6 +188,10 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -185,7 +233,17 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
<executions>
<execution>
<id>enforce-mvn</id>
@@ -201,7 +259,9 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<filesets>
<fileset>
@@ -214,11 +274,9 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<outputDirectory>lib</outputDirectory>
<archive>
@@ -236,13 +294,17 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
<configuration>
<encoding>UTF-8</encoding>
<quiet>true</quiet>
@@ -253,17 +315,22 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
<configuration>
<outputDirectory>lib</outputDirectory>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
<inherited>false</inherited>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/9c30660f/query-war/pom.xml
----------------------------------------------------------------------
diff --git a/query-war/pom.xml b/query-war/pom.xml
index be6e807..3ee0bc2 100644
--- a/query-war/pom.xml
+++ b/query-war/pom.xml
@@ -31,6 +31,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/9c30660f/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index be6f6b2..e779945 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -86,6 +86,12 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -143,7 +149,9 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4.</version>
<configuration>
<descriptors>
<descriptor>src/assembly/dist.xml</descriptor>
@@ -154,6 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -183,7 +192,13 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
+ <version>${version.hadoop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</profile>
@@ -201,7 +216,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${version.hadoop}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>