Skip to content

Commit

Permalink
Cleanup pom files. Partial application of DRILL-36 patches.
Browse files Browse the repository at this point in the history 
Should fix DRILL-36, DRILL-43
  • Loading branch information
@jacques-n
jacques-n committed Mar 1, 2013
1 parent 3e45f42 commit cb3132a
Show file tree
Hide file tree
Showing 12 changed files with 333 additions and 223 deletions.
38 changes: 3 additions & 35 deletions sandbox/prototype/common/pom.xml
View file
Expand Up @@ -8,13 +8,11 @@
<groupId>org.apache.drill</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>common</artifactId>
<packaging>jar</packaging>
<name>common</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>

<dependency>
Expand All @@ -23,30 +21,11 @@
<version>2.4.1</version>
</dependency>

<!-- <dependency> -->
<!-- <groupId>org.apache.hadoop</groupId> -->
<!-- <artifactId>hadoop-core</artifactId> -->
<!-- <version>1.1.0</version> -->
<!-- </dependency> -->

<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.7</version>
<scope>provided</scope>
</dependency>

<dependency>
<version>1.7.2</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -66,12 +45,6 @@
<version>0.9.8</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>13.0.1</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand All @@ -92,12 +65,7 @@
<artifactId>antlr-runtime</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>


</dependencies>

Expand Down
46 changes: 46 additions & 0 deletions sandbox/prototype/common/src/test/resources/logback.xml
View file
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
<Compressing>true</Compressing>
<ReconnectionDelay>10000</ReconnectionDelay>
<IncludeCallerData>true</IncludeCallerData>
<RemoteHosts>localhost</RemoteHosts>
</appender>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>/logs/test-common.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- daily rollover -->
<fileNamePattern>/logs/test-common.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- keep 30 days' worth of history -->
<maxHistory>30</maxHistory>
</rollingPolicy>
</appender>

<logger name="org.apache.drill" additivity="false">
<level value="debug" />
<appender-ref ref="SOCKET" />
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</logger>

<root>
<level value="error" />
<appender-ref ref="SOCKET" />
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</root>

</configuration>
12 changes: 2 additions & 10 deletions sandbox/prototype/contrib/pom.xml
View file
Expand Up @@ -10,17 +10,9 @@
<groupId>org.apache.drill.contrib</groupId>
<artifactId>contrib-parent</artifactId>
<packaging>pom</packaging>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>

</dependencies>
<modules>
<module>storage-hbase</module>
Expand Down
13 changes: 3 additions & 10 deletions sandbox/prototype/contrib/storage-hbase/pom.xml
View file
Expand Up @@ -7,18 +7,11 @@
<groupId>org.apache.drill.contrib</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>storage-hbase</artifactId>

<name>pom</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
11 changes: 1 addition & 10 deletions sandbox/prototype/exec/java-exec/pom.xml
View file
Expand Up @@ -9,16 +9,7 @@
</parent>
<artifactId>java-exec</artifactId>
<name>java-exec</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
12 changes: 2 additions & 10 deletions sandbox/prototype/exec/pom.xml
View file
Expand Up @@ -6,21 +6,13 @@
<groupId>org.apache.drill</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.drill.exec</groupId>
<artifactId>exec-parent</artifactId>
<packaging>pom</packaging>
<name>exec</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>java-exec</module>
Expand Down
80 changes: 15 additions & 65 deletions sandbox/prototype/exec/ref/pom.xml
View file
Expand Up @@ -8,92 +8,42 @@
<groupId>org.apache.drill.exec</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>ref</artifactId>

<name>Logical Plan Execution Reference Implementation</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<dep.slf4j.version>1.7.2</dep.slf4j.version>
</properties>
<dependencies>

<dependency>
<groupId>org.apache.drill</groupId>
<artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>1.1.0</version>
<exclusions>
<exclusion>
<artifactId>jets3t</artifactId>
<groupId>net.java.dev.jets3t</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.7</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${dep.slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${dep.slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${dep.slf4j.version}</version>
</dependency>

<dependency>
<groupId>de.huxhorn.lilith</groupId>
<artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId>
<version>0.9.42.1</version>
</dependency>

<dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>hppc</artifactId>
<version>0.4.2</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</dependencies>

</build>

</project>
46 changes: 46 additions & 0 deletions sandbox/prototype/exec/ref/src/test/resources/logback.xml
View file
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>

<appender name="SOCKET" class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
<Compressing>true</Compressing>
<ReconnectionDelay>10000</ReconnectionDelay>
<IncludeCallerData>true</IncludeCallerData>
<RemoteHosts>localhost</RemoteHosts>
</appender>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>/logs/test-ref.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- daily rollover -->
<fileNamePattern>/logs/test-ref.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- keep 30 days' worth of history -->
<maxHistory>30</maxHistory>
</rollingPolicy>
</appender>

<logger name="org.apache.drill" additivity="false">
<level value="debug" />
<appender-ref ref="SOCKET" />
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</logger>

<root>
<level value="error" />
<appender-ref ref="SOCKET" />
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</root>

</configuration>
13 changes: 3 additions & 10 deletions sandbox/prototype/planner/pom.xml
View file
Expand Up @@ -8,17 +8,10 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>planner</artifactId>

<name>planner</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>

0 comments on commit cb3132a

Please sign in to comment.