Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #974 from metamx/fix-log4j 

update http client and fix log4j dependencies
This commit is contained in:
Charles Allen 2014-12-16 11:37:12 -08:00
parent be507b8cb4 882874ce60
commit ee81a29a72
3 changed files with 235 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
common/pom.xml
View File

@ -20,157 +20,157 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.druid</groupId>
<artifactId>druid-common</artifactId>
<name>druid-common</name>
<description>druid-common</description>
<parent>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid</artifactId> <artifactId>druid-common</artifactId>
<version>0.7.0-SNAPSHOT</version> <name>druid-common</name>
</parent> <description>druid-common</description>
<dependencies> <parent>
<dependency> <groupId>io.druid</groupId>
<groupId>com.metamx</groupId> <artifactId>druid</artifactId>
<artifactId>java-util</artifactId> <version>0.7.0-SNAPSHOT</version>
</dependency> </parent>
<dependency>
<groupId>io.druid</groupId>
<artifactId>druid-api</artifactId>
</dependency>
<dependency> <dependencies>
<groupId>commons-codec</groupId> <dependency>
<artifactId>commons-codec</artifactId> <groupId>com.metamx</groupId>
</dependency> <artifactId>java-util</artifactId>
<dependency> </dependency>
<groupId>org.apache.commons</groupId> <dependency>
<artifactId>commons-dbcp2</artifactId> <groupId>io.druid</groupId>
</dependency> <artifactId>druid-api</artifactId>
<dependency> </dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- Tests --> <dependency>
<dependency> <groupId>commons-codec</groupId>
<groupId>junit</groupId> <artifactId>commons-codec</artifactId>
<artifactId>junit</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>org.apache.commons</groupId>
<dependency> <artifactId>commons-dbcp2</artifactId>
<groupId>org.easymock</groupId> </dependency>
<artifactId>easymock</artifactId> <dependency>
<scope>test</scope> <groupId>commons-pool</groupId>
</dependency> <artifactId>commons-pool</artifactId>
<dependency> <version>1.6</version>
<groupId>com.metamx</groupId> </dependency>
<artifactId>java-util</artifactId> <dependency>
<type>test-jar</type> <groupId>org.skife.config</groupId>
<scope>test</scope> <artifactId>config-magic</artifactId>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<build> <!-- Tests -->
<plugins> <dependency>
<plugin> <groupId>junit</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>junit</artifactId>
<artifactId>maven-source-plugin</artifactId> <scope>test</scope>
<executions> </dependency>
<execution> <dependency>
<id>attach-sources</id> <groupId>org.easymock</groupId>
<goals> <artifactId>easymock</artifactId>
<goal>jar</goal> <scope>test</scope>
</goals> </dependency>
</execution> <dependency>
</executions> <groupId>com.metamx</groupId>
</plugin> <artifactId>java-util</artifactId>
<plugin> <type>test-jar</type>
<artifactId>maven-jar-plugin</artifactId> <scope>test</scope>
<executions> </dependency>
<execution> </dependencies>
<goals>
<goal>test-jar</goal> <build>
</goals> <plugins>
</execution> <plugin>
</executions> <groupId>org.apache.maven.plugins</groupId>
<configuration> <artifactId>maven-source-plugin</artifactId>
<archive> <executions>
<manifest> <execution>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <id>attach-sources</id>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <goals>
</manifest> <goal>jar</goal>
</archive> </goals>
</configuration> </execution>
</plugin> </executions>
</plugins> </plugin>
</build> <plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

167
extensions/s3-extensions/pom.xml
View File

@ -20,88 +20,93 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.druid.extensions</groupId> <groupId>io.druid.extensions</groupId>
<artifactId>druid-s3-extensions</artifactId> <artifactId>druid-s3-extensions</artifactId>
<name>druid-s3-extensions</name> <name>druid-s3-extensions</name>
<description>druid-s3-extensions</description> <description>druid-s3-extensions</description>
<parent> <parent>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>0.7.0-SNAPSHOT</version> <version>0.7.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.druid</groupId> <groupId>io.druid</groupId>
<artifactId>druid-api</artifactId> <artifactId>druid-api</artifactId>
</dependency> </dependency>
<!-- override jets3t from hadoop-core --> <!-- override jets3t from hadoop-core -->
<dependency> <dependency>
<groupId>net.java.dev.jets3t</groupId> <groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId> <artifactId>jets3t</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId> <artifactId>aws-java-sdk</artifactId>
</dependency> </dependency>
<!-- override httpclient / httpcore version from jets3t --> <!-- override httpclient / httpcore version from jets3t -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>emitter</artifactId> <artifactId>emitter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<!-- Tests --> <!-- Tests -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId> <artifactId>easymock</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> <dependency>
<build> <groupId>log4j</groupId>
<plugins> <artifactId>log4j</artifactId>
<plugin> <scope>test</scope>
<groupId>org.apache.maven.plugins</groupId> </dependency>
<artifactId>maven-source-plugin</artifactId> </dependencies>
<executions> <build>
<execution> <plugins>
<id>attach-sources</id> <plugin>
<goals> <groupId>org.apache.maven.plugins</groupId>
<goal>jar</goal> <artifactId>maven-source-plugin</artifactId>
</goals> <executions>
</execution> <execution>
</executions> <id>attach-sources</id>
</plugin> <goals>
<plugin> <goal>jar</goal>
<artifactId>maven-jar-plugin</artifactId> </goals>
<configuration> </execution>
<archive> </executions>
<manifest> </plugin>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries> <plugin>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> <artifactId>maven-jar-plugin</artifactId>
</manifest> <configuration>
</archive> <archive>
</configuration> <manifest>
</plugin> <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</plugins> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</build> </manifest>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

2
pom.xml
View File

@ -84,7 +84,7 @@
<dependency> <dependency>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>
<artifactId>http-client</artifactId> <artifactId>http-client</artifactId>
<version>0.9.7</version> <version>0.9.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.metamx</groupId> <groupId>com.metamx</groupId>