You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/09/28 20:38:13 UTC

[09/11] storm git commit: SQE: Integrate SQE into main build

SQE: Integrate SQE into main build


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

Branch: refs/heads/sqe_import
Commit: b28921d36de688cefc0e99828a4d0ded4b510412
Parents: a667c75
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Sep 28 15:40:58 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Sep 28 15:40:58 2016 -0400

----------------------------------------------------------------------
 external/storm-sqe/pom.xml | 44 ++++++++++++-----------------------------
 pom.xml                    |  1 +
 2 files changed, 14 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b28921d3/external/storm-sqe/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-sqe/pom.xml b/external/storm-sqe/pom.xml
index d5b7f4c..4e9a04b 100644
--- a/external/storm-sqe/pom.xml
+++ b/external/storm-sqe/pom.xml
@@ -19,21 +19,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.jwplayer</groupId>
-    <artifactId>sqe</artifactId>
-    <version>${build.number}</version>
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Central</name>
-            <url>http://repo1.maven.org/maven2</url>
-        </repository>
-    </repositories>
-    <properties>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <parent>
+        <artifactId>storm</artifactId>
+        <groupId>org.apache.storm</groupId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>storm-sqe</artifactId>
+
     <dependencies>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -72,23 +66,23 @@
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-redis</artifactId>
-            <version>1.0.2</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-kafka</artifactId>
-            <version>1.0.2</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-core</artifactId>
-            <version>1.0.2</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-starter</artifactId>
-            <version>1.0.2</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -190,16 +184,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>default</id>
-            <properties>
-                <env>default</env>
-                <build.number>1.0-SNAPSHOT</build.number>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/storm/blob/b28921d3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7bc566d..713e17a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@
         <module>external/storm-kinesis</module>
         <module>external/storm-druid</module>
         <module>external/storm-submit-tools</module>
+        <module>external/storm-sqe</module>
 
         <!-- examples -->
         <module>examples/storm-starter</module>