incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [16/50] [abbrv] git commit: Updating pom files to version blur based on the hadoop version (1 or 2).
Date Sun, 18 May 2014 21:41:51 GMT
Updating pom files to version blur based on the hadoop version (1 or 2).


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8ed756f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8ed756f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8ed756f1

Branch: refs/heads/console-v2
Commit: 8ed756f14796f465d763f133bb25f21f046e715e
Parents: 55ff58f
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Apr 30 15:49:16 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Apr 30 15:49:16 2014 -0400

----------------------------------------------------------------------
 blur-core/pom.xml    |  7 +++++
 blur-gui/pom.xml     |  7 +++++
 blur-mapred/pom.xml  |  7 +++++
 blur-query/pom.xml   | 26 +++++++++++++++++
 blur-shell/pom.xml   |  9 +++++-
 blur-store/pom.xml   |  7 +++++
 blur-thrift/pom.xml  | 24 ++++++++++------
 blur-util/pom.xml    | 25 ++++++++++++++++
 distribution/pom.xml | 72 ++++++++++++++++++++++++++++++++---------------
 pom.xml              |  4 +--
 10 files changed, 153 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/blur-core/pom.xml b/blur-core/pom.xml
index 300e0b8..77faabc 100644
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-core</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Core</name>
 	<description>The Blur core module contains the majority of the server logic.</description>
@@ -166,6 +167,9 @@ under the License.
 					<name>hadoop1</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
@@ -182,6 +186,9 @@ under the License.
 					<name>hadoop2</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-gui/pom.xml
----------------------------------------------------------------------
diff --git a/blur-gui/pom.xml b/blur-gui/pom.xml
index 9881210..ea76beb 100644
--- a/blur-gui/pom.xml
+++ b/blur-gui/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-gui</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>war</packaging>
 	<name>Blur GUI</name>
 	<description>The Blur gui module contains the html status pages for each process.</description>
@@ -153,6 +154,9 @@ under the License.
 					<name>hadoop1</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
 		</profile>
 		<profile>
 			<id>hadoop-2.2</id>
@@ -161,6 +165,9 @@ under the License.
 					<name>hadoop2</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 				    <groupId>org.mortbay.jetty</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-mapred/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred/pom.xml b/blur-mapred/pom.xml
index 7e8bbc7..3afeaf3 100644
--- a/blur-mapred/pom.xml
+++ b/blur-mapred/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-mapred</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Map Reduce</name>
 	<description>The Blur Map Reduce module contains the BlurOutputFormat as well as a
CSVLoader
@@ -148,6 +149,9 @@ under the License.
 					<name>hadoop1</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
@@ -171,6 +175,9 @@ under the License.
 					<name>hadoop2</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 				      <groupId>org.apache.mrunit</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-query/pom.xml
----------------------------------------------------------------------
diff --git a/blur-query/pom.xml b/blur-query/pom.xml
index fe51c21..c2bc944 100644
--- a/blur-query/pom.xml
+++ b/blur-query/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-query</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Query</name>
 	<description>The Blur query module contains all the analyzers, query object and parsers
for Blur.  Also the
@@ -149,4 +150,29 @@ under the License.
 			</plugin>
 		</plugins>
 	</build>
+	
+	<profiles>
+		<profile>
+			<id>hadoop-1x</id>
+			<activation>
+				<property>
+					<name>hadoop1</name>
+				</property>
+			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
+		</profile>
+		<profile>
+			<id>hadoop-2.2</id>
+			<activation>
+				<property>
+					<name>hadoop2</name>
+				</property>
+			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
+		</profile>
+	</profiles>	
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-shell/pom.xml
----------------------------------------------------------------------
diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml
index a9feef0..ddc154c 100644
--- a/blur-shell/pom.xml
+++ b/blur-shell/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-shell</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Shell</name>
 	<description>The Blur shell module contains a shell for interacting with Blur.  All
shell commands
@@ -128,7 +129,7 @@ under the License.
           </plugin>
         </plugins>
     </build>
-    
+
 	<profiles>
 		<profile>
 			<id>hadoop-1x</id>
@@ -137,6 +138,9 @@ under the License.
 					<name>hadoop1</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
@@ -158,6 +162,9 @@ under the License.
 					<name>hadoop2</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-store/pom.xml
----------------------------------------------------------------------
diff --git a/blur-store/pom.xml b/blur-store/pom.xml
index 03e4416..4220de3 100644
--- a/blur-store/pom.xml
+++ b/blur-store/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-store</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Store</name>
 	<description>The Blur store module contains all the Lucene directories and block cache
for Blur.</description>
@@ -157,6 +158,9 @@ under the License.
 					<name>hadoop1</name>
 				</property>
 			</activation>
+        <properties>
+            <projectVersion>${project.parent.version}-hadoop1</projectVersion>
+        </properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
@@ -178,6 +182,9 @@ under the License.
 					<name>hadoop2</name>
 				</property>
 			</activation>
+        <properties>
+            <projectVersion>${project.parent.version}-hadoop2</projectVersion>
+        </properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/blur-thrift/pom.xml b/blur-thrift/pom.xml
index ee0c3bc..ee161aa 100644
--- a/blur-thrift/pom.xml
+++ b/blur-thrift/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-thrift</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Thrift</name>
 	<description>The Blur thrift module contains all the generated Thrift code, as well
as a repackaged version
@@ -124,10 +125,10 @@ under the License.
 			</plugin>
 		</plugins>
 	</build>
-	
-	
 
-	
+
+
+
 	<profiles>
 		<profile>
 			<id>hadoop-1x</id>
@@ -136,6 +137,9 @@ under the License.
 					<name>hadoop1</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
 		</profile>
 		<profile>
 			<id>hadoop-2.2</id>
@@ -144,15 +148,17 @@ under the License.
 					<name>hadoop2</name>
 				</property>
 			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
 			<dependencies>
 				<dependency>
-				    <groupId>javax.servlet</groupId>
-				    <artifactId>servlet-api</artifactId>
-				    <version>${servlet-api.version}</version>
-				    <scope>provided</scope>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+					<version>${servlet-api.version}</version>
+					<scope>provided</scope>
 				</dependency>
 			</dependencies>
 		</profile>
-	</profiles>
-	
+	</profiles>	
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/blur-util/pom.xml
----------------------------------------------------------------------
diff --git a/blur-util/pom.xml b/blur-util/pom.xml
index 8390572..5838660 100644
--- a/blur-util/pom.xml
+++ b/blur-util/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-util</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>jar</packaging>
 	<name>Blur Util</name>
 	<description>The Blur util module contains mostly utility classes used throughout
the Blur project.</description>
@@ -205,4 +206,28 @@ under the License.
 			</plugins>
 		</pluginManagement>
 	</build>
+	<profiles>
+		<profile>
+			<id>hadoop-1x</id>
+			<activation>
+				<property>
+					<name>hadoop1</name>
+				</property>
+			</activation>
+        <properties>
+            <projectVersion>${project.parent.version}-hadoop1</projectVersion>
+        </properties>
+		</profile>
+		<profile>
+			<id>hadoop-2.2</id>
+			<activation>
+				<property>
+					<name>hadoop2</name>
+				</property>
+			</activation>
+        <properties>
+            <projectVersion>${project.parent.version}-hadoop2</projectVersion>
+        </properties>
+		</profile>
+	</profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 35a884b..5d7eb0b 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -28,6 +28,7 @@ under the License.
 	</parent>
 
 	<artifactId>apache-blur</artifactId>
+	<version>${projectVersion}</version>
 	<packaging>pom</packaging>
 	<name>Distribution</name>
 	<description>The Blur distribution module builds the source and binary artifacts.</description>
@@ -44,27 +45,52 @@ under the License.
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
-	
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>distro-assembly</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptors>
-										<descriptor>src/assemble/bin.xml</descriptor>
-										<descriptor>src/assemble/src.xml</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>distro-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assemble/bin.xml</descriptor>
+								<descriptor>src/assemble/src.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>hadoop-1x</id>
+			<activation>
+				<property>
+					<name>hadoop1</name>
+				</property>
+			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop1</projectVersion>
+			</properties>
+		</profile>
+		<profile>
+			<id>hadoop-2.2</id>
+			<activation>
+				<property>
+					<name>hadoop2</name>
+				</property>
+			</activation>
+			<properties>
+				<projectVersion>${project.parent.version}-hadoop2</projectVersion>
+			</properties>
+		</profile>
+	</profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8ed756f1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b9b7937..2ee7593 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,8 +172,8 @@ under the License.
 	</scm>
 
 	<properties>
-                <commons-logging.version>1.1.3</commons-logging.version>
-                <commons-lang.version>2.4</commons-lang.version>
+        <commons-logging.version>1.1.3</commons-logging.version>
+        <commons-lang.version>2.4</commons-lang.version>
 		<zookeeper.version>3.4.5</zookeeper.version>
 		<log4j.version>1.2.15</log4j.version>
 		<jersey.version>1.14</jersey.version>


Mime
View raw message