Skip to content

Commit 18a4a77

Browse files
AklakanAklakan
committed
Trying to get rid of logging conflicts due to reload4j and hadoop dependencies
1 parent f2a456a commit 18a4a77

File tree

2 files changed

+207
-63
lines changed

2 files changed

+207
-63
lines changed

‎pom.xml‎

Lines changed: 129 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,79 @@
7373
</properties>
7474
<dependencyManagement>
7575
<dependencies>
76+
<dependency>
77+
<!-- <groupId>org.apache.hadoop</groupId>-->
78+
<!-- <artifactId>hadoop-client</artifactId>-->
79+
<!-- <version>${hadoop.version}</version>-->
80+
<!-- </dependency>-->
81+
<!-- <dependency>-->
82+
<!-- <groupId>org.apache.hadoop</groupId>-->
83+
<!-- <artifactId>hadoop-client-api</artifactId>-->
84+
<!-- <version>${hadoop.version}</version>-->
85+
<groupId>org.apache.hadoop</groupId>
86+
<artifactId>hadoop-common</artifactId>
87+
<version>${hadoop.version}</version>
88+
<!-- <exclusions> <exclusion> <groupId>*</groupId> <artifactId>*</artifactId>
89+
</exclusion> </exclusions> -->
90+
<!-- Exclude web stuff (jetty, jersey)from hadoop -->
91+
<exclusions>
92+
<exclusion>
93+
<groupId>org.eclipse.jetty</groupId>
94+
<artifactId>jetty-server</artifactId>
95+
</exclusion>
96+
<exclusion>
97+
<groupId>org.eclipse.jetty</groupId>
98+
<artifactId>jetty-util</artifactId>
99+
</exclusion>
100+
<exclusion>
101+
<groupId>org.eclipse.jetty</groupId>
102+
<artifactId>jetty-servlet</artifactId>
103+
</exclusion>
104+
<exclusion>
105+
<groupId>org.eclipse.jetty</groupId>
106+
<artifactId>jetty-webapp</artifactId>
107+
</exclusion>
108+
<exclusion>
109+
<groupId>javax.servlet.jsp</groupId>
110+
<artifactId>jsp-api</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>com.sun.jersey</groupId>
114+
<artifactId>jersey-core</artifactId>
115+
</exclusion>
116+
<exclusion>
117+
<groupId>com.sun.jersey</groupId>
118+
<artifactId>jersey-servlet</artifactId>
119+
</exclusion>
120+
<exclusion>
121+
<groupId>com.sun.jersey</groupId>
122+
<artifactId>jersey-json</artifactId>
123+
</exclusion>
124+
<exclusion>
125+
<groupId>com.sun.jersey</groupId>
126+
<artifactId>jersey-server</artifactId>
127+
</exclusion>
128+
<!-- <exclusion> <groupId>ch.qos.reload4j</groupId> <artifactId>reload4j</artifactId>
129+
</exclusion> -->
130+
<exclusion>
131+
<groupId>org.slf4j</groupId>
132+
<artifactId>slf4j-reload4j</artifactId>
133+
</exclusion>
134+
<!-- <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId>
135+
</exclusion> -->
136+
<exclusion>
137+
<groupId>org.slf4j</groupId>
138+
<artifactId>slf4j-log4j12</artifactId>
139+
</exclusion>
140+
<exclusion>
141+
<groupId>commons-logging</groupId>
142+
<artifactId>commons-logging</artifactId>
143+
</exclusion>
144+
<!-- <exclusion> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId>
145+
</exclusion> <exclusion> <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId>
146+
</exclusion> -->
147+
</exclusions>
148+
</dependency>
76149
<dependency>
77150
<groupId>org.aksw.conjure</groupId>
78151
<artifactId>conjure-datasources</artifactId>
@@ -306,79 +379,79 @@
306379
</dependency>
307380
<!-- explicit jetty dependencies to pin version conflict with hadoop-client -->
308381
<dependency>
309-
<groupId>org.eclipse.jetty</groupId>
310-
<artifactId>jetty-client</artifactId>
311-
<version>${jetty.version}</version>
382+
<groupId>org.eclipse.jetty</groupId>
383+
<artifactId>jetty-client</artifactId>
384+
<version>${jetty.version}</version>
312385
</dependency>
313386
<dependency>
314-
<groupId>org.eclipse.jetty</groupId>
315-
<artifactId>jetty-util</artifactId>
316-
<version>${jetty.version}</version>
387+
<groupId>org.eclipse.jetty</groupId>
388+
<artifactId>jetty-util</artifactId>
389+
<version>${jetty.version}</version>
317390
</dependency>
318391
<dependency>
319-
<groupId>org.eclipse.jetty</groupId>
320-
<artifactId>jetty-io</artifactId>
321-
<version>${jetty.version}</version>
392+
<groupId>org.eclipse.jetty</groupId>
393+
<artifactId>jetty-io</artifactId>
394+
<version>${jetty.version}</version>
322395
</dependency>
323396
<dependency>
324-
<groupId>org.eclipse.jetty</groupId>
325-
<artifactId>jetty-http</artifactId>
326-
<version>${jetty.version}</version>
397+
<groupId>org.eclipse.jetty</groupId>
398+
<artifactId>jetty-http</artifactId>
399+
<version>${jetty.version}</version>
327400
</dependency>
328-
<dependency>
329-
<groupId>org.eclipse.jetty</groupId>
330-
<artifactId>jetty-servlets</artifactId>
331-
<version>${jetty.version}</version>
401+
<dependency>
402+
<groupId>org.eclipse.jetty</groupId>
403+
<artifactId>jetty-servlets</artifactId>
404+
<version>${jetty.version}</version>
332405
</dependency>
333-
<dependency>
334-
<groupId>org.eclipse.jetty</groupId>
335-
<artifactId>jetty-servlet</artifactId>
336-
<version>${jetty.version}</version>
406+
<dependency>
407+
<groupId>org.eclipse.jetty</groupId>
408+
<artifactId>jetty-servlet</artifactId>
409+
<version>${jetty.version}</version>
337410
</dependency>
338-
<dependency>
339-
<groupId>org.eclipse.jetty</groupId>
340-
<artifactId>jetty-server</artifactId>
341-
<version>${jetty.version}</version>
411+
<dependency>
412+
<groupId>org.eclipse.jetty</groupId>
413+
<artifactId>jetty-server</artifactId>
414+
<version>${jetty.version}</version>
342415
</dependency>
343-
<dependency>
344-
<groupId>org.eclipse.jetty</groupId>
345-
<artifactId>jetty-webapp</artifactId>
346-
<version>${jetty.version}</version>
416+
<dependency>
417+
<groupId>org.eclipse.jetty</groupId>
418+
<artifactId>jetty-webapp</artifactId>
419+
<version>${jetty.version}</version>
347420
</dependency>
348-
<dependency>
349-
<groupId>org.eclipse.jetty</groupId>
350-
<artifactId>jetty-xml</artifactId>
351-
<version>${jetty.version}</version>
421+
<dependency>
422+
<groupId>org.eclipse.jetty</groupId>
423+
<artifactId>jetty-xml</artifactId>
424+
<version>${jetty.version}</version>
352425
</dependency>
353-
<dependency>
354-
<groupId>org.eclipse.jetty</groupId>
355-
<artifactId>jetty-security</artifactId>
356-
<version>${jetty.version}</version>
426+
<dependency>
427+
<groupId>org.eclipse.jetty</groupId>
428+
<artifactId>jetty-security</artifactId>
429+
<version>${jetty.version}</version>
357430
</dependency>
358-
<dependency>
359-
<groupId>org.eclipse.jetty</groupId>
360-
<artifactId>jetty-util-ajax</artifactId>
361-
<version>${jetty.version}</version>
431+
<dependency>
432+
<groupId>org.eclipse.jetty</groupId>
433+
<artifactId>jetty-util-ajax</artifactId>
434+
<version>${jetty.version}</version>
362435
</dependency>
363-
<dependency>
364-
<groupId>org.eclipse.jetty</groupId>
365-
<artifactId>jetty-annotations</artifactId>
366-
<version>${jetty.version}</version>
436+
<dependency>
437+
<groupId>org.eclipse.jetty</groupId>
438+
<artifactId>jetty-annotations</artifactId>
439+
<version>${jetty.version}</version>
367440
</dependency>
368-
<dependency>
369-
<groupId>org.eclipse.jetty</groupId>
370-
<artifactId>jetty-plus</artifactId>
371-
<version>${jetty.version}</version>
441+
<dependency>
442+
<groupId>org.eclipse.jetty</groupId>
443+
<artifactId>jetty-plus</artifactId>
444+
<version>${jetty.version}</version>
372445
</dependency>
373-
<dependency>
374-
<groupId>org.eclipse.jetty</groupId>
375-
<artifactId>jetty-jndi</artifactId>
376-
<version>${jetty.version}</version>
446+
<dependency>
447+
<groupId>org.eclipse.jetty</groupId>
448+
<artifactId>jetty-jndi</artifactId>
449+
<version>${jetty.version}</version>
377450
</dependency>
378-
<dependency>
379-
<groupId>org.eclipse.jetty</groupId>
380-
<artifactId>apache-jsp</artifactId>
381-
<version>${jetty.version}</version>
451+
<dependency>
452+
<groupId>org.eclipse.jetty</groupId>
453+
<artifactId>apache-jsp</artifactId>
454+
<version>${jetty.version}</version>
382455
</dependency>
383456
<dependency>
384457
<groupId>junit</groupId>

‎rdf-processing-toolkit-cli/pom.xml‎

Lines changed: 78 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@
2828
</exclusion>
2929
</exclusions>
3030
</dependency>
31+
<!-- <dependency>-->
32+
<!-- <groupId>org.apache.hadoop</groupId>-->
33+
<!-- <artifactId>hadoop-client</artifactId>-->
34+
<!-- </dependency>-->
35+
<!-- <dependency>-->
36+
<!-- <groupId>org.apache.hadoop</groupId>-->
37+
<!-- <artifactId>hadoop-client-api</artifactId>-->
38+
<!-- </dependency>-->
3139
<dependency>
3240
<groupId>org.apache.hadoop</groupId>
33-
<artifactId>hadoop-client</artifactId>
34-
<version>${hadoop.version}</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.apache.hadoop</groupId>
38-
<artifactId>hadoop-client-api</artifactId>
39-
<version>${hadoop.version}</version>
41+
<artifactId>hadoop-common</artifactId>
4042
</dependency>
4143
<dependency>
4244
<groupId>org.aksw.conjure</groupId>
@@ -133,6 +135,75 @@
133135
<scope>test</scope>
134136
</dependency>
135137
</dependencies>
138+
139+
<!-- net.sansa_stack.spark.cli.cmd.VersionProviderFromClasspathProperties.getVersion(VersionProviderFromClasspathProperties.java:32) -->
140+
<build><plugins>
141+
<plugin>
142+
<groupId>org.codehaus.mojo</groupId>
143+
<artifactId>exec-maven-plugin</artifactId>
144+
<version>3.0.0</version>
145+
<executions>
146+
<execution>
147+
<id>generateManPages</id>
148+
<phase>process-classes</phase>
149+
<goals>
150+
<goal>java</goal>
151+
</goals>
152+
</execution>
153+
</executions>
154+
<configuration>
155+
<includeProjectDependencies>true</includeProjectDependencies>
156+
<includePluginDependencies>true</includePluginDependencies>
157+
<mainClass>picocli.codegen.docgen.manpage.ManPageGenerator</mainClass>
158+
<arguments>
159+
<argument>--outdir=${project.build.directory}/generated-picocli-docs</argument>
160+
<argument>org.aksw.rdf_processing_toolkit.cli.cmd.CmdRptMain</argument>
161+
</arguments>
162+
</configuration>
163+
<dependencies>
164+
<dependency>
165+
<groupId>info.picocli</groupId>
166+
<artifactId>picocli-codegen</artifactId>
167+
<version>4.7.4</version>
168+
<type>jar</type>
169+
</dependency>
170+
</dependencies>
171+
</plugin>
172+
173+
<plugin>
174+
<groupId>org.asciidoctor</groupId>
175+
<artifactId>asciidoctor-maven-plugin</artifactId>
176+
<version>2.1.0</version>
177+
<executions>
178+
<execution>
179+
<id>output-html</id>
180+
<phase>process-classes</phase>
181+
<goals>
182+
<goal>process-asciidoc</goal>
183+
</goals>
184+
<configuration>
185+
<sourceHighlighter>coderay</sourceHighlighter>
186+
<backend>html5</backend>
187+
</configuration>
188+
</execution>
189+
<execution>
190+
<id>output-manpage</id>
191+
<phase>process-classes</phase>
192+
<goals>
193+
<goal>process-asciidoc</goal>
194+
</goals>
195+
<configuration>
196+
<sourceHighlighter>coderay</sourceHighlighter>
197+
<backend>manpage</backend>
198+
</configuration>
199+
</execution>
200+
</executions>
201+
<configuration>
202+
<sourceDirectory>${project.build.directory}/generated-picocli-docs</sourceDirectory>
203+
</configuration>
204+
</plugin>
205+
</plugins></build>
206+
136207
<profiles>
137208
<profile>
138209
<id>dist</id>

0 commit comments

Comments
 (0)