Skip to content

Commit

Permalink
PHOENIX-5624 Clean up PQS and connectors remains from build
Browse files Browse the repository at this point in the history
  • Loading branch information
@stoty
stoty committed Dec 17, 2019
1 parent 7dd6011 commit 9e20c20
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 225 deletions.
19 changes: 0 additions & 19 deletions examples/pig/test.pig
View file

This file was deleted.

18 changes: 0 additions & 18 deletions examples/pig/testdata
View file

This file was deleted.

1 change: 0 additions & 1 deletion phoenix-assembly/src/build/components/all-common-dependencies.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
100 changes: 0 additions & 100 deletions phoenix-assembly/src/build/components/all-common-jars.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -76,38 +52,6 @@
</includes>
<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>
Expand All @@ -116,42 +60,6 @@
</includes>
<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>
Expand All @@ -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>
87 changes: 0 additions & 87 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -883,17 +815,6 @@
<artifactId>guava</artifactId>
<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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 9e20c20

Please sign in to comment.