Updates to the pom files to centralize the versions of the dependencies across the project.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/dd0805f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/dd0805f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/dd0805f2 Branch: refs/heads/0.2-dev Commit: dd0805f2d5506c1c2e03fd65040f801bd1762e32 Parents: 259706a Author: Aaron McCurry <[email protected]> Authored: Sun Jan 27 15:06:27 2013 -0500 Committer: Aaron McCurry <[email protected]> Committed: Sun Jan 27 15:06:27 2013 -0500 ---------------------------------------------------------------------- src/blur-core/pom.xml | 8 ++++---- src/blur-gui/pom.xml | 2 +- src/blur-mapred/pom.xml | 4 ++-- src/blur-shell/pom.xml | 8 +++----- src/blur-store/pom.xml | 14 +++++++------- src/blur-testsuite/pom.xml | 6 +++--- src/blur-thrift/pom.xml | 4 ++-- src/blur-util/pom.xml | 12 ++++++------ src/contrib/blur-jdbc/pom.xml | 2 +- src/distribution/pom.xml | 4 ++-- src/pom.xml | 16 +++++++++++++++- 11 files changed, 46 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-core/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-core/pom.xml b/src/blur-core/pom.xml index e99b8b5..defbfaf 100644 --- a/src/blur-core/pom.xml +++ b/src/blur-core/pom.xml @@ -66,25 +66,25 @@ under the License. <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>${zookeeper.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>1.0.4</version> + <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> - <version>1.14</version> + <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-gui/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-gui/pom.xml b/src/blur-gui/pom.xml index a8fe1c3..1c24dc0 100644 --- a/src/blur-gui/pom.xml +++ b/src/blur-gui/pom.xml @@ -54,7 +54,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-mapred/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-mapred/pom.xml b/src/blur-mapred/pom.xml index ecc0e4e..c1630b1 100644 --- a/src/blur-mapred/pom.xml +++ b/src/blur-mapred/pom.xml @@ -27,7 +27,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>${zookeeper.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -48,7 +48,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-shell/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-shell/pom.xml b/src/blur-shell/pom.xml index 6ac95a2..4a8c736 100644 --- a/src/blur-shell/pom.xml +++ b/src/blur-shell/pom.xml @@ -36,7 +36,6 @@ under the License. <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> <version>${project.version}</version> - <exclusions> <exclusion> <groupId>javax.mail</groupId> @@ -59,19 +58,18 @@ under the License. <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> - <version>2.7</version> + <version>${jline.version}</version> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>12.0</version> + <version>${guava.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-store/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-store/pom.xml b/src/blur-store/pom.xml index 7ade00b..a037d0f 100644 --- a/src/blur-store/pom.xml +++ b/src/blur-store/pom.xml @@ -40,38 +40,38 @@ under the License. <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>4.0.0</version> + <version>${lucene.version}</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-codecs</artifactId> - <version>4.0.0</version> + <version>${lucene.version}</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers-common</artifactId> - <version>4.0.0</version> + <version>${lucene.version}</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-queryparser</artifactId> - <version>4.0.0</version> + <version>${lucene.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>${commons-cli.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.googlecode.concurrentlinkedhashmap</groupId> <artifactId>concurrentlinkedhashmap-lru</artifactId> - <version>1.3.1</version> + <version>${concurrentlinkedhashmap-lru.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-testsuite/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-testsuite/pom.xml b/src/blur-testsuite/pom.xml index 274a976..b3f59bf 100644 --- a/src/blur-testsuite/pom.xml +++ b/src/blur-testsuite/pom.xml @@ -50,19 +50,19 @@ under the License. <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>${zookeeper.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-thrift/pom.xml b/src/blur-thrift/pom.xml index 5ba8930..3bc315d 100644 --- a/src/blur-thrift/pom.xml +++ b/src/blur-thrift/pom.xml @@ -40,12 +40,12 @@ under the License. <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>0.9.0</version> + <version>${thrift.version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-util/pom.xml b/src/blur-util/pom.xml index defc26f..feeb135 100644 --- a/src/blur-util/pom.xml +++ b/src/blur-util/pom.xml @@ -35,7 +35,7 @@ under the License. <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>${zookeeper.version}</version> <exclusions> <exclusion> <groupId>javax.mail</groupId> @@ -58,31 +58,31 @@ under the License. <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>1.0.4</version> + <version>${hadoop.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> + <version>${slf4j.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> + <version>${slf4j.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/contrib/blur-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/src/contrib/blur-jdbc/pom.xml b/src/contrib/blur-jdbc/pom.xml index d6fed70..d53061e 100644 --- a/src/contrib/blur-jdbc/pom.xml +++ b/src/contrib/blur-jdbc/pom.xml @@ -45,7 +45,7 @@ under the License. <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.15</version> + <version>${log4j.version}</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/src/distribution/pom.xml b/src/distribution/pom.xml index 07b47de..69763e5 100644 --- a/src/distribution/pom.xml +++ b/src/distribution/pom.xml @@ -20,12 +20,12 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-mapred</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-shell</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dd0805f2/src/pom.xml ---------------------------------------------------------------------- diff --git a/src/pom.xml b/src/pom.xml index baec8fa..390f328 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -36,6 +36,21 @@ under the License. <description>Blur is a search platform capable of searching massive amounts of data in a cloud computing environment.</description> <url>http://incubator.apache.org/blur/</url> <inceptionYear>2012</inceptionYear> + + <properties> + <hadoop.version>1.0.4</hadoop.version> + <zookeeper.version>3.4.5</zookeeper.version> + <log4j.version>1.2.15</log4j.version> + <jersey.version>1.14</jersey.version> + <lucene.version>4.0.0</lucene.version> + <junit.version>4.7</junit.version> + <thrift.version>0.9.0</thrift.version> + <slf4j.version>1.6.1</slf4j.version> + <commons-cli.version>1.2</commons-cli.version> + <concurrentlinkedhashmap-lru.version>1.3.1</concurrentlinkedhashmap-lru.version> + <jline.version>2.7</jline.version> + <guava.version>12.0</guava.version> + </properties> <modules> <module>blur-core</module> @@ -44,7 +59,6 @@ under the License. <module>blur-mapred</module> <module>blur-util</module> <module>blur-gui</module> - <!--module>blur-jdbc</module--> <!--module>blur-testsuite</module--> <module>blur-shell</module> <module>distribution</module>
