You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2019/05/30 05:19:08 UTC

[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5231 Configurable Stats Cache (addendum)

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

larsh pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
     new 5f95d98  PHOENIX-5231 Configurable Stats Cache (addendum)
5f95d98 is described below

commit 5f95d982bcc309390b91d7b8760184ab2a14ae90
Author: Vincent Poon <vi...@apache.org>
AuthorDate: Wed May 29 11:27:39 2019 -0700

    PHOENIX-5231 Configurable Stats Cache (addendum)
    
    This addendum fixes the missing META-INF/services file org.apache.phoenix.query.GuidePostsCacheFactory
---
 phoenix-core/pom.xml                                         | 12 +-----------
 .../main/resources/{ => META-INF/services}/java.sql.Driver   |  0
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index be677dd..348fa20 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -16,16 +16,6 @@
   </properties>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <targetPath>META-INF/services</targetPath>
-        <includes>
-          <include>java.sql.Driver</include>
-        </includes>
-      </resource>
-    </resources>
-
     <plugins>
       <!-- Add the ant-generated sources to the source path -->
      <plugin>
@@ -173,7 +163,7 @@
         <configuration>
           <excludes>
             <exclude>src/main/java/org/apache/phoenix/coprocessor/generated/*.java</exclude>
-            <exclude>src/main/resources/java.sql.Driver</exclude>
+            <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/phoenix-core/src/main/resources/java.sql.Driver b/phoenix-core/src/main/resources/META-INF/services/java.sql.Driver
similarity index 100%
rename from phoenix-core/src/main/resources/java.sql.Driver
rename to phoenix-core/src/main/resources/META-INF/services/java.sql.Driver