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:51:24 UTC

[1/2] storm git commit: STORM-1344 Remove sql from command from storm-jdbc build Add check for table Remove file completely Remove plugin

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 901cfab2d -> 011c4141e


STORM-1344
Remove sql from command from storm-jdbc build
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/0016825f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0016825f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0016825f

Branch: refs/heads/1.0.x-branch
Commit: 0016825fdcb7bf9ba8acabf34a75af3651fb229d
Parents: 901cfab
Author: Paul Poulosky <pp...@yahoo-inc.com>
Authored: Tue Aug 30 21:29:11 2016 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 2 09:50:24 2016 +0900

----------------------------------------------------------------------
 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/0016825f/external/storm-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml
index 67f4bc7..49fc3fd 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 />
-                            <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/0016825f/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


[2/2] storm git commit: Merge branch 'STORM-1344-1.0.x' into 1.0.x-branch

Posted by ka...@apache.org.
Merge branch 'STORM-1344-1.0.x' into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: 011c4141e1bd5dc3ba9a71ea2815615e79d4d9ee
Parents: 901cfab 0016825
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 2 09:51:17 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 2 09:51:17 2016 +0900

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