You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2022/04/29 05:51:26 UTC
[phoenix] branch master updated: PHOENIX-6696 Drop legacy phoenix-client jar
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 f9f91f0b48 PHOENIX-6696 Drop legacy phoenix-client jar
f9f91f0b48 is described below
commit f9f91f0b487a866a9b4b9c46bae3d90fdb91a5c6
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Apr 27 08:05:57 2022 +0200
PHOENIX-6696 Drop legacy phoenix-client jar
---
phoenix-assembly/pom.xml | 25 ------
.../src/build/components/all-common-jars.xml | 16 ----
phoenix-client-parent/phoenix-client/pom.xml | 94 ----------------------
pom.xml | 26 ------
4 files changed, 161 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 00d95ff7fe..8c69d861fd 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -40,27 +40,6 @@
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
- <execution>
- <id>client without version</id>
- <phase>compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>ln</executable>
- <workingDirectory>${project.basedir}/../phoenix-client-parent/phoenix-client/target</workingDirectory>
- <arguments>
- <argument>-fnsv</argument>
- <argument>
- phoenix-client-${hbase.suffix}-${project.version}.jar
- </argument>
- <argument>
- <!-- We are overwriting the unshaded client JAR, but we don't care -->
- phoenix-client-${hbase.suffix}.jar
- </argument>
- </arguments>
- </configuration>
- </execution>
<execution>
<id>embedded client without version</id>
<phase>compile</phase>
@@ -168,10 +147,6 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-server-${hbase.suffix}</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-${hbase.suffix}</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-${hbase.suffix}</artifactId>
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml b/phoenix-assembly/src/build/components/all-common-jars.xml
index 4afb7e683c..1a6abd3193 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -23,14 +23,6 @@
<fileSets>
<!-- Add the client & mapreduce jars. Expects the client jar packaging phase to already be run,
which is determined by specification order in the pom. -->
- <fileSet>
- <directory>${project.basedir}/../phoenix-client-parent/phoenix-client/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>phoenix-client-${hbase.suffix}-${project.version}.jar</include>
- <include>phoenix-client-${hbase.suffix}.jar</include>
- </includes>
- </fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-client-parent/phoenix-client-embedded/target</directory>
<outputDirectory>/</outputDirectory>
@@ -55,13 +47,5 @@
<include>phoenix-pherf.jar</include>
</includes>
</fileSet>
- <fileSet>
- <directory>${project.basedir}/../phoenix-tools/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>phoenix-tools-${project.version}.jar</include>
- <include>phoenix-tools.jar</include>
- </includes>
- </fileSet>
</fileSets>
</component>
diff --git a/phoenix-client-parent/phoenix-client/pom.xml b/phoenix-client-parent/phoenix-client/pom.xml
deleted file mode 100644
index 415b4fd79f..0000000000
--- a/phoenix-client-parent/phoenix-client/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-parent</artifactId>
- <version>5.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>phoenix-client-${hbase.suffix}</artifactId>
- <name>Phoenix Client</name>
- <description>Phoenix Client</description>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>default-shaded</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <shadeTestJar>false</shadeTestJar>
- <createSourcesJar>true</createSourcesJar>
- <dependencyReducedPomLocation>${basedir}/target/pom.xml</dependencyReducedPomLocation>
- <artifactSet>
- <includes>
- <include>*:*</include>
- </includes>
- <excludes>
- <exclude>org.apache.phoenix:phoenix-client</exclude>
- <exclude>xom:xom</exclude>
- </excludes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- These must not be moved to phoenix-client-parent, see PHOENIX-6377 -->
- <!-- Depend on all other internal projects -->
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-reload4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>sqlline</groupId>
- <artifactId>sqlline</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/pom.xml b/pom.xml
index 3c0ea72316..35fc769399 100644
--- a/pom.xml
+++ b/pom.xml
@@ -638,31 +638,6 @@
<artifactId>phoenix-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-hbase-2.1</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-hbase-2.2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-hbase-2.3</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-hbase-2.4.0</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-hbase-2.4</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-hbase-2.1</artifactId>
@@ -1519,7 +1494,6 @@
</activation>
<modules>
<module>phoenix-client-parent</module>
- <module>phoenix-client-parent/phoenix-client</module>
<module>phoenix-client-parent/phoenix-client-embedded</module>
<module>phoenix-server</module>
<module>phoenix-assembly</module>