You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/09/02 00:52:19 UTC

[1/3] storm git commit: STORM-1344 Remove sql from command from storm-jdbc build

Repository: storm
Updated Branches:
  refs/heads/master 2b4609f15 -> 0164728b0


STORM-1344
Remove sql from command from storm-jdbc build

STORM-1344

Add check for table

Remove file completely

Remove plugin


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/06f4e113
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/06f4e113
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/06f4e113

Branch: refs/heads/master
Commit: 06f4e11374227154d42f04788b64ea1905004d85
Parents: 3e56bd1
Author: Paul Poulosky <pp...@yahoo-inc.com>
Authored: Tue Aug 30 21:29:11 2016 -0500
Committer: Paul Poulosky <pp...@yahoo-inc.com>
Committed: Thu Sep 1 10:51:27 2016 -0500

----------------------------------------------------------------------
 external/storm-jdbc/pom.xml               | 31 --------------------------
 external/storm-jdbc/src/test/sql/test.sql | 18 ---------------
 2 files changed, 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/06f4e113/external/storm-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index 2c8c5eb..68b8bcb 100644
--- a/external/storm-jdbc/pom.xml
+++ b/external/storm-jdbc/pom.xml
@@ -93,37 +93,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.5</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.hsqldb</groupId>
-                        <artifactId>hsqldb</artifactId>
-                        <version>2.3.2</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>create-db</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <driver>org.hsqldb.jdbcDriver</driver>
-                            <url>jdbc:hsqldb:mem:test;shutdown=false</url>
-                            <username>SA</username>
-                            <password></password>
-                            <autocommit>true</autocommit>
-                            <srcFiles>
-                                <srcFile>src/test/sql/test.sql</srcFile>
-                            </srcFiles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/storm/blob/06f4e113/external/storm-jdbc/src/test/sql/test.sql
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/src/test/sql/test.sql b/external/storm-jdbc/src/test/sql/test.sql
deleted file mode 100644
index d3ef65b..0000000
--- a/external/storm-jdbc/src/test/sql/test.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-create table user_details (id integer, user_name varchar(100), create_date date);
\ No newline at end of file


[3/3] storm git commit: add STORM-1344 to CHANGELOG

Posted by ka...@apache.org.
add STORM-1344 to CHANGELOG


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0164728b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0164728b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0164728b

Branch: refs/heads/master
Commit: 0164728b0737bf5a901d04cce425cd7e0b3bd96a
Parents: e9125e0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 2 09:45:41 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 2 09:45:41 2016 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0164728b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d90bea..5321560 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -187,6 +187,7 @@
  * STORM-1868: Modify TridentKafkaWordCount to run in distributed mode
 
 ## 1.0.3
+ * STORM-1344: Remove sql command from storm-jdbc build
  * STORM-2070: Fix sigar native binary download link
  * STORM-2056: Bugs in logviewer
  * STORM-1646: Fix ExponentialBackoffMsgRetryManager test


[2/3] storm git commit: Merge branch 'STORM-1344' of https://github.com/ppoulosk/storm into STORM-1344

Posted by ka...@apache.org.
Merge branch 'STORM-1344' of https://github.com/ppoulosk/storm into STORM-1344


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e9125e0f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e9125e0f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e9125e0f

Branch: refs/heads/master
Commit: e9125e0fdaf7c97227edf0466846f05302d47d8e
Parents: 2b4609f 06f4e11
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 2 09:44:39 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 2 09:44:39 2016 +0900

----------------------------------------------------------------------
 external/storm-jdbc/pom.xml               | 31 --------------------------
 external/storm-jdbc/src/test/sql/test.sql | 18 ---------------
 2 files changed, 49 deletions(-)
----------------------------------------------------------------------