Updated Branches: refs/heads/master c9a0bafa0 -> 3da1ec2cf
TAJO-65: Invalid pom.xml configurations for source directories. (Takuya Ueshin via hyunsik) Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/3da1ec2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/3da1ec2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/3da1ec2c Branch: refs/heads/master Commit: 3da1ec2cf59cb3dfe8baeccac0ea68ee52f463bb Parents: c9a0baf Author: Hyunsik Choi <[email protected]> Authored: Wed May 22 11:00:25 2013 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Wed May 22 11:00:25 2013 +0900 ---------------------------------------------------------------------- CHANGES.txt | 9 +++++++-- tajo-catalog/tajo-catalog-client/pom.xml | 20 +++++++++++++++++++- tajo-catalog/tajo-catalog-common/pom.xml | 20 +++++++++++++++++++- tajo-catalog/tajo-catalog-server/pom.xml | 1 - tajo-common/pom.xml | 1 - tajo-core/tajo-core-backend/pom.xml | 1 - tajo-core/tajo-core-storage/pom.xml | 1 - tajo-rpc/pom.xml | 1 - 8 files changed, 45 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9a81c02..9cb6eee 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -39,13 +39,18 @@ Release 0.2.0 - unreleased BUG FIXES - TAJO-48: BufferUnderflowException occurs during the initialization of RowFile. (jihoon) + TAJO-65: Invalid pom.xml configurations for source directories. + (Takuya Ueshin via hyunsik) + + TAJO-48: BufferUnderflowException occurs during the initialization of + RowFile. (jihoon) TAJO-58: Remove obsolete methods in GlobalPlanner. (hyunsik) TAJO-54: SubQuery::allocateContainers() may ask 0 containers. (hyunsik) - TAJO-41: Storage handler name row in storage-default.xml must be rowfile. (hsaputra) + TAJO-41: Storage handler name row in storage-default.xml must be rowfile. + (hsaputra) TAJO-47: RowFile has the duplicated initialization problem and unflipped ByteBuffer problem. (jihoon) http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-catalog/tajo-catalog-client/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-client/pom.xml b/tajo-catalog/tajo-catalog-client/pom.xml index df177cc..7f2eba6 100644 --- a/tajo-catalog/tajo-catalog-client/pom.xml +++ b/tajo-catalog/tajo-catalog-client/pom.xml @@ -57,7 +57,6 @@ <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal> @@ -87,6 +86,25 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/generated-sources/proto</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-catalog/tajo-catalog-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/pom.xml b/tajo-catalog/tajo-catalog-common/pom.xml index 640f994..577f196 100644 --- a/tajo-catalog/tajo-catalog-common/pom.xml +++ b/tajo-catalog/tajo-catalog-common/pom.xml @@ -57,7 +57,6 @@ <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal> @@ -88,6 +87,25 @@ </executions> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/generated-sources/proto</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-catalog/tajo-catalog-server/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/pom.xml b/tajo-catalog/tajo-catalog-server/pom.xml index 44c58a3..ae134ad 100644 --- a/tajo-catalog/tajo-catalog-server/pom.xml +++ b/tajo-catalog/tajo-catalog-server/pom.xml @@ -57,7 +57,6 @@ <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal> http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-common/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-common/pom.xml b/tajo-common/pom.xml index 4674ec1..c380f4a 100644 --- a/tajo-common/pom.xml +++ b/tajo-common/pom.xml @@ -67,7 +67,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal> http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-core/tajo-core-backend/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/pom.xml b/tajo-core/tajo-core-backend/pom.xml index 93aabf1..88d804f 100644 --- a/tajo-core/tajo-core-backend/pom.xml +++ b/tajo-core/tajo-core-backend/pom.xml @@ -150,7 +150,6 @@ <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal> http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-core/tajo-core-storage/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-storage/pom.xml b/tajo-core/tajo-core-storage/pom.xml index fa3445d..6c3e61e 100644 --- a/tajo-core/tajo-core-storage/pom.xml +++ b/tajo-core/tajo-core-storage/pom.xml @@ -89,7 +89,6 @@ <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal> http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/3da1ec2c/tajo-rpc/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-rpc/pom.xml b/tajo-rpc/pom.xml index 528b2f4..2c28282 100644 --- a/tajo-rpc/pom.xml +++ b/tajo-rpc/pom.xml @@ -63,7 +63,6 @@ <target> <mkdir dir="target/generated-sources/proto" /> </target> - <sourceRoot>target/generated-sources</sourceRoot> </configuration> <goals> <goal>run</goal>
