This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 9e20c20 PHOENIX-5624 Clean up PQS and connectors remains from build
9e20c20 is described below
commit 9e20c20f6b51c83f001fa5ea901e7db44480d189
Author: Tóth István <st...@stoty.hu>
AuthorDate: Mon Dec 16 19:27:04 2019 +0100
PHOENIX-5624 Clean up PQS and connectors remains from build
---
examples/pig/test.pig | 19 ----
examples/pig/testdata | 18 ----
.../build/components/all-common-dependencies.xml | 1 -
.../src/build/components/all-common-jars.xml | 100 ---------------------
pom.xml | 87 ------------------
5 files changed, 225 deletions(-)
diff --git a/examples/pig/test.pig b/examples/pig/test.pig
deleted file mode 100644
index 6835d00..0000000
--- a/examples/pig/test.pig
+++ /dev/null
@@ -1,19 +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.
- */
-
-A = load 'examples/pig/testdata' as (a:chararray, b:chararray, c:int,
d:chararray, e: datetime) ;
-STORE A into 'hbase://TESTPHX' using
org.apache.phoenix.pig.PhoenixHBaseStorage('localhost','-batchSize 1000');
diff --git a/examples/pig/testdata b/examples/pig/testdata
deleted file mode 100644
index 15f3f0b..0000000
--- a/examples/pig/testdata
+++ /dev/null
@@ -1,18 +0,0 @@
-00D300000000XHP 124 123456 weq 2012-12-12
-00D300000000XHP 111 123456 nab 2012-01-21
-00D300000000UIH 101 123456 ben 2014-01-01
-00D300000000XHP 124 123456 weq 2012-12-12
-00D300000000XHP 111 123456 nab 2012-01-21
-00D300000000UIH 101 123456 ben 2014-01-01
-00D300000000XHP 124 123456 weq 2012-12-12
-00D300000000XHP 111 123456 nab 2012-01-21
-00D300000000UIH 101 123456 ben 2014-01-01
-00D300000000XHP 124 123456 weq 2012-12-12
-00D300000000XHP 111 123456 nab 2012-01-21
-00D300000000UIH 101 123456 ben 2014-01-01
-00D300000000XHP 124 123456 weq 2012-12-12
-00D300000000XHP 111 123456 nab 2012-01-21
-00D300000000UIH 101 123456 ben 2014-01-01
-00D300000000XHP 124 123456 weq 2012-12-12
-00D300000000XHP 111 123456 nab 2012-01-21
-00D300000000UIH 101 123456 ben 2014-01-01
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index c506bbb..45efee4 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -46,7 +46,6 @@
<include>org.cloudera.htrace:htrace-core</include>
<include>io.netty:netty</include>
<include>commons-codec:commons-codec</include>
- <include>org.apache.calcite:calcite-avatica*</include>
<!-- For omid TSO -->
<include>org.apache.omid:omid-tso-server-hbase2.x</include>
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index d7e8735..a3a0c7e 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -39,30 +39,6 @@
<include>phoenix-*-server.jar</include>
</includes>
</fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-queryserver/target/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>phoenix-*-queryserver.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../phoenix-queryserver-client/target/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>phoenix-*-thin-client.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-hive/target/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>phoenix-*-hive.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
<!-- This is only necessary until maven fixes the intra-project dependency
bug
in maven 3.0. Until then, we have to include the jars for sub-projects
explicitly.
@@ -77,38 +53,6 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../phoenix-pig/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-pig*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-pig/target/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>phoenix-*-pig.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-flume/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-kafka/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../phoenix-core/target/</directory>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -117,42 +61,6 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../phoenix-spark/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-queryserver/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-queryserver-*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-hive/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-hive-*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
-
<directory>${project.basedir}/../phoenix-queryserver-client/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <excludes>
- <!-- this one goes in project root instead -->
- <exclude>phoenix-*-thin-client.jar</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../phoenix-pherf/target/</directory>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -160,13 +68,5 @@
</includes>
<fileMode>0644</fileMode>
</fileSet>
- <fileSet>
-
<directory>${project.basedir}/../phoenix-load-balancer/target/</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>phoenix-*.jar</include>
- </includes>
- <fileMode>0644</fileMode>
- </fileSet>
</fileSets>
</component>
diff --git a/pom.xml b/pom.xml
index 1dd4c19..3c73d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,8 +80,6 @@
<!-- Dependency versions -->
<commons-cli.version>1.4</commons-cli.version>
- <hive.version>3.0.0</hive.version>
- <pig.version>0.13.0</pig.version>
<jackson.version>1.9.2</jackson.version>
<antlr.version>3.5.2</antlr.version>
<log4j.version>1.2.17</log4j.version>
@@ -94,8 +92,6 @@
<commons-csv.version>1.0</commons-csv.version>
<sqlline.version>1.7.0</sqlline.version>
<guava.version>13.0.1</guava.version>
- <flume.version>1.4.0</flume.version>
- <kafka.version>0.9.0.0</kafka.version>
<findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
<jcip-annotations.version>1.0-1</jcip-annotations.version>
<jline.version>2.11</jline.version>
@@ -106,13 +102,9 @@
<!-- Do not change jodatime.version until HBASE-15199 is fixed -->
<jodatime.version>1.6</jodatime.version>
<joni.version>2.1.2</joni.version>
- <avatica.version>1.12.0</avatica.version>
<jetty.version>9.3.27.v20190418</jetty.version>
<tephra.version>0.15.0-incubating</tephra.version>
<omid.version>1.0.1</omid.version>
- <spark.version>2.4.0</spark.version>
- <scala.version>2.11.8</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
<stream.version>2.9.5</stream.version>
<i18n-util.version>1.0.4</i18n-util.version>
<servlet.api.version>3.1.0</servlet.api.version>
@@ -473,7 +465,6 @@
<!-- Exclude SQL files from rat. Sqlline 1.1.9 doesn't work with
comments on the first line of a file. -->
<exclude>examples/*.sql</exclude>
- <exclude>examples/pig/testdata</exclude>
<!-- precommit? -->
<exclude>**/patchprocess/**</exclude>
<!-- Argparse is bundled to work around system Python version
@@ -515,36 +506,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-flume</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-kafka</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-pig</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-spark</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver-client</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- HBase dependencies -->
<dependency>
@@ -739,35 +700,6 @@
<version>${hadoop.version}</version>
</dependency>
- <!-- General Dependencies -->
- <dependency>
- <groupId>org.apache.pig</groupId>
- <artifactId>pig</artifactId>
- <version>${pig.version}</version>
- <classifier>h2</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-core</artifactId>
- <version>${avatica.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.calcite.avatica</groupId>
- <artifactId>avatica-server</artifactId>
- <version>${avatica.version}</version>
- </dependency>
-
<!-- Transaction dependencies -->
<dependency>
<groupId>org.apache.tephra</groupId>
@@ -884,17 +816,6 @@
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-core</artifactId>
- <version>${flume.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
<version>${findbugs-annotations.version}</version>
@@ -1091,14 +1012,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>spark16</id>
- <properties>
- <spark.version>1.6.1</spark.version>
- <scala.version>2.10.4</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
- </properties>
- </profile>
</profiles>
<reporting>
