Repository: incubator-streams-master Updated Branches: refs/heads/master c54bc9018 -> fe4a2f69a
misc changes merging STREAMS-398 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/commit/fe4a2f69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/fe4a2f69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/fe4a2f69 Branch: refs/heads/master Commit: fe4a2f69ac399a0ea66ccf69b1ff34c91a003953 Parents: c54bc90 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Wed Oct 12 12:01:13 2016 -0500 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Wed Oct 12 12:01:13 2016 -0500 ---------------------------------------------------------------------- pom.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/fe4a2f69/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1b27b48..a416d04 100644 --- a/pom.xml +++ b/pom.xml @@ -239,11 +239,12 @@ <!-- Build Properties --> <java.version>1.7</java.version> - <scala.version>2.10</scala.version> + <scala.suffix>2.10</scala.suffix> + <scala.version>2.10.6</scala.version> <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <streams.version>0.3-incubating-SNAPSHOT</streams.version> + <streams.version>0.4-incubating-SNAPSHOT</streams.version> <!-- Release Properties --> <snapshot.repository.url> @@ -381,6 +382,9 @@ <resource> <directory>src/site/diagrams</directory> </resource> + <resource> + <directory>src/test/resources</directory> + </resource> </resources> </configuration> </execution> @@ -908,7 +912,7 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-scala_${scala.version}</artifactId> + <artifactId>jackson-module-scala_${scala.suffix}</artifactId> <version>${jackson.version}</version> </dependency> <dependency>
