spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-15523][ML][MLLIB] Update JPMML to 1.2.15
Date Thu, 26 May 2016 13:11:39 GMT
Repository: spark
Updated Branches:
  refs/heads/master e451f7f0c -> 6d506c9ae


[SPARK-15523][ML][MLLIB] Update JPMML to 1.2.15

## What changes were proposed in this pull request?

See https://issues.apache.org/jira/browse/SPARK-15523

This PR replaces PR #13293. It's isolated to a new branch, and contains some more squashed
changes.

## How was this patch tested?

1. Executed `mvn clean package` in `mllib` directory
2. Executed `dev/test-dependencies.sh --replace-manifest` in the root directory.

Author: Villu Ruusmann <villu.ruusmann@gmail.com>

Closes #13297 from vruusmann/update-jpmml.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6d506c9a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6d506c9a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6d506c9a

Branch: refs/heads/master
Commit: 6d506c9ae9a2519d1a93e788ae5316d4f942d35d
Parents: e451f7f
Author: Villu Ruusmann <villu.ruusmann@gmail.com>
Authored: Thu May 26 08:11:34 2016 -0500
Committer: Sean Owen <sowen@cloudera.com>
Committed: Thu May 26 08:11:34 2016 -0500

----------------------------------------------------------------------
 dev/deps/spark-deps-hadoop-2.2 |  5 ++---
 dev/deps/spark-deps-hadoop-2.3 |  5 ++---
 dev/deps/spark-deps-hadoop-2.4 |  5 ++---
 dev/deps/spark-deps-hadoop-2.6 |  5 ++---
 dev/deps/spark-deps-hadoop-2.7 |  5 ++---
 mllib/pom.xml                  | 10 +++-------
 6 files changed, 13 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/6d506c9a/dev/deps/spark-deps-hadoop-2.2
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 0d6b18e..578691c 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -137,9 +137,8 @@ parquet-generator-1.7.0.jar
 parquet-hadoop-1.7.0.jar
 parquet-hadoop-bundle-1.6.0.jar
 parquet-jackson-1.7.0.jar
-pmml-agent-1.2.7.jar
-pmml-model-1.2.7.jar
-pmml-schema-1.2.7.jar
+pmml-model-1.2.15.jar
+pmml-schema-1.2.15.jar
 protobuf-java-2.5.0.jar
 py4j-0.10.1.jar
 pyrolite-4.9.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/6d506c9a/dev/deps/spark-deps-hadoop-2.3
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index a3597f4..fc6306f 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -144,9 +144,8 @@ parquet-generator-1.7.0.jar
 parquet-hadoop-1.7.0.jar
 parquet-hadoop-bundle-1.6.0.jar
 parquet-jackson-1.7.0.jar
-pmml-agent-1.2.7.jar
-pmml-model-1.2.7.jar
-pmml-schema-1.2.7.jar
+pmml-model-1.2.15.jar
+pmml-schema-1.2.15.jar
 protobuf-java-2.5.0.jar
 py4j-0.10.1.jar
 pyrolite-4.9.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/6d506c9a/dev/deps/spark-deps-hadoop-2.4
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 3ca44c5..dee1417 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -144,9 +144,8 @@ parquet-generator-1.7.0.jar
 parquet-hadoop-1.7.0.jar
 parquet-hadoop-bundle-1.6.0.jar
 parquet-jackson-1.7.0.jar
-pmml-agent-1.2.7.jar
-pmml-model-1.2.7.jar
-pmml-schema-1.2.7.jar
+pmml-model-1.2.15.jar
+pmml-schema-1.2.15.jar
 protobuf-java-2.5.0.jar
 py4j-0.10.1.jar
 pyrolite-4.9.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/6d506c9a/dev/deps/spark-deps-hadoop-2.6
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 01e7551..9695661 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -152,9 +152,8 @@ parquet-generator-1.7.0.jar
 parquet-hadoop-1.7.0.jar
 parquet-hadoop-bundle-1.6.0.jar
 parquet-jackson-1.7.0.jar
-pmml-agent-1.2.7.jar
-pmml-model-1.2.7.jar
-pmml-schema-1.2.7.jar
+pmml-model-1.2.15.jar
+pmml-schema-1.2.15.jar
 protobuf-java-2.5.0.jar
 py4j-0.10.1.jar
 pyrolite-4.9.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/6d506c9a/dev/deps/spark-deps-hadoop-2.7
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 402fd05..18c136e 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -153,9 +153,8 @@ parquet-generator-1.7.0.jar
 parquet-hadoop-1.7.0.jar
 parquet-hadoop-bundle-1.6.0.jar
 parquet-jackson-1.7.0.jar
-pmml-agent-1.2.7.jar
-pmml-model-1.2.7.jar
-pmml-schema-1.2.7.jar
+pmml-model-1.2.15.jar
+pmml-schema-1.2.15.jar
 protobuf-java-2.5.0.jar
 py4j-0.10.1.jar
 pyrolite-4.9.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/6d506c9a/mllib/pom.xml
----------------------------------------------------------------------
diff --git a/mllib/pom.xml b/mllib/pom.xml
index c324afb..2a59fcd 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -102,15 +102,11 @@
     <dependency>
       <groupId>org.jpmml</groupId>
       <artifactId>pmml-model</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.15</version>
       <exclusions>
         <exclusion>
-          <groupId>com.sun.xml.fastinfoset</groupId>
-          <artifactId>FastInfoset</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.istack</groupId>
-          <artifactId>istack-commons-runtime</artifactId>
+          <groupId>org.jpmml</groupId>
+          <artifactId>pmml-agent</artifactId>
         </exclusion>
       </exclusions>
     </dependency>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message