You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/11/11 17:11:41 UTC
[1/2] incubator-streams-master git commit: STREAMS-443: use
org.apache.streams.plugins:streams-plugin-pojo instead of org.jsonschema2pojo
Repository: incubator-streams-master
Updated Branches:
refs/heads/master 88250c67f -> c40213daf
STREAMS-443: use org.apache.streams.plugins:streams-plugin-pojo instead of org.jsonschema2pojo
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/ca1449e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/ca1449e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/ca1449e8
Branch: refs/heads/master
Commit: ca1449e81a15895a380ffb226007fa1a8b88bda6
Parents: ce8f4fe
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Sat Nov 5 15:25:15 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Sat Nov 5 15:25:15 2016 -0500
----------------------------------------------------------------------
pom.xml | 32 ++++++++------------------------
1 file changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/ca1449e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 700f687..793a25b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,10 +299,10 @@
<log4j.version>1.2.17</log4j.version>
<logback.version>1.1.7</logback.version>
<hamcrest.version>1.3</hamcrest.version>
- <commons-io.version>2.5</commons-io.version>
<commons-codec.version>1.10</commons-codec.version>
- <commons-validator.version>1.5.1</commons-validator.version>
+ <commons-io.version>2.5</commons-io.version>
<commons-lang3.version>3.4</commons-lang3.version>
+ <commons-validator.version>1.5.1</commons-validator.version>
<typesafe.config.version>1.2.0</typesafe.config.version>
<reflections.version>0.9.10</reflections.version>
<orgjson.version>20140107</orgjson.version>
@@ -394,23 +394,20 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <version>${jsonschema2pojo.version}</version>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
<sourcePaths>
<sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
</sourcePaths>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.pojo</targetPackage>
</configuration>
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
@@ -863,19 +860,6 @@
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <version>${jsonschema2pojo.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>${typesafe.config.version}</version>
[2/2] incubator-streams-master git commit: Merge branch 'STREAMS-443'
Posted by sb...@apache.org.
Merge branch 'STREAMS-443'
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/c40213da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/c40213da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/c40213da
Branch: refs/heads/master
Commit: c40213dafb891a63d9b73bec24ae5e6a3b8e051b
Parents: 88250c6 ca1449e
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Fri Nov 11 11:10:19 2016 -0600
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Fri Nov 11 11:10:19 2016 -0600
----------------------------------------------------------------------
pom.xml | 32 ++++++++------------------------
1 file changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------