Add git.properties to build for reference purposes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/6572f7c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/6572f7c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/6572f7c3 Branch: refs/heads/master Commit: 6572f7c3710da15a500df813a018d2ce776107e4 Parents: 0e7c6e7 Author: Jacques Nadeau <[email protected]> Authored: Wed Mar 26 23:20:56 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Wed Mar 26 23:20:56 2014 -0700 ---------------------------------------------------------------------- .gitignore | 1 + distribution/pom.xml | 1 + distribution/src/assemble/bin.xml | 4 +++ .../drill/exec/store/hive/HiveRecordReader.java | 3 +-- pom.xml | 28 ++++++++++++++++++++ sqlparser/pom.xml | 1 + 6 files changed, 36 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6572f7c3/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index c27a41b..5383a8c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ target/ *.DS_Store *.patch *~ +git.properties http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6572f7c3/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 06065f4..ba6aee1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -89,6 +89,7 @@ <configuration> <excludes> <exclude>**/conffiles</exclude> + <exclude>**/git.properties</exclude> <exclude>**/control</exclude> <exclude>**/*.json</exclude> <exclude>**/hadoop-excludes.txt</exclude> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6572f7c3/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 4e37c6a..a8e6e5c 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -89,6 +89,10 @@ <outputDirectory></outputDirectory> </file> <file> + <source>target/classes/git.properties</source> + <outputDirectory></outputDirectory> + </file> + <file> <source>src/resources/runbit</source> <outputDirectory>bin</outputDirectory> </file> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6572f7c3/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java index 0a31a12..5bd520d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/HiveRecordReader.java @@ -371,7 +371,7 @@ public class HiveRecordReader implements RecordReader { case TIMESTAMP: default: - throw new UnsupportedOperationException("Could not determine type"); + throw new UnsupportedOperationException("Could not determine type: " + pCat); } } @@ -468,6 +468,5 @@ public class HiveRecordReader implements RecordReader { @Override public void cleanup() { - //To change body of implemented methods use File | Settings | File Templates. } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6572f7c3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8a8bc4f..df1026b 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,7 @@ <exclude>sandbox/**</exclude> <exclude>**/*.json</exclude> <exclude>**/*.sql</exclude> + <exclude>**/git.properties</exclude> <exclude>**/drill-*.conf</exclude> <exclude>**/.buildpath</exclude> <exclude>**/*.proto</exclude> @@ -184,7 +185,34 @@ </execution> </executions> </plugin> + <plugin> + <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> + <version>2.1.9</version> + <executions> + <execution> + <goals> + <goal>revision</goal> + </goals> + </execution> + </executions> + <configuration> + <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat> + <verbose>true</verbose> + <skipPoms>false</skipPoms> + <generateGitPropertiesFile>true</generateGitPropertiesFile> + <generateGitPropertiesFilename>target/classes/git.properties</generateGitPropertiesFilename> + <failOnNoGitDirectory>false</failOnNoGitDirectory> + <gitDescribe> + <skip>false</skip> + <always>false</always> + <abbrev>7</abbrev> + <dirty>-dirty</dirty> + <forceLongFormat>true</forceLongFormat> + </gitDescribe> + </configuration> + </plugin> </plugins> <pluginManagement> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/6572f7c3/sqlparser/pom.xml ---------------------------------------------------------------------- diff --git a/sqlparser/pom.xml b/sqlparser/pom.xml index f0606f1..c32eb0b 100644 --- a/sqlparser/pom.xml +++ b/sqlparser/pom.xml @@ -86,6 +86,7 @@ <excludes> <exclude>**/.buildpath</exclude> <exclude>**/*.json</exclude> + <exclude>**/git.properties</exclude> <exclude>**/donuts-output-data.txt</exclude> <exclude>**/derby.log</exclude> </excludes>
