Merge remote-tracking branch 'steveblackmon/STREAMS-389'

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

Branch: refs/heads/master
Commit: 8e929ebf811abf5402514bd5030f064a02157127
Parents: f14a25c c89fe1e
Author: Steve Blackmon @steveblackmon <sblack...@apache.org>
Authored: Wed Oct 12 10:50:44 2016 -0500
Committer: Steve Blackmon @steveblackmon <sblack...@apache.org>
Committed: Wed Oct 12 10:50:44 2016 -0500

----------------------------------------------------------------------
 pom.xml                                         |   1 +
 streams-plugins/pom.xml                         |  56 +++
 streams-plugins/streams-plugin-scala/pom.xml    | 243 ++++++++++++
 .../streams/plugins/StreamsPojoScala.java       | 371 +++++++++++++++++++
 .../streams/plugins/StreamsPojoScalaMojo.java   |  71 ++++
 .../plugins/test/StreamsPojoScalaTest.java      |  55 +++
 .../test/resources/streams-plugin-scala/pom.xml |  40 ++
 7 files changed, 837 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8e929ebf/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 466e94b,58304e0..48a5ad6
--- a/pom.xml
+++ b/pom.xml
@@@ -174,10 -172,11 +174,11 @@@
          <module>streams-contrib</module>
          <module>streams-components</module>
          <module>streams-monitoring</module>
 -        <module>streams-osgi-components</module>
          <module>streams-pojo</module>
          <module>streams-pojo-extensions</module>
+         <module>streams-plugins</module>
          <module>streams-runtimes</module>
 +        <module>streams-testing</module>
          <module>streams-util</module>
          <module>streams-verbs</module>
      </modules>

Reply via email to