phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject git commit: PHOENIX-876 Remove unnecessary phoenix-*-mapreduce.jar (GabrielReid)
Date Wed, 19 Mar 2014 16:48:26 GMT
Repository: incubator-phoenix
Updated Branches:
  refs/heads/4.0 bf52e7cd4 -> 9f18f4e0f


PHOENIX-876 Remove unnecessary phoenix-*-mapreduce.jar (GabrielReid)


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/9f18f4e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/9f18f4e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/9f18f4e0

Branch: refs/heads/4.0
Commit: 9f18f4e0f56f2306e72a3e5942bf76a538ed86f1
Parents: bf52e7c
Author: James Taylor <jamestaylor@apache.org>
Authored: Wed Mar 19 09:48:06 2014 -0700
Committer: James Taylor <jamestaylor@apache.org>
Committed: Wed Mar 19 09:48:06 2014 -0700

----------------------------------------------------------------------
 phoenix-assembly/pom.xml                 | 21 -------------
 phoenix-assembly/src/build/mapreduce.xml | 44 ---------------------------
 2 files changed, 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/9f18f4e0/phoenix-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 1ad5e40..7e9c6ba 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -51,7 +51,6 @@
                 <index>true</index>
                 <manifest>
                   <addClasspath>true</addClasspath>
-                  <mainClass>org.apache.phoenix.util.PhoenixRuntime</mainClass>
                   <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                   <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                 </manifest>
@@ -62,26 +61,6 @@
             </configuration>
           </execution>
           <execution>
-            <id>mapreduce-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <finalName>phoenix-${project.version}</finalName>
-              <attach>false</attach>
-              <appendAssemblyId>true</appendAssemblyId>
-              <descriptors>
-                <descriptor>src/build/mapreduce.xml</descriptor>
-              </descriptors>
-              <archive>
-                <manifest>
-                  <mainClass>org.apache.phoenix.mapreduce.CsvBulkLoadTool</mainClass>
-                </manifest>
-              </archive>
-            </configuration>
-          </execution>
-          <execution>
             <id>package-to-tar</id>
             <phase>package</phase>
             <goals>

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/9f18f4e0/phoenix-assembly/src/build/mapreduce.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/mapreduce.xml b/phoenix-assembly/src/build/mapreduce.xml
deleted file mode 100644
index 1e36748..0000000
--- a/phoenix-assembly/src/build/mapreduce.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<assembly>
-  <id>mapreduce</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <outputDirectory>lib</outputDirectory>
-      <excludes>
-        <exclude>${groupId}:phoenix-*</exclude>
-      </excludes>
-    </dependencySet>
-    <dependencySet>
-      <unpack>true</unpack>
-      <includes>
-        <include>${groupId}:phoenix-core</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file


Mime
View raw message