Repository: phoenix Updated Branches: refs/heads/master b8faae52c -> 6aa4cc61a
PHOENIX-2472 Modify pom to include tephra dependencies in server jar Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6aa4cc61 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6aa4cc61 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6aa4cc61 Branch: refs/heads/master Commit: 6aa4cc61a50976c2406e3c0a53b0ecd6d69496e4 Parents: b8faae5 Author: Thomas D'Silva <[email protected]> Authored: Tue Dec 1 11:10:54 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Wed Dec 2 12:11:27 2015 -0800 ---------------------------------------------------------------------- bin/tephra | 0 phoenix-assembly/src/build/server-with-txns.xml | 48 -------------------- .../src/build/server-without-antlr.xml | 46 ------------------- phoenix-assembly/src/build/server.xml | 4 ++ 4 files changed, 4 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6aa4cc61/bin/tephra ---------------------------------------------------------------------- diff --git a/bin/tephra b/bin/tephra old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/phoenix/blob/6aa4cc61/phoenix-assembly/src/build/server-with-txns.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/server-with-txns.xml b/phoenix-assembly/src/build/server-with-txns.xml deleted file mode 100644 index 2808a8c..0000000 --- a/phoenix-assembly/src/build/server-with-txns.xml +++ /dev/null @@ -1,48 +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, phoenix-hadoop-compat and antlr --> - <id>server-with-txns</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.antlr:antlr*</include> - <include>co.cask.tephra:tephra*</include> - <include>com.google.code.gson:gson</include> - <include>com.google.inject.extensions:guice-assistedinject</include> - <include>it.unimi.dsi:fastutil</include> - <include>io.dropwizard.metrics:metrics-core</include> - </includes> - </dependencySet> - </dependencySets> -</assembly> http://git-wip-us.apache.org/repos/asf/phoenix/blob/6aa4cc61/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 33cf0b7..0000000 --- a/phoenix-assembly/src/build/server-without-antlr.xml +++ /dev/null @@ -1,46 +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>co.cask.tephra:tephra*</include> - <include>com.google.code.gson:gson</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/6aa4cc61/phoenix-assembly/src/build/server.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml index 141f97b..ef79486 100644 --- a/phoenix-assembly/src/build/server.xml +++ b/phoenix-assembly/src/build/server.xml @@ -42,6 +42,10 @@ <include>org.jruby.joni:joni</include> <include>org.jruby.jcodings:jcodings</include> <include>joda-time:joda-time</include> + <include>org.apache.twill:twill*</include> + <include>com.google.inject.extensions:guice-assistedinject</include> + <include>it.unimi.dsi:fastutil</include> + <include>io.dropwizard.metrics:metrics-core</include> </includes> </dependencySet> </dependencySets>
