Repository: incubator-streams Updated Branches: refs/heads/master d7e983ea7 -> 7361a4181
still moving testdocs and schemas out of streams-pojo Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/7361a418 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/7361a418 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/7361a418 Branch: refs/heads/master Commit: 7361a41818d556ced883116933c61aeba8fdd53f Parents: d7e983e Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Tue Oct 18 14:33:06 2016 -0500 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Tue Oct 18 14:33:06 2016 -0500 ---------------------------------------------------------------------- streams-contrib/streams-persist-graph/pom.xml | 6 --- streams-contrib/streams-persist-hdfs/pom.xml | 8 ---- .../resources/streams-plugin-cassandra/pom.xml | 2 +- .../streams-plugin-elasticsearch/pom.xml | 6 +-- .../test/resources/streams-plugin-hbase/pom.xml | 4 +- .../test/resources/streams-plugin-hive/pom.xml | 6 +-- streams-pojo/pom.xml | 41 ++++++++++++++++---- .../streams/pojo/test/ActivitySerDeTest.java | 2 +- .../streams-schema-activitystreams/pom.xml | 5 +++ 9 files changed, 48 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-contrib/streams-persist-graph/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-graph/pom.xml b/streams-contrib/streams-persist-graph/pom.xml index 68ed023..35abaaf 100644 --- a/streams-contrib/streams-persist-graph/pom.xml +++ b/streams-contrib/streams-persist-graph/pom.xml @@ -55,12 +55,6 @@ </dependency> <dependency> <groupId>org.apache.streams</groupId> - <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.streams</groupId> <artifactId>streams-util</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-contrib/streams-persist-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-hdfs/pom.xml b/streams-contrib/streams-persist-hdfs/pom.xml index a7ac658..902cf5c 100644 --- a/streams-contrib/streams-persist-hdfs/pom.xml +++ b/streams-contrib/streams-persist-hdfs/pom.xml @@ -56,14 +56,6 @@ </dependency> <dependency> <groupId>org.apache.streams</groupId> - <artifactId>streams-pojo</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.streams</groupId> <artifactId>streams-converters</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml b/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml index e7dd4b1..cb9f86a 100644 --- a/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml +++ b/streams-plugins/streams-plugin-cassandra/src/test/resources/streams-plugin-cassandra/pom.xml @@ -38,7 +38,7 @@ <groupId>org.apache.streams</groupId> <artifactId>streams-schema-activitystreams</artifactId> <version>${project.version}</version> - <type>test-jar</type> + <type>jar</type> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml b/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml index fb7c0ef..6eab703 100644 --- a/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml +++ b/streams-plugins/streams-plugin-elasticsearch/src/test/resources/streams-plugin-elasticsearch/pom.xml @@ -39,7 +39,7 @@ <artifactId>streams-schema-activitystreams</artifactId> <version>${project.version}</version> <scope>test</scope> - <type>test-jar</type> + <type>jar</type> </dependency> </dependencies> @@ -73,10 +73,10 @@ <artifactId>maven-dependency-plugin</artifactId> <configuration> <includes>**/*.json</includes> - <outputDirectory>${project.build.directory}/test-classes/streams-schema-activitystreams</outputDirectory> + <outputDirectory>${project.build.directory}/test-classes/activitystreams-schemas</outputDirectory> <includeGroupIds>org.apache.streams</includeGroupIds> <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds> - <includeTypes>jar,test-jar</includeTypes> + <includeTypes>jar</includeTypes> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml b/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml index 9553109..7192b97 100644 --- a/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml +++ b/streams-plugins/streams-plugin-hbase/src/test/resources/streams-plugin-hbase/pom.xml @@ -40,7 +40,7 @@ <artifactId>streams-schema-activitystreams</artifactId> <version>${project.version}</version> <scope>test</scope> - <type>test-jar</type> + <type>jar</type> </dependency> </dependencies> @@ -78,7 +78,7 @@ <outputDirectory>${project.build.directory}/test-classes/activitystreams-schemas</outputDirectory> <includeGroupIds>org.apache.streams</includeGroupIds> <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds> - <includeTypes>test-jar</includeTypes> + <includeTypes>jar</includeTypes> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml b/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml index bbff7f2..a804aad 100644 --- a/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml +++ b/streams-plugins/streams-plugin-hive/src/test/resources/streams-plugin-hive/pom.xml @@ -40,7 +40,7 @@ <artifactId>streams-schema-activitystreams</artifactId> <version>${project.version}</version> <scope>test</scope> - <type>test-jar</type> + <type>jar</type> </dependency> </dependencies> @@ -74,10 +74,10 @@ <artifactId>maven-dependency-plugin</artifactId> <configuration> <includes>**/*.json</includes> - <outputDirectory>${project.build.directory}/test-classes/streams-schema-activitystreams</outputDirectory> + <outputDirectory>${project.build.directory}/test-classes/activitystreams-schemas</outputDirectory> <includeGroupIds>org.apache.streams</includeGroupIds> <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds> - <includeTypes>jar,test-jar</includeTypes> + <includeTypes>jar</includeTypes> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-pojo/pom.xml ---------------------------------------------------------------------- diff --git a/streams-pojo/pom.xml b/streams-pojo/pom.xml index 77c37d6..24a379f 100644 --- a/streams-pojo/pom.xml +++ b/streams-pojo/pom.xml @@ -126,6 +126,14 @@ <artifactId>logback-core</artifactId> <version>${logback.version}</version> </dependency> + + <dependency> + <groupId>org.apache.streams</groupId> + <artifactId>streams-schema-activitystreams</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-testing</artifactId> @@ -216,18 +224,35 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <includes> - <include>**/*.json</include> - <include>**/*.class</include> - </includes> - </configuration> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> + <id>unpack-schemas</id> + <phase>process-resources</phase> <goals> - <goal>test-jar</goal> + <goal>unpack-dependencies</goal> </goals> + <configuration> + <includes>**/*.json</includes> + <outputDirectory>${project.build.directory}/test-classes/activitystreams-schemas</outputDirectory> + <includeGroupIds>org.apache.streams</includeGroupIds> + <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds> + <includeTypes>jar</includeTypes> + </configuration> + </execution> + <execution> + <id>unpack-testdocs</id> + <phase>process-resources</phase> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <configuration> + <includes>**/*.json</includes> + <outputDirectory>${project.build.directory}/test-classes/activitystreams-testdocs</outputDirectory> + <includeGroupIds>org.apache.streams</includeGroupIds> + <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds> + <includeTypes>test-jar</includeTypes> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java index 1498ac1..fe00763 100644 --- a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java +++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java @@ -53,7 +53,7 @@ public class ActivitySerDeTest { public void testActivitySerDe() throws Exception { InputStream testActivityFolderStream = ActivitySerDeTest.class.getClassLoader() - .getResourceAsStream("activities"); + .getResourceAsStream("activitystreams-testdocs/activities"); List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8); for( String file : files) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7361a418/streams-schemas/streams-schema-activitystreams/pom.xml ---------------------------------------------------------------------- diff --git a/streams-schemas/streams-schema-activitystreams/pom.xml b/streams-schemas/streams-schema-activitystreams/pom.xml index 7c4357e..376758d 100644 --- a/streams-schemas/streams-schema-activitystreams/pom.xml +++ b/streams-schemas/streams-schema-activitystreams/pom.xml @@ -69,6 +69,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <configuration> + <includes> + <include>**/*.json</include> + </includes> + </configuration> <executions> <execution> <goals>
