incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Fixing distribution project for hadoop1.
Date Wed, 12 Aug 2015 12:37:51 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master bd60b0772 -> 13b22b2f5


Fixing distribution project for hadoop1.


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

Branch: refs/heads/master
Commit: 13b22b2f598324952b3baf53a8a2568f1b79b170
Parents: bd60b07
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Aug 12 08:37:33 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Aug 12 08:37:33 2015 -0400

----------------------------------------------------------------------
 distribution/pom.xml | 241 ++++++++++++++++++++++++++++++----------------
 pom.xml              | 202 +++++++++++++++++++-------------------
 2 files changed, 258 insertions(+), 185 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/13b22b2f/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 19be49e..104bbcd 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -60,99 +60,40 @@ under the License.
 	<build>
 		<plugins>
 			<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>exec-maven-plugin</artifactId>
-							<version>1.2.1</version>
-							<executions>
-								<execution>
-									<id>create-service-descriptor</id>
-									<phase>package</phase>
-									<goals>
-										<goal>java</goal>
-									</goals>
-									<configuration>
-										<mainClass>org.apache.blur.doc.CreateCSDDescriptor</mainClass>
-										<arguments>
-											<argument>${project.build.scriptSourceDirectory}/../../assemble/cdh/csd/descriptor/service.sdl.template</argument>
-											<argument>${project.build.directory}/service.sdl</argument>
-											<argument>${project.version}</argument>
-										</arguments>
-									</configuration>
-								</execution>
-								<execution>
-									<id>create-parcel-json</id>
-									<phase>package</phase>
-									<goals>
-										<goal>java</goal>
-									</goals>
-									<configuration>
-										<mainClass>org.apache.blur.doc.ParcelJsonTemplate</mainClass>
-										<arguments>
-											<argument>${project.build.scriptSourceDirectory}/../../assemble/cdh/parcel/meta/parcel.json.template</argument>
-											<argument>${project.build.directory}/parcel.json</argument>
-											<argument>${project.version}</argument>
-										</arguments>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>		
-						<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.2.1</version>
 				<executions>
 					<execution>
-						<id>distro-assembly-src</id>
+						<id>create-service-descriptor</id>
 						<phase>package</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>java</goal>
 						</goals>
 						<configuration>
-							<finalName>apache-blur-${project.parent.version}</finalName>
-							<descriptors>
-								<descriptor>src/assemble/src.xml</descriptor>
-							</descriptors>
+							<mainClass>org.apache.blur.doc.CreateCSDDescriptor</mainClass>
+							<arguments>
+								<argument>${project.build.scriptSourceDirectory}/../../assemble/cdh/csd/descriptor/service.sdl.template</argument>
+								<argument>${project.build.directory}/service.sdl</argument>
+								<argument>${project.version}</argument>
+							</arguments>
 						</configuration>
 					</execution>
 					<execution>
-						<id>distro-assembly-bin</id>
+						<id>create-parcel-json</id>
 						<phase>package</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>java</goal>
 						</goals>
 						<configuration>
-							<descriptors>
-								<descriptor>${bin.assembly.file}</descriptor>
-							</descriptors>
+							<mainClass>org.apache.blur.doc.ParcelJsonTemplate</mainClass>
+							<arguments>
+								<argument>${project.build.scriptSourceDirectory}/../../assemble/cdh/parcel/meta/parcel.json.template</argument>
+								<argument>${project.build.directory}/parcel.json</argument>
+								<argument>${project.version}</argument>
+							</arguments>
 						</configuration>
 					</execution>
-										<execution>
-											<id>distro-assembly-parcel</id>
-											<phase>package</phase>
-											<goals>
-												<goal>single</goal>
-											</goals>
-											<configuration>
-												<descriptors>
-													<descriptor>${parcel.assembly.file}</descriptor>
-												</descriptors>
-												<finalName>blur-${project.version}.parcel</finalName>
-												<appendAssemblyId>false</appendAssemblyId>
-												<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
-											</configuration>
-										</execution>
-										<execution>
-											<id>distro-assembly-csd</id>
-											<phase>package</phase>
-											<goals>
-												<goal>single</goal>
-											</goals>
-											<configuration>
-												<descriptors>
-													<descriptor>${csd.assembly.file}</descriptor>
-												</descriptors>
-												<finalName>BLUR-${project.version}</finalName>
-												<appendAssemblyId>false</appendAssemblyId>
-											</configuration>
-										</execution>
 				</executions>
 			</plugin>
 		</plugins>
@@ -167,8 +108,42 @@ under the License.
 				</property>
 			</activation>
 			<properties>
-                <bin.assembly.file>src/assemble/bin-hadoop1.xml</bin.assembly.file>
+				<bin.assembly.file>src/assemble/bin-hadoop1.xml</bin.assembly.file>
 			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>distro-assembly-src</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<finalName>apache-blur-${project.parent.version}</finalName>
+									<descriptors>
+										<descriptor>src/assemble/src.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+							<execution>
+								<id>distro-assembly-bin</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>${bin.assembly.file}</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
 			<id>hadoop2-mr1</id>
@@ -178,8 +153,42 @@ under the License.
 				</property>
 			</activation>
 			<properties>
-                <bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
+				<bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
 			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>distro-assembly-src</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<finalName>apache-blur-${project.parent.version}</finalName>
+									<descriptors>
+										<descriptor>src/assemble/src.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+							<execution>
+								<id>distro-assembly-bin</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>${bin.assembly.file}</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 		<profile>
 			<id>hadoop2</id>
@@ -189,11 +198,73 @@ under the License.
 				</property>
 			</activation>
 			<properties>
-                <bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
-
-								<csd.assembly.file>src/assemble/csd-hadoop2.xml</csd.assembly.file>
-								<parcel.assembly.file>src/assemble/parcel-hadoop2.xml</parcel.assembly.file>
+				<bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file>
+				<csd.assembly.file>src/assemble/csd-hadoop2.xml</csd.assembly.file>
+				<parcel.assembly.file>src/assemble/parcel-hadoop2.xml</parcel.assembly.file>
 			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>distro-assembly-src</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<finalName>apache-blur-${project.parent.version}</finalName>
+									<descriptors>
+										<descriptor>src/assemble/src.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+							<execution>
+								<id>distro-assembly-bin</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>${bin.assembly.file}</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+							<execution>
+								<id>distro-assembly-parcel</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>${parcel.assembly.file}</descriptor>
+									</descriptors>
+									<finalName>blur-${project.version}.parcel</finalName>
+									<appendAssemblyId>false</appendAssemblyId>
+									<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+								</configuration>
+							</execution>
+							<execution>
+								<id>distro-assembly-csd</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>${csd.assembly.file}</descriptor>
+									</descriptors>
+									<finalName>BLUR-${project.version}</finalName>
+									<appendAssemblyId>false</appendAssemblyId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 	</profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/13b22b2f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 54cf474..d8bd7fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,96 +197,96 @@ under the License.
 		<commons-codec.version>1.9</commons-codec.version>
 	</properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-              <groupId>commons-logging</groupId>
-              <artifactId>commons-logging</artifactId>
-              <version>${commons-logging.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>commons-io</groupId>
-              <artifactId>commons-io</artifactId>
-              <version>2.1</version>
-            </dependency>
-            <dependency>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-webapp</artifactId>
-              <version>8.1.16.v20140903</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-jsp</artifactId>
-                <version>8.1.16.v20140903</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-test</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-client</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-minicluster</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>commons-logging</groupId>
+				<artifactId>commons-logging</artifactId>
+				<version>${commons-logging.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>2.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-webapp</artifactId>
+				<version>8.1.16.v20140903</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-jsp</artifactId>
+				<version>8.1.16.v20140903</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.hadoop</groupId>
+				<artifactId>hadoop-test</artifactId>
+				<version>${hadoop.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.hadoop</groupId>
+				<artifactId>hadoop-client</artifactId>
+				<version>${hadoop.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.hadoop</groupId>
+				<artifactId>hadoop-minicluster</artifactId>
+				<version>${hadoop.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.google.code.java-allocation-instrumenter</groupId>
 				<artifactId>java-allocation-instrumenter</artifactId>
 				<version>${java-allocation-instrumenter.version}</version>
 			</dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>${log4j.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.jms</groupId>
-                        <artifactId>jms</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>${zookeeper.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.jms</groupId>
-                        <artifactId>jms</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>${log4j.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.mail</groupId>
+						<artifactId>mail</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.jms</groupId>
+						<artifactId>jms</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.sun.jdmk</groupId>
+						<artifactId>jmxtools</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.sun.jmx</groupId>
+						<artifactId>jmxri</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.zookeeper</groupId>
+				<artifactId>zookeeper</artifactId>
+				<version>${zookeeper.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.mail</groupId>
+						<artifactId>mail</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.jms</groupId>
+						<artifactId>jms</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.sun.jdmk</groupId>
+						<artifactId>jmxtools</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.sun.jmx</groupId>
+						<artifactId>jmxri</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
@@ -333,10 +333,11 @@ under the License.
 						<exclude>**/.idea/**</exclude>
 						<exclude>**/*.iml</exclude>
 						<exclude>**/target/**</exclude>
-                        <exclude>**/build/**</exclude>
-                        <exclude>**/.codio</exclude>
+						<exclude>**/build/**</exclude>
+						<exclude>**/.codio</exclude>
 
-						<!-- These javascript libs are added at build time but are not included in the src
-->
+						<!-- These javascript libs are added at build time but are not included 
+							in the src -->
 						<exclude>**/src/main/webapp/libs/**</exclude>
 						<exclude>**/node_modules/**</exclude>
 
@@ -361,12 +362,12 @@ under the License.
 						<!-- Legacy blur console -->
 						<exclude>contrib/blur-console-v1/**</exclude>
 
-						<!-- Contains a list of english words that are used for load testing, adding a header
-						would make the simple parsers more complex -->
+						<!-- Contains a list of english words that are used for load testing, 
+							adding a header would make the simple parsers more complex -->
 						<exclude>**/src/main/resources/org/apache/blur/thrift/util/words.txt</exclude>
 
-						<!-- These javascript libs are accounted for in the
-						LICENSE file in root of the project -->
+						<!-- These javascript libs are accounted for in the LICENSE file in 
+							root of the project -->
 						<exclude>**/js/d3.v2.js</exclude>
 						<exclude>**/js/d3.v2.min.js</exclude>
 
@@ -381,11 +382,11 @@ under the License.
 						<exclude>**/src/main/scripts/interface/gen-html/index.html</exclude>
 
 						<!-- Used to create empty directories in git -->
-                        <exclude>**/.empty</exclude>
+						<exclude>**/.empty</exclude>
 
-                        <exclude>**/test/**/prop.doc.base.html</exclude>
-                        <exclude>**/parcel.json.template</exclude>
-                        <exclude>**/service.sdl.template</exclude>
+						<exclude>**/test/**/prop.doc.base.html</exclude>
+						<exclude>**/parcel.json.template</exclude>
+						<exclude>**/service.sdl.template</exclude>
 					</excludes>
 				</configuration>
 				<executions>
@@ -413,7 +414,8 @@ under the License.
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<configuration>
-						<argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g -XX:MaxPermSize=256m</argLine>
+						<argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g
+							-XX:MaxPermSize=256m</argLine>
 						<forkCount>2</forkCount>
 						<forkMode>always</forkMode>
 						<reuseForks>false</reuseForks>
@@ -496,7 +498,7 @@ under the License.
 			</activation>
 			<properties>
 				<hadoop.version>1.2.1</hadoop.version>
-                <projectVersion>hadoop1-${hadoop.version}-${project.parent.version}</projectVersion>
+				<projectVersion>hadoop1-${hadoop.version}-${project.parent.version}</projectVersion>
 			</properties>
 			<modules>
 				<module>blur-command</module>
@@ -524,7 +526,7 @@ under the License.
 			</activation>
 			<properties>
 				<hadoop.version>2.5.0-mr1-cdh5.3.0</hadoop.version>
-                <projectVersion>hadoop2-mr1-${hadoop.version}-${project.parent.version}</projectVersion>
+				<projectVersion>hadoop2-mr1-${hadoop.version}-${project.parent.version}</projectVersion>
 			</properties>
 			<modules>
 				<module>blur-command</module>
@@ -552,7 +554,7 @@ under the License.
 			</activation>
 			<properties>
 				<hadoop.version>2.6.0</hadoop.version>
-                <projectVersion>hadoop2-${hadoop.version}-${project.parent.version}</projectVersion>
+				<projectVersion>hadoop2-${hadoop.version}-${project.parent.version}</projectVersion>
 			</properties>
 			<modules>
 				<module>blur-command</module>


Mime
View raw message