Skip to content
This repository was archived by the owner on Oct 8, 2020. It is now read-only.

Commit ef512d1

Browse files
Made Flink deployment working (Scopt version has been decreased because Flink ships an older version)
1 parent 28b1b98 commit ef512d1

2 files changed

Lines changed: 58 additions & 43 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<dependency>
225225
<groupId>com.github.scopt</groupId>
226226
<artifactId>scopt_${scala.binary.version}</artifactId>
227-
<version>3.3.0</version>
227+
<version>3.5.0</version>
228228
</dependency>
229229

230230

sansa-inference-flink/pom.xml

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,11 @@ under the License.
9898
</dependency>
9999

100100
<!-- Scopt -->
101+
<!-- Flink Distribution uses 3.2.0 which leads to conflicts with newer versions -->
101102
<dependency>
102103
<groupId>com.github.scopt</groupId>
103104
<artifactId>scopt_${scala.binary.version}</artifactId>
105+
<version>3.2.0</version>
104106
</dependency>
105107

106108
</dependencies>
@@ -127,13 +129,15 @@ under the License.
127129
<goal>shade</goal>
128130
</goals>
129131
<configuration>
132+
<!--<minimizeJar>true</minimizeJar>-->
130133
<artifactSet>
131134
<excludes>
132135
<!-- This list contains all dependencies of flink-dist
133136
Everything else will be packaged into the fat-jar
134137
-->
135138
<exclude>org.apache.flink:flink-shaded-*_2.11</exclude>
136139
<exclude>org.apache.flink:flink-core_2.11</exclude>
140+
<exclude>org.apache.flink:flink-java*</exclude>
137141
<exclude>org.apache.flink:flink-java_2.11</exclude>
138142
<exclude>org.apache.flink:flink-scala_2.11</exclude>
139143
<exclude>org.apache.flink:flink-runtime_2.11</exclude>
@@ -171,49 +175,54 @@ under the License.
171175
<exclude>org.gephi:*</exclude>
172176
<exclude>org.netbeans.api:*</exclude>
173177

174-
<!--<exclude>commons-fileupload:commons-fileupload</exclude>-->
175-
<!--<exclude>org.apache.avro:avro</exclude>-->
176-
<!--<exclude>commons-collections:commons-collections</exclude>-->
177-
<!--<exclude>org.codehaus.jackson:jackson-core-asl</exclude>-->
178-
<!--<exclude>org.codehaus.jackson:jackson-mapper-asl</exclude>-->
179-
<!--<exclude>com.thoughtworks.paranamer:paranamer</exclude>-->
180-
<!--<exclude>org.xerial.snappy:snappy-java</exclude>-->
181-
<!--<exclude>org.apache.commons:commons-compress</exclude>-->
182-
<!--<exclude>org.tukaani:xz</exclude>-->
183-
<!--<exclude>com.esotericsoftware.kryo:kryo</exclude>-->
184-
<!--<exclude>com.esotericsoftware.minlog:minlog</exclude>-->
185-
<!--<exclude>org.objenesis:objenesis</exclude>-->
186-
<!--<exclude>com.twitter:chill_*</exclude>-->
187-
<!--<exclude>com.twitter:chill-java</exclude>-->
188-
<!--<exclude>com.twitter:chill-avro_*</exclude>-->
189-
<!--<exclude>com.twitter:chill-bijection_*</exclude>-->
190-
<!--<exclude>com.twitter:bijection-core_*</exclude>-->
191-
<!--<exclude>com.twitter:bijection-avro_*</exclude>-->
192-
<!--<exclude>commons-lang:commons-lang</exclude>-->
193-
<!--<exclude>junit:junit</exclude>-->
194-
<!--<exclude>de.javakaffee:kryo-serializers</exclude>-->
195-
<!--<exclude>joda-time:joda-time</exclude>-->
196-
<!--<exclude>org.apache.commons:commons-lang3</exclude>-->
197-
<!--<exclude>org.slf4j:slf4j-api</exclude>-->
198-
<!--<exclude>org.slf4j:slf4j-log4j12</exclude>-->
199-
<!--<exclude>log4j:log4j</exclude>-->
200-
<!--<exclude>org.apache.commons:commons-math</exclude>-->
201-
<!--<exclude>org.apache.sling:org.apache.sling.commons.json</exclude>-->
202-
<!--<exclude>commons-logging:commons-logging</exclude>-->
203-
<!--<exclude>org.apache.httpcomponents:httpclient</exclude>-->
204-
<!--<exclude>org.apache.httpcomponents:httpcore</exclude>-->
205-
<!--<exclude>commons-codec:commons-codec</exclude>-->
206-
<!--<exclude>com.fasterxml.jackson.core:jackson-core</exclude>-->
207-
<!--<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>-->
208-
<!--<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>-->
209-
<!--<exclude>org.codehaus.jettison:jettison</exclude>-->
210-
<!--<exclude>stax:stax-api</exclude>-->
211-
<!--<exclude>com.typesafe:config</exclude>-->
212-
<!--<exclude>org.uncommons.maths:uncommons-maths</exclude>-->
178+
<exclude>commons-fileupload:commons-fileupload</exclude>
179+
<exclude>org.apache.avro:avro</exclude>
180+
<exclude>commons-collections:commons-collections</exclude>
181+
<exclude>org.codehaus.jackson:jackson-core-asl</exclude>
182+
<exclude>org.codehaus.jackson:jackson-mapper-asl</exclude>
183+
<exclude>com.thoughtworks.paranamer:paranamer</exclude>
184+
<exclude>org.xerial.snappy:snappy-java</exclude>
185+
<exclude>org.apache.commons:commons-compress</exclude>
186+
<exclude>org.tukaani:xz</exclude>
187+
<exclude>com.esotericsoftware.kryo:kryo</exclude>
188+
<exclude>com.esotericsoftware.minlog:minlog</exclude>
189+
<exclude>org.objenesis:objenesis</exclude>
190+
<exclude>com.twitter:chill_*</exclude>
191+
<exclude>com.twitter:chill-java</exclude>
192+
<exclude>com.twitter:chill-avro_*</exclude>
193+
<exclude>com.twitter:chill-bijection_*</exclude>
194+
<exclude>com.twitter:bijection-core_*</exclude>
195+
<exclude>com.twitter:bijection-avro_*</exclude>
196+
<exclude>commons-lang:commons-lang</exclude>
197+
<exclude>junit:junit</exclude>
198+
<exclude>de.javakaffee:kryo-serializers</exclude>
199+
<exclude>joda-time:joda-time</exclude>
200+
<exclude>org.apache.commons:commons-lang3</exclude>
201+
<exclude>org.slf4j:slf4j-api</exclude>
202+
<exclude>org.slf4j:slf4j-log4j12</exclude>
203+
<exclude>log4j:log4j</exclude>
204+
<exclude>org.apache.commons:commons-math</exclude>
205+
<exclude>org.apache.sling:org.apache.sling.commons.json</exclude>
206+
<exclude>commons-logging:commons-logging</exclude>
207+
<exclude>org.apache.httpcomponents:httpclient</exclude>
208+
<exclude>org.apache.httpcomponents:httpcore</exclude>
209+
<exclude>commons-codec:commons-codec</exclude>
210+
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
211+
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
212+
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
213+
<exclude>org.codehaus.jettison:jettison</exclude>
214+
<exclude>stax:stax-api</exclude>
215+
<exclude>com.typesafe:config</exclude>
216+
<exclude>org.uncommons.maths:uncommons-maths</exclude>
213217
<!--<exclude>com.github.scopt:scopt_*</exclude>-->
214-
<!--<exclude>org.mortbay.jetty:servlet-api</exclude>-->
215-
<!--<exclude>commons-io:commons-io</exclude>-->
216-
<!--<exclude>commons-cli:commons-cli</exclude>-->
218+
<exclude>org.mortbay.jetty:servlet-api</exclude>
219+
<exclude>commons-io:commons-io</exclude>
220+
<exclude>commons-cli:commons-cli</exclude>
221+
222+
<exclude>sqlite:*</exclude>
223+
<exclude>netbeans:*</exclude>
224+
<exclude>org.apache.xmlgraphics:*</exclude>
225+
<exclude>mysql:*</exclude>
217226
</excludes>
218227
</artifactSet>
219228
<filters>
@@ -243,6 +252,12 @@ under the License.
243252
</transformer>
244253
</transformers>
245254
<createDependencyReducedPom>false</createDependencyReducedPom>
255+
<relocations>
256+
<relocation>
257+
<pattern>scopt</pattern>
258+
<shadedPattern>scopt.shaded</shadedPattern>
259+
</relocation>
260+
</relocations>
246261
</configuration>
247262
</execution>
248263
</executions>

0 commit comments

Comments
 (0)