You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/10/23 19:47:41 UTC
[6/6] calcite git commit: [CALCITE-1463] standalone-server needs to
relocate dependencies itself
[CALCITE-1463] standalone-server needs to relocate dependencies itself
Using the avatica-core (instead of the shaded avatica artifact), the standalone
server shaded artifact must bundle and relocate its artifacts on its own.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/2438d53e
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/2438d53e
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/2438d53e
Branch: refs/heads/master
Commit: 2438d53e58e0992b2ab9cc45d1fd631b8bcffec5
Parents: 221d180
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 23 15:42:09 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 23 15:42:09 2016 -0400
----------------------------------------------------------------------
avatica/standalone-server/pom.xml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/2438d53e/avatica/standalone-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/standalone-server/pom.xml b/avatica/standalone-server/pom.xml
index 8cb4719..ab36a00 100644
--- a/avatica/standalone-server/pom.xml
+++ b/avatica/standalone-server/pom.xml
@@ -143,13 +143,6 @@ limitations under the License.
<goal>shade</goal>
</goals>
<configuration>
- <artifactSet>
- <excludes>
- <exclude>com.google.protobuf:protobuf-java</exclude>
- <exclude>org.apache.httpcomponents:*</exclude>
- <exclude>commons-codec:commons-codec</exclude>
- </excludes>
- </artifactSet>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
@@ -165,6 +158,10 @@ limitations under the License.
<shadedPattern>org.apache.calcite.avatica.hsqldb.shaded.com.google.common</shadedPattern>
</relocation>
<relocation>
+ <pattern>com.google.protobuf</pattern>
+ <shadedPattern>org.apache.calcite.avatica.hsqldb.shaded.com.google.protobuf</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>javax.servlet</pattern>
<shadedPattern>org.apache.calcite.avatica.hsqldb.shaded.javax.servlet</shadedPattern>
</relocation>
@@ -188,6 +185,14 @@ limitations under the License.
<pattern>org.slf4j</pattern>
<shadedPattern>org.apache.calcite.avatica.hsqldb.shaded.org.slf4j</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.http</pattern>
+ <shadedPattern>org.apache.calcite.avatica.hsqldb.shaded.org.apache.http</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+ <shadedPattern>org.apache.calcite.avatica.hsqldb.shaded.org.apache.commons</shadedPattern>
+ </relocation>
</relocations>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>