Repository: phoenix Updated Branches: refs/heads/master f4ef42d69 -> bca79af4a
PHOENIX-1262 Generate phoenix-server jar with and without antlr Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/bca79af4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bca79af4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bca79af4 Branch: refs/heads/master Commit: bca79af4a563df30ec2ff4acb57c74e02b70ac2e Parents: f4ef42d Author: Mujtaba <mujt...@apache.org> Authored: Fri Sep 19 11:39:29 2014 -0700 Committer: Mujtaba <mujt...@apache.org> Committed: Fri Sep 19 11:39:29 2014 -0700 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 4 +- .../src/build/server-without-antlr.xml | 42 ++++++++++++++++++++ phoenix-assembly/src/build/server.xml | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/bca79af4/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 4921731..4bac3e8 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -107,8 +107,10 @@ <descriptor>src/build/client-without-hbase.xml</descriptor> <!-- build the phoenix client jar, but without HBase (or its depenencies). --> <descriptor>src/build/client-minimal.xml</descriptor> - <!-- build the phoenix server side jar, that includes phoenix-hadoopX-compat and phoenix-hadoop-compat. --> + <!-- 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/bca79af4/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 new file mode 100644 index 0000000..78977ac --- /dev/null +++ b/phoenix-assembly/src/build/server-without-antlr.xml @@ -0,0 +1,42 @@ +<?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.apache.phoenix:phoenix-hadoop*</include> + </includes> + </dependencySet> + </dependencySets> +</assembly> http://git-wip-us.apache.org/repos/asf/phoenix/blob/bca79af4/phoenix-assembly/src/build/server.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml index 9300528..bc656e5 100644 --- a/phoenix-assembly/src/build/server.xml +++ b/phoenix-assembly/src/build/server.xml @@ -23,7 +23,7 @@ <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. --> + <!-- build the phoenix server side jar, that includes phoenix-hadoopX-compat, phoenix-hadoop-compat and antlr --> <id>server</id> <formats> <format>jar</format>
