You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/24 21:38:32 UTC
[1/2] storm git commit: Merge branch 'storm-sql' of
https://github.com/abhishekagarwal87/storm into STORM-1625
Repository: storm
Updated Branches:
refs/heads/1.x-branch 6163f58ad -> a0ecb7bc5
Merge branch 'storm-sql' of https://github.com/abhishekagarwal87/storm into STORM-1625
STORM-1625: Move storm-sql dependencies out of lib folder
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/22e7b163
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/22e7b163
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/22e7b163
Branch: refs/heads/1.x-branch
Commit: 22e7b1634505598c268fede99bfceaaf0e89f196
Parents: 6163f58
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Mar 24 14:26:53 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Mar 24 15:22:06 2016 -0500
----------------------------------------------------------------------
bin/storm.py | 5 ++++-
external/sql/storm-sql-core/pom.xml | 18 ++++++++++++++++++
storm-dist/binary/pom.xml | 10 ----------
storm-dist/binary/src/main/assembly/binary.xml | 4 ++--
4 files changed, 24 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/22e7b163/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 1c099d8..dd521e4 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -257,10 +257,13 @@ def sql(sql_file, topology_name):
Compiles the SQL statements into a Trident topology and submits it to Storm.
"""
+ extrajars=[USER_CONF_DIR, STORM_BIN_DIR]
+ extrajars.extend(get_jars_full(STORM_DIR + "/external/sql/storm-sql-core"))
+ extrajars.extend(get_jars_full(STORM_DIR + "/external/sql/storm-sql-runtime"))
exec_storm_class(
"org.apache.storm.sql.StormSqlRunner",
jvmtype="-client",
- extrajars=[USER_CONF_DIR, STORM_BIN_DIR],
+ extrajars=extrajars,
args=[sql_file, topology_name],
daemon=False)
http://git-wip-us.apache.org/repos/asf/storm/blob/22e7b163/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 0700515..ffb0d6e 100644
--- a/external/sql/storm-sql-core/pom.xml
+++ b/external/sql/storm-sql-core/pom.xml
@@ -197,6 +197,24 @@
</execution>
</executions>
</plugin>
+ <!-- using appassembler-maven-plugin instead of maven-dependency-plugin to copy dependencies
+ as copy and unpack goal are not working together -->
+ <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>
+ <repositoryLayout>flat</repositoryLayout>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>com.googlecode.fmpp-maven-plugin</groupId>
<artifactId>fmpp-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/storm/blob/22e7b163/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index ad23eb8..394f389 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -38,16 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
- <artifactId>storm-sql-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-sql-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
<artifactId>storm-rename-hack</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/22e7b163/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 9332283..7f0da6f 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -254,10 +254,10 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../../external/sql/storm-sql-core/target</directory>
+ <directory>${project.basedir}/../../external/sql/storm-sql-core/target/appassembler/repo</directory>
<outputDirectory>external/sql/storm-sql-core</outputDirectory>
<includes>
- <include>storm*jar</include>
+ <include>*jar</include>
</includes>
</fileSet>
<fileSet>
[2/2] storm git commit: Added STORM-1625 to Changelog
Posted by bo...@apache.org.
Added STORM-1625 to Changelog
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a0ecb7bc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a0ecb7bc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a0ecb7bc
Branch: refs/heads/1.x-branch
Commit: a0ecb7bc5b09f99b1d3d8aaf0fcd94e3bd2a80d3
Parents: 22e7b16
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Mar 24 15:36:40 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Mar 24 15:37:36 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a0ecb7bc/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2a042..bfa4e00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1625: Move storm-sql dependencies out of lib folder
* STORM-1622: Rename classes with older third party shaded packages
* STORM-1537: Upgrade to kryo 3
* STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode