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

Commit 3c57dfe

Browse files
patrickwestphalpatrickwestphal
committed
Merge branch 'release/0.4.1'
2 parents c41fe02 + 67274e1 commit 3c57dfe

File tree

4 files changed

+50
-265
lines changed

4 files changed

+50
-265
lines changed

‎pom.xml‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>net.sansa-stack</groupId>
44
<artifactId>sansa-owl-parent_2.11</artifactId>
5-
<version>0.4.0</version>
5+
<version>0.4.1</version>
66
<packaging>pom</packaging>
77
<name>OWL - Parent</name>
88

@@ -65,10 +65,10 @@
6565
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6666
<scala.version>2.11.11</scala.version>
6767
<scala.binary.version>2.11</scala.binary.version>
68-
<spark.version>2.3.1</spark.version>
69-
<flink.version>1.5.0</flink.version>
70-
<hadoop.common.version>2.7.0</hadoop.common.version>
71-
<hadoop.mapreduce-client.version>2.7.0</hadoop.mapreduce-client.version>
68+
<spark.version>2.4.0</spark.version>
69+
<flink.version>1.7.0</flink.version>
70+
<hadoop.common.version>2.8.1</hadoop.common.version>
71+
<hadoop.mapreduce-client.version>2.8.1</hadoop.mapreduce-client.version>
7272
<owlapi.version>5.1.5</owlapi.version>
7373
<scalastyle.config.path>${project.basedir}/scalastyle-config.xml</scalastyle.config.path>
7474
</properties>
@@ -86,7 +86,7 @@
8686
<!-- Apache Spark dependencies -->
8787
<dependency>
8888
<groupId>org.apache.spark</groupId>
89-
<artifactId>spark-core_2.11</artifactId>
89+
<artifactId>spark-core_${scala.binary.version}</artifactId>
9090
<version>${spark.version}</version>
9191
</dependency>
9292
<dependency>
@@ -104,29 +104,35 @@
104104
<!-- Apache Flink dependencies -->
105105
<dependency>
106106
<groupId>org.apache.flink</groupId>
107-
<artifactId>flink-scala_${scala.binary.version}</artifactId>
107+
<artifactId>flink-core</artifactId>
108108
<version>${flink.version}</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>org.apache.flink</groupId>
112-
<artifactId>flink-clients_${scala.binary.version}</artifactId>
112+
<artifactId>flink-scala_2.11</artifactId>
113113
<version>${flink.version}</version>
114114
</dependency>
115115
<dependency>
116116
<groupId>org.apache.flink</groupId>
117-
<artifactId>flink-scala_2.11</artifactId>
117+
<artifactId>flink-clients_2.11</artifactId>
118118
<version>${flink.version}</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>org.apache.flink</groupId>
122-
<artifactId>flink-clients_2.11</artifactId>
122+
<artifactId>flink-filesystems</artifactId>
123+
<version>${flink.version}</version>
124+
<type>pom</type>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.apache.flink</groupId>
128+
<artifactId>flink-hadoop-compatibility_2.11</artifactId>
123129
<version>${flink.version}</version>
124130
</dependency>
125-
<!-- was required to be able to switch to Flink 1.3 -->
126131
<dependency>
127132
<groupId>org.apache.flink</groupId>
128-
<artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
133+
<artifactId>flink-shaded-hadoop</artifactId>
129134
<version>${flink.version}</version>
135+
<type>pom</type>
130136
</dependency>
131137

132138
<!--
@@ -214,7 +220,7 @@
214220
<groupId>com.holdenkarau</groupId>
215221
<artifactId>spark-testing-base_${scala.binary.version}</artifactId>
216222
<!--version>${spark.version}_0.4.7</version-->
217-
<version>2.1.0_0.6.0</version>
223+
<version>2.3.1_0.10.0</version>
218224
<scope>test</scope>
219225
</dependency>
220226

@@ -224,7 +230,6 @@
224230
<artifactId>scala-logging_2.11</artifactId>
225231
<version>3.5.0</version>
226232
</dependency>
227-
<!-- needed due to the flink-hadoop-compatibility dependency -->
228233
<dependency>
229234
<groupId>log4j</groupId>
230235
<artifactId>log4j</artifactId>

‎sansa-owl-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>net.sansa-stack</groupId>
99
<artifactId>sansa-owl-parent_2.11</artifactId>
10-
<version>0.4.0</version>
10+
<version>0.4.1</version>
1111
</parent>
1212

1313
<artifactId>sansa-owl-common_2.11</artifactId>
14-
<version>0.4.0</version>
14+
<version>0.4.1</version>
1515

1616
<dependencies>
1717
<!-- Scala dependencies -->

‎sansa-owl-flink/pom.xml‎

Lines changed: 25 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>sansa-owl-parent_2.11</artifactId>
99
<groupId>net.sansa-stack</groupId>
10-
<version>0.4.0</version>
10+
<version>0.4.1</version>
1111
</parent>
1212

1313
<artifactId>sansa-owl-flink_2.11</artifactId>
14-
<version>0.4.0</version>
14+
<version>0.4.1</version>
1515

1616
<name>SANSA OWL layer - Flink</name>
1717
<description>A library to read OWL files into Flink.</description>
@@ -34,18 +34,40 @@
3434
<groupId>org.apache.flink</groupId>
3535
<artifactId>flink-scala_2.11</artifactId>
3636
</dependency>
37+
<dependency>
38+
<groupId>org.apache.flink</groupId>
39+
<artifactId>flink-core</artifactId>
40+
</dependency>
3741
<dependency>
3842
<groupId>org.apache.flink</groupId>
3943
<artifactId>flink-clients_2.11</artifactId>
4044
</dependency>
4145
<dependency>
4246
<groupId>org.apache.flink</groupId>
43-
<artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
47+
<artifactId>flink-filesystems</artifactId>
48+
<type>pom</type>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.flink</groupId>
52+
<artifactId>flink-shaded-hadoop</artifactId>
53+
<type>pom</type>
4454
</dependency>
4555
<dependency>
4656
<groupId>de.javakaffee</groupId>
4757
<artifactId>kryo-serializers</artifactId>
4858
</dependency>
59+
<dependency>
60+
<groupId>org.apache.flink</groupId>
61+
<artifactId>flink-hadoop-compatibility_2.11</artifactId>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.hadoop</groupId>
65+
<artifactId>hadoop-common</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.apache.hadoop</groupId>
69+
<artifactId>hadoop-mapreduce-client-core</artifactId>
70+
</dependency>
4971

5072
<!-- OWL API dependencies -->
5173
<dependency>
@@ -107,123 +129,5 @@
107129
</dependency>
108130
</dependencies>
109131
</profile>
110-
111-
<profile>
112-
<id>dist</id>
113-
<activation>
114-
<property>
115-
<name>dist</name>
116-
</property>
117-
</activation>
118-
<build>
119-
<plugins>
120-
<plugin>
121-
<groupId>org.apache.maven.plugins</groupId>
122-
<artifactId>maven-shade-plugin</artifactId>
123-
<version>2.4.3</version>
124-
<executions>
125-
<execution>
126-
<phase>package</phase>
127-
<goals>
128-
<goal>shade</goal>
129-
</goals>
130-
<configuration>
131-
<artifactSet>
132-
<excludes>
133-
<exclude>com.esotericsoftware:kryo</exclude>
134-
<exclude>com.esotericsoftware:minlog</exclude>
135-
<exclude>com.esotericsoftware:reflectasm</exclude>
136-
<exclude>com.esotericsoftware.kryo:kryo</exclude>
137-
<exclude>com.esotericsoftware.minlog:minlog</exclude>
138-
<exclude>com.fasterxml.jackson.core:jackson*</exclude>
139-
<exclude>com.github.scopt:scopt_2.11</exclude>
140-
<exclude>com.jamesmurty.utils:java-xmlbuilder</exclude>
141-
<exclude>com.jcraft:jsch</exclude>
142-
<exclude>com.sun.jersey:jersey-client</exclude>
143-
<exclude>com.thoughtworks.paranamer:paranamer</exclude>
144-
<exclude>com.twitter:chill_2.11</exclude>
145-
<exclude>com.twitter:chill-java</exclude>
146-
<exclude>com.typesafe.akka:akka-actor_2.11</exclude>
147-
<exclude>com.typesafe.akka:akka-protobuf_2.11</exclude>
148-
<exclude>com.typesafe.akka:akka-slf4j_2.11</exclude>
149-
<exclude>com.typesafe.akka:akka-stream_2.11</exclude>
150-
<exclude>com.typesafe:config</exclude>
151-
<exclude>com.typesafe:ssl-config-core_2.11</exclude>
152-
<exclude>commons-beanutils:commons-beanutils</exclude>
153-
<exclude>commons-cli:commons-cli</exclude>
154-
<exclude>commons-codec:commons-codec</exclude>
155-
<exclude>commons-collections:commons-collections</exclude>
156-
<exclude>commons-configuration:commons-configuration</exclude>
157-
<exclude>commons-daemon:commons-daemon</exclude>
158-
<exclude>commons-digester:commons-digester</exclude>
159-
<exclude>commons-io:commons-io</exclude>
160-
<exclude>commons-lang:commons-lang</exclude>
161-
<exclude>commons-logging:commons-logging</exclude>
162-
<exclude>commons-net:commons-net</exclude>
163-
<exclude>javax.activation:activation</exclude>
164-
<exclude>javax.servlet:servlet-api</exclude>
165-
<exclude>javax.xml.bind:jaxb-api</exclude>
166-
<exclude>javax.xml.stream:stax-api</exclude>
167-
<exclude>org.apache.avro:avro</exclude>
168-
<exclude>org.apache.commons:commons-lang3</exclude>
169-
<exclude>org.apache.commons:commons-math3</exclude>
170-
<exclude>org.apache.commons:commons-compress</exclude>
171-
<exclude>org.apache.flink:flink-annotations</exclude>
172-
<exclude>org.apache.flink:flink-avro_2.11</exclude>
173-
<exclude>org.apache.flink:flink-clients_2.11</exclude>
174-
<exclude>org.apache.flink:flink-core_2.11</exclude>
175-
<exclude>org.apache.flink:flink-core</exclude>
176-
<exclude>org.apache.flink:flink-hadoop-fs</exclude>
177-
<exclude>org.apache.flink:flink-java*</exclude>
178-
<exclude>org.apache.flink:flink-java_2.11</exclude>
179-
<exclude>org.apache.flink:flink-metrics-core</exclude>
180-
<exclude>org.apache.flink:flink-optimizer_2.11</exclude>
181-
<exclude>org.apache.flink:flink-queryable-state-client-java_2.11</exclude>
182-
<exclude>org.apache.flink:flink-runtime_2.11</exclude>
183-
<exclude>org.apache.flink:flink-scala_2.11</exclude>
184-
<exclude>org.apache.flink:flink-shaded-asm</exclude>
185-
<exclude>org.apache.flink:flink-shaded-guava</exclude>
186-
<exclude>org.apache.flink:flink-shaded-hadoop2</exclude>
187-
<exclude>org.apache.flink:flink-shaded-jackson</exclude>
188-
<exclude>org.apache.flink:flink-shaded-netty</exclude>
189-
<exclude>org.apache.flink:flink-java-examples_2.11</exclude>
190-
<exclude>org.apache.flink:flink-scala-examples_2.11</exclude>
191-
<exclude>org.apache.flink:flink-streaming-examples_2.11</exclude>
192-
<exclude>org.apache.flink:flink-streaming-java_2.11</exclude>
193-
<exclude>org.apache.flink:force-shading</exclude>
194-
<exclude>org.apache.httpcomponents:*</exclude>
195-
<exclude>org.apache.zookeeper:zookeeper</exclude>
196-
<exclude>org.clapper:grizzled-slf4j_2.11</exclude>
197-
<exclude>org.codehaus.jackson:jackson-core-asl</exclude>
198-
<exclude>org.codehaus.jackson:jackson-mapper-asl</exclude>
199-
<exclude>org.javassist:javassist</exclude>
200-
<exclude>org.objenesis:objenesis</exclude>
201-
<exclude>org.scala-lang:*</exclude>
202-
<exclude>org.scala-lang.modules:scala-parser-combinators_2.11</exclude>
203-
<exclude>org.scala-lang.modules:scala-java8-compat_2.11</exclude>
204-
<exclude>org.scala-lang.modules:scala-xml_2.11</exclude>
205-
<exclude>org.slf4j:slf4j-api</exclude>
206-
<exclude>org.tukaani:xz</exclude>
207-
<exclude>org.xerial.snappy:snappy-java</exclude>
208-
</excludes>
209-
</artifactSet>
210-
<filters>
211-
<filter>
212-
<artifact>*:*</artifact>
213-
<excludes>
214-
<exclude>META-INF/*.SF</exclude>
215-
<exclude>META-INF/*.DSA</exclude>
216-
<exclude>META-INF/*.RSA</exclude>
217-
</excludes>
218-
</filter>
219-
</filters>
220-
<createDependencyReducedPom>false</createDependencyReducedPom>
221-
</configuration>
222-
</execution>
223-
</executions>
224-
</plugin>
225-
</plugins>
226-
</build>
227-
</profile>
228132
</profiles>
229133
</project>

0 commit comments

Comments
 (0)