This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 784044b moving pulsar storm tests under tests (#3000)
784044b is described below
commit 784044b980dfe3e47fc768d9df8c381e67d2e639
Author: Boyang Jerry Peng <[email protected]>
AuthorDate: Fri Nov 16 15:03:20 2018 -0800
moving pulsar storm tests under tests (#3000)
---
pulsar-storm/pom.xml | 32 ---------
tests/pom.xml | 1 +
{pulsar-storm => tests/pulsar-storm-test}/pom.xml | 79 ++++++++++------------
.../apache/pulsar/storm/MockOutputCollector.java | 0
.../pulsar/storm/MockSpoutOutputCollector.java | 0
.../org/apache/pulsar/storm/PulsarBoltTest.java | 0
.../org/apache/pulsar/storm/PulsarSpoutTest.java | 0
.../java/org/apache/pulsar/storm/TestUtil.java | 0
.../apache/pulsar/storm/example/StormExample.java | 0
9 files changed, 35 insertions(+), 77 deletions(-)
diff --git a/pulsar-storm/pom.xml b/pulsar-storm/pom.xml
index 93a58cc..c29b8b5 100644
--- a/pulsar-storm/pom.xml
+++ b/pulsar-storm/pom.xml
@@ -34,27 +34,6 @@
<name>Pulsar Storm adapter</name>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-broker</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-broker</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>managed-ledger-original</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -84,17 +63,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.asynchttpclient</groupId>
- <artifactId>async-http-client</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/tests/pom.xml b/tests/pom.xml
index aebe667..6c4b094 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -35,6 +35,7 @@
<module>docker-images</module>
<module>integration</module>
<module>pulsar-kafka-compat-client-test</module>
+ <module>pulsar-storm-test</module>
</modules>
<build>
<plugins>
diff --git a/pulsar-storm/pom.xml b/tests/pulsar-storm-test/pom.xml
similarity index 65%
copy from pulsar-storm/pom.xml
copy to tests/pulsar-storm-test/pom.xml
index 93a58cc..94f3d44 100644
--- a/pulsar-storm/pom.xml
+++ b/tests/pulsar-storm-test/pom.xml
@@ -24,85 +24,74 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar</artifactId>
+ <groupId>org.apache.pulsar.tests</groupId>
+ <artifactId>tests-parent</artifactId>
<version>2.3.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
</parent>
- <artifactId>pulsar-storm</artifactId>
- <name>Pulsar Storm adapter</name>
+ <artifactId>pulsar-storm-test</artifactId>
+ <packaging>jar</packaging>
+ <name>Pulsar Storm adapter Tests</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-storm</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-broker</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.pulsar</groupId>
<artifactId>managed-ledger-original</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-client</artifactId>
- <version>${project.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.asynchttpclient</groupId>
+ <artifactId>async-http-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-core</artifactId>
<version>${storm.version}</version>
- <scope>provided</scope>
<exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.asynchttpclient</groupId>
- <artifactId>async-http-client</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
</project>
diff --git
a/pulsar-storm/src/test/java/org/apache/pulsar/storm/MockOutputCollector.java
b/tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/MockOutputCollector.java
similarity index 100%
rename from
pulsar-storm/src/test/java/org/apache/pulsar/storm/MockOutputCollector.java
rename to
tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/MockOutputCollector.java
diff --git
a/pulsar-storm/src/test/java/org/apache/pulsar/storm/MockSpoutOutputCollector.java
b/tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/MockSpoutOutputCollector.java
similarity index 100%
rename from
pulsar-storm/src/test/java/org/apache/pulsar/storm/MockSpoutOutputCollector.java
rename to
tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/MockSpoutOutputCollector.java
diff --git
a/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarBoltTest.java
b/tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/PulsarBoltTest.java
similarity index 100%
rename from
pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarBoltTest.java
rename to
tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/PulsarBoltTest.java
diff --git
a/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
b/tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
similarity index 100%
rename from
pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
rename to
tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
diff --git a/pulsar-storm/src/test/java/org/apache/pulsar/storm/TestUtil.java
b/tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/TestUtil.java
similarity index 100%
rename from pulsar-storm/src/test/java/org/apache/pulsar/storm/TestUtil.java
rename to
tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/TestUtil.java
diff --git
a/pulsar-storm/src/test/java/org/apache/pulsar/storm/example/StormExample.java
b/tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/example/StormExample.java
similarity index 100%
rename from
pulsar-storm/src/test/java/org/apache/pulsar/storm/example/StormExample.java
rename to
tests/pulsar-storm-test/src/test/java/org/apache/pulsar/storm/example/StormExample.java
