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 2021/02/03 18:22:57 UTC

[phoenix] branch 5.1 updated (27858a6 -> cad3538)

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a change to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git.


    from 27858a6  Preparing phoenix release 5.1.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md
     new d662da1  PHOENIX-6350: Fix build failure due to jakarta.xml.bind api
     new cad3538  PHOENIX-6360 phoenix-core has compile dependency on phoenix-hbase-compat

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 phoenix-assembly/src/build/components/all-common-dependencies.xml | 2 ++
 phoenix-client-parent/pom.xml                                     | 5 +++++
 phoenix-core/pom.xml                                              | 1 +
 phoenix-pherf/pom.xml                                             | 5 +++++
 phoenix-server/pom.xml                                            | 5 +++++
 5 files changed, 18 insertions(+)


[phoenix] 02/02: PHOENIX-6360 phoenix-core has compile dependency on phoenix-hbase-compat

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit cad3538de278d4ade4f20b5de57a008e3e223e4c
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Feb 3 12:49:14 2021 +0100

    PHOENIX-6360 phoenix-core has compile dependency on phoenix-hbase-compat
    
    remove duplicate dependency
---
 phoenix-assembly/src/build/components/all-common-dependencies.xml | 2 ++
 phoenix-client-parent/pom.xml                                     | 5 +++++
 phoenix-core/pom.xml                                              | 1 +
 phoenix-server/pom.xml                                            | 5 +++++
 4 files changed, 13 insertions(+)

diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 63ffdf7..e5e530a 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -28,6 +28,8 @@
       <unpack>false</unpack>
       <outputDirectory>/lib</outputDirectory>
       <includes>
+        <include>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</include>
+
         <include>commons-configuration:commons-configuration</include>
         <include>commons-io:commons-io</include>
         <include>commons-lang:commons-lang</include>
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index d6a83ac..0071dc6 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -280,6 +280,11 @@
       <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-log4j12</artifactId>
       <scope>runtime</scope>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 4fc0711..7395219 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -230,6 +230,7 @@
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+      <optional>true</optional>
     </dependency>
     <!-- Hadoop dependencies -->
     <dependency>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index fd80e87..9c15eca 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -288,6 +288,11 @@
       <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>
     <!-- hbase's classpath will provide these, mark them as provided to prevent
          them, and their transitive dependencies, from being included in the
          shaded jar. -->


[phoenix] 01/02: PHOENIX-6350: Fix build failure due to jakarta.xml.bind api

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit d662da161530529fdb714c77c1d1574cd3702540
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Feb 3 08:17:41 2021 +0100

    PHOENIX-6350: Fix build failure due to jakarta.xml.bind api
    
    Co-authored-by: Suraj Naik <su...@gmail.com>
---
 phoenix-pherf/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index d291be0..6dc8ab4 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -247,6 +247,11 @@
               org.apache.hbase:hbase-it
             </ignoredUnusedDeclaredDependency>
           </ignoredUnusedDeclaredDependencies>
+          <ignoredUsedUndeclaredDependencies>
+            <ignoredUsedUndeclaredDependency>
+              jakarta.xml.bind:jakarta.xml.bind-api
+            </ignoredUsedUndeclaredDependency>
+          </ignoredUsedUndeclaredDependencies>
         </configuration>
       </plugin>