|
142 | 142 | <codahale.metrics.version>3.1.5</codahale.metrics.version>
|
143 | 143 | <avro.version>1.8.2</avro.version>
|
144 | 144 | <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
|
145 |
| - <jets3t.version>0.9.4</jets3t.version> |
146 | 145 | <aws.kinesis.client.version>1.8.10</aws.kinesis.client.version>
|
147 | 146 | <!-- Should be consistent with Kinesis client dependency -->
|
148 | 147 | <aws.java.sdk.version>1.11.271</aws.java.sdk.version>
|
|
911 | 910 | <groupId>com.sun.jersey.contribs</groupId>
|
912 | 911 | <artifactId>*</artifactId>
|
913 | 912 | </exclusion>
|
| 913 | + <exclusion> |
| 914 | + <groupId>net.java.dev.jets3t</groupId> |
| 915 | + <artifactId>jets3t</artifactId> |
| 916 | + </exclusion> |
914 | 917 | </exclusions>
|
915 | 918 | </dependency>
|
916 | 919 | <dependency>
|
|
984 | 987 | </exclusion>
|
985 | 988 | </exclusions>
|
986 | 989 | </dependency>
|
987 |
| - <!-- See SPARK-1556 for info on this dependency: --> |
| 990 | + <!-- See SPARK-23654 for info on this dependency; |
| 991 | + It is used to keep javax.activation at v1.1.1 after dropping |
| 992 | + jets3t as a dependency. |
| 993 | + --> |
988 | 994 | <dependency>
|
989 |
| - <groupId>net.java.dev.jets3t</groupId> |
990 |
| - <artifactId>jets3t</artifactId> |
991 |
| - <version>${jets3t.version}</version> |
| 995 | + <groupId>javax.activation</groupId> |
| 996 | + <artifactId>activation</artifactId> |
| 997 | + <version>1.1.1</version> |
992 | 998 | <scope>${hadoop.deps.scope}</scope>
|
993 |
| - <exclusions> |
994 |
| - <exclusion> |
995 |
| - <groupId>commons-logging</groupId> |
996 |
| - <artifactId>commons-logging</artifactId> |
997 |
| - </exclusion> |
998 |
| - </exclusions> |
999 |
| - </dependency> |
1000 |
| - <dependency> |
1001 |
| - <groupId>org.bouncycastle</groupId> |
1002 |
| - <artifactId>bcprov-jdk15on</artifactId> |
1003 |
| - <!-- brought in by jets3t; see SPARK-22634 --> |
1004 |
| - <version>1.58</version> |
1005 | 999 | </dependency>
|
1006 | 1000 | <dependency>
|
1007 | 1001 | <groupId>org.apache.hadoop</groupId>
|
|
0 commit comments