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 2014/10/07 22:41:54 UTC
[1/2] git commit: this commit avoids a bug jaxb2 basics under JDK8.
some misc pom version cleanup for good measure.
Repository: incubator-streams
Updated Branches:
refs/heads/master 675ae89c6 -> 27980edf9
this commit avoids a bug jaxb2 basics under JDK8. some misc pom version cleanup for good measure.
after this change i could build a stream containing language level 1.8 features with JDK8 on Intel OS X and run with JRE8 for ARM
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e920baca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e920baca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e920baca
Branch: refs/heads/master
Commit: e920bacab3144a94d5b30902fc2122118e6aa7a0
Parents: f90d913
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Tue Oct 7 06:24:54 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Tue Oct 7 06:24:54 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
streams-config/pom.xml | 1 -
.../streams-persist-s3/pom.xml | 1 -
streams-contrib/streams-persist-hdfs/pom.xml | 1 -
streams-contrib/streams-persist-kafka/pom.xml | 1 -
streams-contrib/streams-persist-mongo/pom.xml | 1 -
.../streams-provider-datasift/pom.xml | 2 -
.../streams-provider-facebook/pom.xml | 1 -
.../gnip-edc-facebook/pom.xml | 1 -
.../gnip-edc-youtube/pom.xml | 3 +-
.../gnip-powertrack/pom.xml | 39 ++++++++++++++++++-
.../google-gmail/pom.xml | 1 -
.../google-gplus/pom.xml | 1 -
.../streams-provider-instagram/pom.xml | 1 -
.../streams-provider-moreover/pom.xml | 3 +-
streams-contrib/streams-provider-rss/pom.xml | 40 --------------------
.../streams-provider-sysomos/pom.xml | 1 -
.../streams-provider-twitter/pom.xml | 1 -
streams-pojo/pom.xml | 1 -
19 files changed, 40 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 85c3472..49764f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<datastax.version>1.0.3</datastax.version>
<jsonschema2pojo.version>0.4.5</jsonschema2pojo.version>
<jaxb2.version>0.8.3</jaxb2.version>
- <jaxb2-basics.version>0.6.5</jaxb2-basics.version>
+ <jaxb2-basics.version>0.8.4</jaxb2-basics.version>
<jaxbutil.version>1.2.6</jaxbutil.version>
<junit.version>4.11</junit.version>
<slf4j.version>1.7.6</slf4j.version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-config/pom.xml
----------------------------------------------------------------------
diff --git a/streams-config/pom.xml b/streams-config/pom.xml
index f31301c..aa8d59b 100644
--- a/streams-config/pom.xml
+++ b/streams-config/pom.xml
@@ -82,7 +82,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml b/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
index 5cadd5c..504d830 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
@@ -59,7 +59,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-persist-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/pom.xml b/streams-contrib/streams-persist-hdfs/pom.xml
index ae837c6..2e51c63 100644
--- a/streams-contrib/streams-persist-hdfs/pom.xml
+++ b/streams-contrib/streams-persist-hdfs/pom.xml
@@ -70,7 +70,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-persist-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-kafka/pom.xml b/streams-contrib/streams-persist-kafka/pom.xml
index 84ddee8..f86a0f3 100644
--- a/streams-contrib/streams-persist-kafka/pom.xml
+++ b/streams-contrib/streams-persist-kafka/pom.xml
@@ -100,7 +100,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-persist-mongo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/pom.xml b/streams-contrib/streams-persist-mongo/pom.xml
index fbe1723..aae9183 100644
--- a/streams-contrib/streams-persist-mongo/pom.xml
+++ b/streams-contrib/streams-persist-mongo/pom.xml
@@ -53,7 +53,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml
index 782db07..ae96d4e 100644
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@ -110,7 +110,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
@@ -159,7 +158,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-test-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/pom.xml b/streams-contrib/streams-provider-facebook/pom.xml
index 50da134..f1aeda9 100644
--- a/streams-contrib/streams-provider-facebook/pom.xml
+++ b/streams-contrib/streams-provider-facebook/pom.xml
@@ -79,7 +79,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
index 7965d48..f353ee8 100644
--- a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
+++ b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
@@ -78,7 +78,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source-jaxb2</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-gnip/gnip-edc-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-youtube/pom.xml b/streams-contrib/streams-provider-gnip/gnip-edc-youtube/pom.xml
index b9e6e1e..7077b33 100644
--- a/streams-contrib/streams-provider-gnip/gnip-edc-youtube/pom.xml
+++ b/streams-contrib/streams-provider-gnip/gnip-edc-youtube/pom.xml
@@ -65,7 +65,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source-jaxb2</id>
@@ -97,7 +96,7 @@
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
- <version>0.6.5</version>
+ <version>${jaxb2-basics.version}</version>
</plugin>
</plugins>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml b/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
index cbe47f5..d26a9a3 100644
--- a/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
+++ b/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
@@ -143,7 +142,7 @@
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
- <version>0.6.5</version>
+ <version>${jaxb2-basics.version}</version>
</plugin>
</plugins>
</configuration>
@@ -157,4 +156,40 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>java8</id>
+ <activation>
+ <jdk>[1.8,]</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- We use this plugin to ensure that our usage of the
+ maven-jaxb2-plugin is JDK 8 compatible in absence of a fix
+ for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <id>set-additional-system-properties</id>
+ <goals>
+ <goal>set-system-properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <properties>
+ <property>
+ <name>javax.xml.accessExternalSchema</name>
+ <value>file,http</value>
+ </property>
+ </properties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-google/google-gmail/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/pom.xml b/streams-contrib/streams-provider-google/google-gmail/pom.xml
index 05d3709..5e8ed23 100644
--- a/streams-contrib/streams-provider-google/google-gmail/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gmail/pom.xml
@@ -91,7 +91,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-google/google-gplus/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/pom.xml b/streams-contrib/streams-provider-google/google-gplus/pom.xml
index facb6ef..2a236d9 100644
--- a/streams-contrib/streams-provider-google/google-gplus/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml
@@ -98,7 +98,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-instagram/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/pom.xml b/streams-contrib/streams-provider-instagram/pom.xml
index a96ff1c..46fc0ff 100644
--- a/streams-contrib/streams-provider-instagram/pom.xml
+++ b/streams-contrib/streams-provider-instagram/pom.xml
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-moreover/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/pom.xml b/streams-contrib/streams-provider-moreover/pom.xml
index b3dcf8e..7a2d694 100644
--- a/streams-contrib/streams-provider-moreover/pom.xml
+++ b/streams-contrib/streams-provider-moreover/pom.xml
@@ -75,7 +75,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source-jsonschema2pojo</id>
@@ -142,7 +141,7 @@
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
- <version>0.6.5</version>
+ <version>${jaxb2-basics.version}</version>
</plugin>
</plugins>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-rss/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/pom.xml b/streams-contrib/streams-provider-rss/pom.xml
index c9f24d5..51ce799 100644
--- a/streams-contrib/streams-provider-rss/pom.xml
+++ b/streams-contrib/streams-provider-rss/pom.xml
@@ -86,7 +86,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
@@ -124,45 +123,6 @@
</execution>
</executions>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.jvnet.jaxb2.maven2</groupId>-->
- <!--<artifactId>maven-jaxb2-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<schemaDirectory>src/main/xmlschema</schemaDirectory>-->
- <!--<generateDirectory>target/generated-sources/jaxb2</generateDirectory>-->
- <!--<verbose>true</verbose>-->
- <!--<debug>true</debug>-->
- <!--<encoding>${project.build.sourceEncoding}</encoding>-->
- <!--<forceRegenerate>true</forceRegenerate>-->
- <!--<removeOldOutput>false</removeOldOutput>-->
- <!--<generatePackage>org.apache.streams.rss</generatePackage>-->
- <!--<schemas>-->
- <!--<schema>-->
- <!--<fileset>-->
- <!--<!– Defaults to schemaIncludes –>-->
- <!--<includes>-->
- <!--<include>contents.xsd</include>-->
- <!--<include>opml.xsd</include>-->
- <!--</includes>-->
- <!--</fileset>-->
- <!--</schema>-->
- <!--</schemas>-->
- <!--<!–<plugins>–>-->
- <!--<!–<plugin>–>-->
- <!--<!–<groupId>org.jvnet.jaxb2_commons</groupId>–>-->
- <!--<!–<artifactId>jaxb2-basics</artifactId>–>-->
- <!--<!–<version>0.6.5</version>–>-->
- <!--<!–</plugin>–>-->
- <!--<!–</plugins>–>-->
- <!--</configuration>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>generate</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-sysomos/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/pom.xml b/streams-contrib/streams-provider-sysomos/pom.xml
index 9880457..7d4c4a2 100644
--- a/streams-contrib/streams-provider-sysomos/pom.xml
+++ b/streams-contrib/streams-provider-sysomos/pom.xml
@@ -84,7 +84,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-contrib/streams-provider-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/pom.xml b/streams-contrib/streams-provider-twitter/pom.xml
index 79d1608..edf4959 100644
--- a/streams-contrib/streams-provider-twitter/pom.xml
+++ b/streams-contrib/streams-provider-twitter/pom.xml
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e920baca/streams-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-pojo/pom.xml b/streams-pojo/pom.xml
index ca6d953..2fc9a69 100644
--- a/streams-pojo/pom.xml
+++ b/streams-pojo/pom.xml
@@ -110,7 +110,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>add-source</id>
[2/2] git commit: Merge branch 'STREAMS-184'
Posted by sb...@apache.org.
Merge branch 'STREAMS-184'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/27980edf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/27980edf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/27980edf
Branch: refs/heads/master
Commit: 27980edf92ac15bd8f4ae6c437a1ec1e2af38a25
Parents: 675ae89 e920bac
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Tue Oct 7 15:41:55 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Tue Oct 7 15:41:55 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
streams-config/pom.xml | 1 -
.../streams-persist-s3/pom.xml | 1 -
streams-contrib/streams-persist-hdfs/pom.xml | 1 -
streams-contrib/streams-persist-kafka/pom.xml | 1 -
streams-contrib/streams-persist-mongo/pom.xml | 1 -
.../streams-provider-datasift/pom.xml | 2 -
.../streams-provider-facebook/pom.xml | 1 -
.../gnip-edc-facebook/pom.xml | 1 -
.../gnip-edc-youtube/pom.xml | 3 +-
.../gnip-powertrack/pom.xml | 39 ++++++++++++++++++-
.../google-gmail/pom.xml | 1 -
.../google-gplus/pom.xml | 1 -
.../streams-provider-instagram/pom.xml | 1 -
.../streams-provider-moreover/pom.xml | 3 +-
streams-contrib/streams-provider-rss/pom.xml | 40 --------------------
.../streams-provider-sysomos/pom.xml | 1 -
.../streams-provider-twitter/pom.xml | 1 -
streams-pojo/pom.xml | 1 -
19 files changed, 40 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/27980edf/streams-contrib/streams-persist-hdfs/pom.xml
----------------------------------------------------------------------