Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 8bef9e6dc -> d075f1cc9
PHOENIX-2365 Remove Pherf uber jar and create python scripts to execute from Phoenix bin directory (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d075f1cc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d075f1cc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d075f1cc Branch: refs/heads/4.x-HBase-0.98 Commit: d075f1cc999156fca7a6d5352baf3bebb549a17b Parents: 8bef9e6 Author: Mujtaba <mujt...@apache.org> Authored: Fri Nov 20 11:01:00 2015 -0800 Committer: Mujtaba <mujt...@apache.org> Committed: Fri Nov 20 11:01:00 2015 -0800 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 2 - .../src/build/server-without-antlr.xml | 44 ----------------- phoenix-pherf/pom.xml | 17 ------- phoenix-pherf/src/main/assembly/standalone.xml | 51 -------------------- 4 files changed, 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d075f1cc/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index d3dd8e7..7559688 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -81,8 +81,6 @@ <descriptor>src/build/client-minimal.xml</descriptor> <!-- build the phoenix server side jar, that includes phoenix-hadoopX-compat, phoenix-hadoop-compat and antlr --> <descriptor>src/build/server.xml</descriptor> - <!-- build the phoenix server side jar, that includes phoenix-hadoopX-compat and phoenix-hadoop-compat. --> - <descriptor>src/build/server-without-antlr.xml</descriptor> </descriptors> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/phoenix/blob/d075f1cc/phoenix-assembly/src/build/server-without-antlr.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/server-without-antlr.xml b/phoenix-assembly/src/build/server-without-antlr.xml deleted file mode 100644 index 072ade0..0000000 --- a/phoenix-assembly/src/build/server-without-antlr.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version='1.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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> - <!-- build the phoenix server side jar, that includes phoenix-hadoopX-compat and phoenix-hadoop-compat. --> - <id>server-without-antlr</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <outputDirectory>/</outputDirectory> - <unpack>true</unpack> - <includes> - <include>org.apache.phoenix:phoenix-core</include> - <include>org.iq80.snappy:snappy</include> - <include>org.jruby.joni:joni</include> - <include>org.jruby.jcodings:jcodings</include> - </includes> - </dependencySet> - </dependencySets> -</assembly> http://git-wip-us.apache.org/repos/asf/phoenix/blob/d075f1cc/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index b181bef..94e6166 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -159,23 +159,6 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>make-dependency-jar</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <mainClass>org.apache.phoenix.pherf.Pherf</mainClass> - </manifest> - </archive> - </configuration> - </execution> - <execution> <id>make-assembly</id> <phase>package</phase> <goals> http://git-wip-us.apache.org/repos/asf/phoenix/blob/d075f1cc/phoenix-pherf/src/main/assembly/standalone.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/assembly/standalone.xml b/phoenix-pherf/src/main/assembly/standalone.xml deleted file mode 100644 index dfeb921..0000000 --- a/phoenix-pherf/src/main/assembly/standalone.xml +++ /dev/null @@ -1,51 +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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>standalone</id> - <baseDirectory>/</baseDirectory> - <formats> - <format>zip</format> - </formats> - <fileSets> - <fileSet> - <directory>${project.basedir}/config</directory> - <outputDirectory>pherf-${project.version}-standalone/config</outputDirectory> - <includes> - <include>*/*</include> - <include>*</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/standalone</directory> - <outputDirectory>pherf-${project.version}-standalone/</outputDirectory> - <includes> - <include>*sh</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.build.directory}</directory> - <outputDirectory>pherf-${project.version}-standalone/lib</outputDirectory> - <includes> - <include>*dependencies.jar</include> - </includes> - </fileSet> - </fileSets> -</assembly>
