You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2016/10/12 19:00:38 UTC
[40/53] [abbrv] incubator-streams git commit: version bump
version bump
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/18a29b00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/18a29b00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/18a29b00
Branch: refs/heads/invalid_headers
Commit: 18a29b0079f68eaae008e4eabcc5929e124dc63b
Parents: abc58b4
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Wed Oct 12 12:27:44 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Wed Oct 12 12:27:44 2016 -0500
----------------------------------------------------------------------
streams-plugins/pom.xml | 2 +-
streams-plugins/streams-plugin-scala/pom.xml | 7 +++++--
.../src/test/resources/streams-plugin-scala/pom.xml | 4 ++--
streams-pojo/pom.xml | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/18a29b00/streams-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/pom.xml b/streams-plugins/pom.xml
index f2c8999..c79e5c2 100644
--- a/streams-plugins/pom.xml
+++ b/streams-plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>streams-project</artifactId>
<groupId>org.apache.streams</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/18a29b00/streams-plugins/streams-plugin-scala/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-scala/pom.xml b/streams-plugins/streams-plugin-scala/pom.xml
index 3988142..1e50141 100644
--- a/streams-plugins/streams-plugin-scala/pom.xml
+++ b/streams-plugins/streams-plugin-scala/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-scala</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<parent>
<groupId>org.apache.streams</groupId>
<artifactId>streams-plugins</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
</parent>
<dependencies>
@@ -248,6 +248,9 @@
</configuration>
</execution>
</executions>
+ <configuration>
+ <scalaVersion>${scala.version}</scalaVersion>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/18a29b00/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml b/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
index b4867a0..3179e95 100644
--- a/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
+++ b/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-scala-test</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsPojoScalaMojo</name>
@@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-scala</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<configuration>
<packages>org.apache.streams.pojo.json</packages>
<target>target/test-classes/streams-scala-plugin/</target>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/18a29b00/streams-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-pojo/pom.xml b/streams-pojo/pom.xml
index eab4b59..e3f5d3f 100644
--- a/streams-pojo/pom.xml
+++ b/streams-pojo/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_2.10</artifactId>
+ <artifactId>jackson-module-scala_${scala.suffix}</artifactId>
</dependency>
<dependency>