streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject incubator-streams git commit: moving test data for integration-testing step
Date Tue, 18 Oct 2016 20:33:26 GMT
Repository: incubator-streams
Updated Branches:
  refs/heads/master 7361a4181 -> bb2679916


moving test data for integration-testing step


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

Branch: refs/heads/master
Commit: bb2679916031b9dc2772fd215125aba5de993a12
Parents: 7361a41
Author: Steve Blackmon @steveblackmon <sblackmon@apache.org>
Authored: Tue Oct 18 15:33:17 2016 -0500
Committer: Steve Blackmon @steveblackmon <sblackmon@apache.org>
Committed: Tue Oct 18 15:33:17 2016 -0500

----------------------------------------------------------------------
 streams-contrib/streams-persist-elasticsearch/pom.xml | 8 +++-----
 streams-contrib/streams-persist-mongo/pom.xml         | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/bb267991/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/pom.xml b/streams-contrib/streams-persist-elasticsearch/pom.xml
index e887328..78f6e7f 100644
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@ -91,11 +91,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.streams</groupId>
-            <artifactId>streams-pojo</artifactId>
+            <artifactId>streams-schema-activitystreams</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch</groupId>
@@ -169,7 +168,7 @@
                     <includes>**/*.json</includes>
                     <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
                     <includeGroupIds>org.apache.streams</includeGroupIds>
-                    <includeArtifactIds>streams-schemas-activitystreams</includeArtifactIds>
+                    <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds>
                     <includeTypes>test-jar</includeTypes>
                 </configuration>
                 <executions>
@@ -276,7 +275,6 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${docker.plugin.version}</version>
                         <configuration combine.self="override">
                             <watchInterval>500</watchInterval>
                             <logDate>default</logDate>
@@ -292,7 +290,7 @@
                                             <port>${es.http.host}:${es.http.port}:9200</port>
                                             <port>${es.tcp.host}:${es.tcp.port}:9300</port>
                                         </ports>
-                                        <portPropertyFile>elasticsearch.properties</portPropertyFile>
+                                        <portPropertyFile>${pom.basedir}/elasticsearch.properties</portPropertyFile>
                                         <wait>
                                             <log>elasticsearch startup</log>
                                             <http>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/bb267991/streams-contrib/streams-persist-mongo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/pom.xml b/streams-contrib/streams-persist-mongo/pom.xml
index e53f072..7534283 100644
--- a/streams-contrib/streams-persist-mongo/pom.xml
+++ b/streams-contrib/streams-persist-mongo/pom.xml
@@ -67,11 +67,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.streams</groupId>
-            <artifactId>streams-pojo</artifactId>
+            <artifactId>streams-schema-activitystreams</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -197,7 +196,6 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${docker.plugin.version}</version>
                         <configuration combine.self="override">
                             <watchInterval>500</watchInterval>
                             <logDate>default</logDate>
@@ -212,7 +210,7 @@
                                         <ports>
                                             <port>${mongo.tcp.host}:${mongo.tcp.port}:27017</port>
                                         </ports>
-                                        <portPropertyFile>mongo.properties</portPropertyFile>
+                                        <portPropertyFile>${pom.basedir}/mongo.properties</portPropertyFile>
                                         <log>
                                             <enabled>true</enabled>
                                             <date>default</date>


Mime
View raw message