Repository: storm Updated Branches: refs/heads/1.x-branch 8c7f3772b -> e39bf9b25
STORM-2023 Add calcite-core to dependency of storm-sql-runtime * also copy (transitive) dependencies to binary distribute, as storm-sql-core did * split default directory name into words (appassembler -> app-assembler) Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bfeb8ca0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bfeb8ca0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bfeb8ca0 Branch: refs/heads/1.x-branch Commit: bfeb8ca0d49f2e0f1d7aa211b9b61415b821cec5 Parents: 8c7f377 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Fri Aug 5 18:16:13 2016 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Fri Aug 12 13:03:57 2016 +0900 ---------------------------------------------------------------------- external/sql/storm-sql-core/pom.xml | 1 + external/sql/storm-sql-runtime/pom.xml | 78 +++++++++++++++++---- storm-dist/binary/src/main/assembly/binary.xml | 7 +- 3 files changed, 68 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/bfeb8ca0/external/sql/storm-sql-core/pom.xml ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-core/pom.xml b/external/sql/storm-sql-core/pom.xml index 4d6e3cd..d76a253 100644 --- a/external/sql/storm-sql-core/pom.xml +++ b/external/sql/storm-sql-core/pom.xml @@ -210,6 +210,7 @@ <goal>create-repository</goal> </goals> <configuration> + <assembleDirectory>${project.build.directory}/app-assembler</assembleDirectory> <repositoryLayout>flat</repositoryLayout> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/storm/blob/bfeb8ca0/external/sql/storm-sql-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/external/sql/storm-sql-runtime/pom.xml b/external/sql/storm-sql-runtime/pom.xml index dc85149..c433473 100644 --- a/external/sql/storm-sql-runtime/pom.xml +++ b/external/sql/storm-sql-runtime/pom.xml @@ -43,6 +43,37 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-core</artifactId> + <version>${calcite.version}</version> + <exclusions> + <exclusion> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.janino</groupId> + <artifactId>janino</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.janino</groupId> + <artifactId>commons-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>org.pentaho</groupId> + <artifactId>pentaho-aggdesigner-algorithm</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> @@ -54,20 +85,37 @@ </dependency> </dependencies> <build> - <sourceDirectory>src/jvm</sourceDirectory> - <testSourceDirectory>src/test</testSourceDirectory> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <sourceDirectory>src/jvm</sourceDirectory> + <testSourceDirectory>src/test</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>appassembler-maven-plugin</artifactId> + <version>1.9</version> + <executions> + <execution> + <id>create-repo</id> + <goals> + <goal>create-repository</goal> + </goals> + <configuration> + <assembleDirectory>${project.build.directory}/app-assembler</assembleDirectory> + <repositoryLayout>flat</repositoryLayout> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/storm/blob/bfeb8ca0/storm-dist/binary/src/main/assembly/binary.xml ---------------------------------------------------------------------- diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml index 1ad8f0d..345a65a 100644 --- a/storm-dist/binary/src/main/assembly/binary.xml +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -291,7 +291,7 @@ </includes> </fileSet> <fileSet> - <directory>${project.basedir}/../../external/sql/storm-sql-core/target/appassembler/repo</directory> + <directory>${project.basedir}/../../external/sql/storm-sql-core/target/app-assembler/repo</directory> <outputDirectory>external/sql/storm-sql-core</outputDirectory> <includes> <include>*jar</include> @@ -305,12 +305,13 @@ </includes> </fileSet> <fileSet> - <directory>${project.basedir}/../../external/sql/storm-sql-runtime/target</directory> + <directory>${project.basedir}/../../external/sql/storm-sql-runtime/target/app-assembler/repo</directory> <outputDirectory>external/sql/storm-sql-runtime</outputDirectory> <includes> - <include>storm*jar</include> + <include>*jar</include> </includes> </fileSet> + <fileSet> <directory>${project.basedir}/../../external/sql</directory> <outputDirectory>external/sql</outputDirectory>
