You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/11/08 14:52:45 UTC
[1/2] storm git commit: STORM-2800: Use Maven JAXB api artifact
instead of assuming it is available from the JDK
Repository: storm
Updated Branches:
refs/heads/master b16a0deb0 -> 8bf8a2f95
STORM-2800: Use Maven JAXB api artifact instead of assuming it is available from the JDK
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c3b56624
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c3b56624
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c3b56624
Branch: refs/heads/master
Commit: c3b56624356224743f5e22a186807a3875ddd83e
Parents: 89b48d2
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sat Nov 4 22:24:58 2017 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Sun Nov 5 13:43:51 2017 +0100
----------------------------------------------------------------------
external/storm-autocreds/pom.xml | 4 ++++
external/storm-pmml/pom.xml | 5 +++++
pom.xml | 6 ++++++
storm-client/pom.xml | 6 ++++++
4 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c3b56624/external/storm-autocreds/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index 40dd97d..0e4a1cf 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -124,6 +124,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/storm/blob/c3b56624/external/storm-pmml/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-pmml/pom.xml b/external/storm-pmml/pom.xml
index 4af2058..346e7a8 100644
--- a/external/storm-pmml/pom.xml
+++ b/external/storm-pmml/pom.xml
@@ -71,6 +71,11 @@
<artifactId>pmml-evaluator</artifactId>
<version>${jpmml.version}</version>
</dependency>
+ <!-- JAXB api -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/storm/blob/c3b56624/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0b740c7..ce40ef3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,6 +323,7 @@
<j2html.version>1.0.0</j2html.version>
<jool.version>0.9.12</jool.version>
<caffeine.version>2.3.5</caffeine.version>
+ <jaxb-version>2.3.0</jaxb-version>
<!-- see intellij profile below... This fixes an annoyance with intellij -->
<provided.scope>provided</provided.scope>
@@ -1050,6 +1051,11 @@
<artifactId>caffeine</artifactId>
<version>${caffeine.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/storm/blob/c3b56624/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index d0cbe0e..19354c1 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -115,6 +115,12 @@
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
+
+ <!-- JAXB -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
<!-- json -->
<dependency>
[2/2] storm git commit: Merge branch 'STORM-2800' of
https://github.com/srdo/storm into STORM-2800
Posted by bo...@apache.org.
Merge branch 'STORM-2800' of https://github.com/srdo/storm into STORM-2800
STORM-2800: Use Maven JAXB api artifact instead of assuming it is available
This closes #2402
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8bf8a2f9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8bf8a2f9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8bf8a2f9
Branch: refs/heads/master
Commit: 8bf8a2f95df266fc6ca4024f6ce7cd0743e7ecc5
Parents: b16a0de c3b5662
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Wed Nov 8 08:34:01 2017 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Wed Nov 8 08:34:01 2017 -0600
----------------------------------------------------------------------
external/storm-autocreds/pom.xml | 4 ++++
external/storm-pmml/pom.xml | 5 +++++
pom.xml | 6 ++++++
storm-client/pom.xml | 6 ++++++
4 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8bf8a2f9/pom.xml
----------------------------------------------------------------------