Skip to content

Commit

Permalink
Update to latest airbase, airlift and discovery
Browse files Browse the repository at this point in the history
  • Loading branch information
@electrum
electrum committed Feb 8, 2014
1 parent 5374db4 commit 7ec30b9
Show file tree
Hide file tree
Showing 9 changed files with 402 additions and 40 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>13</version>
<version>14</version>
</parent>

<groupId>com.facebook.presto</groupId>
Expand Down Expand Up @@ -40,7 +40,7 @@
<air.check.skip-license>false</air.check.skip-license>

<dep.antlr.version>3.4</dep.antlr.version>
<dep.airlift.version>0.84</dep.airlift.version>
<dep.airlift.version>0.85-SNAPSHOT</dep.airlift.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>

<cli.skip-execute>true</cli.skip-execute>
Expand Down Expand Up @@ -461,7 +461,7 @@
<dependency>
<groupId>io.airlift.discovery</groupId>
<artifactId>discovery-server</artifactId>
<version>1.16</version>
<version>1.17-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
10 changes: 10 additions & 0 deletions presto-cassandra/pom.xml
View file
Expand Up @@ -159,13 +159,23 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
59 changes: 30 additions & 29 deletions presto-jdbc/pom.xml
View file
Expand Up @@ -26,25 +26,17 @@
<groupId>io.airlift</groupId>
<artifactId>http-client</artifactId>
<exclusions>
<!-- airlift configuration annotations are needed, but bval and cglib are not -->
<!-- configuration is not used -->
<exclusion>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr303</artifactId>
</exclusion>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<groupId>io.airlift</groupId>
<artifactId>configuration</artifactId>
</exclusion>
<!-- trace-token is not used -->
<exclusion>
<groupId>io.airlift</groupId>
<artifactId>trace-token</artifactId>
</exclusion>
<!-- guice is not used -->
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
Expand All @@ -62,6 +54,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<!-- jmxutils is not used -->
<exclusion>
<groupId>org.weakref</groupId>
Expand All @@ -73,13 +69,6 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>units</artifactId>
<exclusions>
<exclusion>
<!-- TODO: fix in airlift to be a test dependency -->
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr303</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -90,11 +79,10 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<!-- TODO: fix in airlift to use TypeToken -->
<!--<exclusion>-->
<!--<groupId>com.google.inject</groupId>-->
<!--<artifactId>guice</artifactId>-->
<!--</exclusion>-->
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
Expand Down Expand Up @@ -156,6 +144,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand All @@ -178,16 +172,10 @@
<artifactSet>
<excludes>
<exclude>com.google.code.findbugs:annotations</exclude>
<!-- TODO: remove aopalliance and guice excludes here when excluded above -->
<exclude>aopalliance:aopalliance</exclude>
<exclude>javax.validation:validation-api</exclude>
</excludes>
</artifactSet>
<relocations>
<reloation>
<pattern>com.google.inject</pattern>
<shadedPattern>${shadeBase}.guice</shadedPattern>
</reloation>
<relocation>
<pattern>com.facebook.presto.client</pattern>
<shadedPattern>${shadeBase}.client</shadedPattern>
Expand All @@ -200,10 +188,22 @@
<pattern>com.google.common</pattern>
<shadedPattern>${shadeBase}.guava</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
<shadedPattern>${shadeBase}.guava</shadedPattern>
</relocation>
<relocation>
<pattern>io.airlift</pattern>
<shadedPattern>${shadeBase}.airlift</shadedPattern>
</relocation>
<relocation>
<pattern>javax.inject</pattern>
<shadedPattern>${shadeBase}.inject</shadedPattern>
</relocation>
<relocation>
<pattern>org.openjdk.jol</pattern>
<shadedPattern>${shadeBase}.jol</shadedPattern>
</relocation>
<relocation>
<pattern>org.jboss.netty</pattern>
<shadedPattern>${shadeBase}.netty</shadedPattern>
Expand All @@ -219,6 +219,7 @@
<excludes>
<exclude>META-INF/maven/**</exclude>
<exclude>META-INF/*.xml</exclude>
<exclude>LICENSE</exclude>
</excludes>
</filter>
<filter>
Expand Down

0 comments on commit 7ec30b9

Please sign in to comment.