Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

These changes should allow the project to build on Jenkins, rather th…

…an error out when jsonschema2pojo tries to build .svn directories

git-svn-id: https://svn.apache.org/repos/asf/incubator/streams/trunk@1566722 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit a776edf7cb06728dfecb8d330a3152e50e468ca4 1 parent be58305
@steveblackmon steveblackmon authored
View
5 streams-config/pom.xml
@@ -117,15 +117,14 @@
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
-
<configuration>
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema</sourcePath>
+ <sourcePath>src/main/jsonschema/StreamsConfiguration.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams</targetPackage>
+ <targetPackage>org.apache.streams.config</targetPackage>
<useLongIntegers>true</useLongIntegers>
<useJodaDates>false</useJodaDates>
</configuration>
View
12 streams-config/src/main/jsonschema/StreamsConfiguration.json
@@ -1,12 +0,0 @@
-{
- "type": "object",
- "$schema": "http://json-schema.org/draft-03/schema",
- "id": "#",
- "javaType" : "org.apache.streams.StreamsConfiguration",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "pipeline": {
- "type" : "string"
- }
- }
-}
View
1  streams-contrib/pom.xml
@@ -37,6 +37,7 @@
<modules>
<module>streams-persist-console</module>
+ <module>streams-persist-elasticsearch</module>
<module>streams-persist-hdfs</module>
<module>streams-persist-kafka</module>
<module>streams-provider-datasift</module>
View
2  streams-contrib/streams-persist-hdfs/pom.xml
@@ -82,7 +82,7 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/org/apache/streams/hdfs</sourcePath>
+ <sourcePath>src/main/jsonschema/org/apache/streams/hdfs/HdfsConfiguration.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>org.apache.streams.hdfs.pojo</targetPackage>
View
2  streams-contrib/streams-persist-kafka/pom.xml
@@ -110,7 +110,7 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/org/apache/streams/kafka</sourcePath>
+ <sourcePath>src/main/jsonschema/org/apache/streams/kafka/KafkaConfiguration.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>org.apache.streams.kafka.pojo</targetPackage>
View
3  streams-contrib/streams-provider-datasift/pom.xml
@@ -74,7 +74,8 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/datasift</sourcePath>
+ <sourcePath>src/main/jsonschema/com/datasift/Datasift.json</sourcePath>
+ <sourcePath>src/main/jsonschema/com/datasift/DatasiftConfiguration.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>com.datasift</targetPackage>
View
2  streams-contrib/streams-provider-facebook/pom.xml
@@ -84,7 +84,7 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/facebook/graph</sourcePath>
+ <sourcePath>src/main/jsonschema/com/facebook/graph/Post.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>com.facebook</targetPackage>
View
2  streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml
@@ -75,7 +75,7 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/instagram</sourcePath>
+ <sourcePath>src/main/jsonschema/com/instagram/Instagram.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>com.instagram</targetPackage>
View
2  streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
@@ -116,7 +116,7 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/gnip</sourcePath>
+ <sourcePath>src/main/jsonschema/com/gnip/Gnip.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>com.gnip</targetPackage>
View
3  streams-contrib/streams-provider-moreover/pom.xml
@@ -114,7 +114,8 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/moreover</sourcePath>
+ <sourcePath>src/main/jsonschema/com/moreover/Moreover.json</sourcePath>
+ <sourcePath>src/main/jsonschema/com/moreover/MoreoverConfiguration.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>com.moreover</targetPackage>
View
1  streams-contrib/streams-provider-rss/pom.xml
@@ -15,7 +15,6 @@
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
- <version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
View
4 streams-contrib/streams-provider-sysomos/pom.xml
@@ -14,7 +14,6 @@
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
- <version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -133,7 +132,8 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/sysomos</sourcePath>
+ <sourcePath>src/main/jsonschema/com/sysomos/Sysomos.json</sourcePath>
+ <sourcePath>src/main/jsonschema/com/sysomos/SysomosConfiguration.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>com.sysomos</targetPackage>
View
5 streams-contrib/streams-provider-twitter/pom.xml
@@ -127,7 +127,10 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/com/twitter</sourcePath>
+ <sourcePath>src/main/jsonschema/com/twitter/TwitterStreamConfiguration.json</sourcePath>
+ <sourcePath>src/main/jsonschema/com/twitter/Delete.json</sourcePath>
+ <sourcePath>src/main/jsonschema/com/twitter/Retweet.json</sourcePath>
+ <sourcePath>src/main/jsonschema/com/twitter/tweet.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>org.apache.streams.twitter.pojo</targetPackage>
View
2  streams-pojo-extensions/pom.xml
@@ -129,7 +129,7 @@
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>src/main/jsonschema/org/apache/streams</sourcePath>
+ <sourcePath>src/main/jsonschema/org/apache/streams/ActivityExtended.json</sourcePath>
</sourcePaths>
<outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
<targetPackage>org.apache.streams</targetPackage>
Please sign in to comment.
Something went wrong with that request. Please try again.