From 18a4a777020d56a3a08d92b74ad181180aaaff5a Mon Sep 17 00:00:00 2001 From: Claus Stadler Date: Thu, 22 Jun 2023 14:16:53 +0200 Subject: [PATCH] Trying to get rid of logging conflicts due to reload4j and hadoop dependencies --- pom.xml | 185 ++++++++++++++++++++--------- rdf-processing-toolkit-cli/pom.xml | 85 +++++++++++-- 2 files changed, 207 insertions(+), 63 deletions(-) diff --git a/pom.xml b/pom.xml index 6770d80..b73b3e2 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,79 @@ + + + + + + + + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-webapp + + + javax.servlet.jsp + jsp-api + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-servlet + + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-server + + + + org.slf4j + slf4j-reload4j + + + + org.slf4j + slf4j-log4j12 + + + commons-logging + commons-logging + + + + org.aksw.conjure conjure-datasources @@ -306,79 +379,79 @@ - org.eclipse.jetty - jetty-client - ${jetty.version} + org.eclipse.jetty + jetty-client + ${jetty.version} - org.eclipse.jetty - jetty-util - ${jetty.version} + org.eclipse.jetty + jetty-util + ${jetty.version} - org.eclipse.jetty - jetty-io - ${jetty.version} + org.eclipse.jetty + jetty-io + ${jetty.version} - org.eclipse.jetty - jetty-http - ${jetty.version} + org.eclipse.jetty + jetty-http + ${jetty.version} - - org.eclipse.jetty - jetty-servlets - ${jetty.version} + + org.eclipse.jetty + jetty-servlets + ${jetty.version} - - org.eclipse.jetty - jetty-servlet - ${jetty.version} + + org.eclipse.jetty + jetty-servlet + ${jetty.version} - - org.eclipse.jetty - jetty-server - ${jetty.version} + + org.eclipse.jetty + jetty-server + ${jetty.version} - - org.eclipse.jetty - jetty-webapp - ${jetty.version} + + org.eclipse.jetty + jetty-webapp + ${jetty.version} - - org.eclipse.jetty - jetty-xml - ${jetty.version} + + org.eclipse.jetty + jetty-xml + ${jetty.version} - - org.eclipse.jetty - jetty-security - ${jetty.version} + + org.eclipse.jetty + jetty-security + ${jetty.version} - - org.eclipse.jetty - jetty-util-ajax - ${jetty.version} + + org.eclipse.jetty + jetty-util-ajax + ${jetty.version} - - org.eclipse.jetty - jetty-annotations - ${jetty.version} + + org.eclipse.jetty + jetty-annotations + ${jetty.version} - - org.eclipse.jetty - jetty-plus - ${jetty.version} + + org.eclipse.jetty + jetty-plus + ${jetty.version} - - org.eclipse.jetty - jetty-jndi - ${jetty.version} + + org.eclipse.jetty + jetty-jndi + ${jetty.version} - - org.eclipse.jetty - apache-jsp - ${jetty.version} + + org.eclipse.jetty + apache-jsp + ${jetty.version} junit diff --git a/rdf-processing-toolkit-cli/pom.xml b/rdf-processing-toolkit-cli/pom.xml index 19be9c9..ad8e557 100644 --- a/rdf-processing-toolkit-cli/pom.xml +++ b/rdf-processing-toolkit-cli/pom.xml @@ -28,15 +28,17 @@ + + + + + + + + org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} + hadoop-common org.aksw.conjure @@ -133,6 +135,75 @@ test + + + + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + generateManPages + process-classes + + java + + + + + true + true + picocli.codegen.docgen.manpage.ManPageGenerator + + --outdir=${project.build.directory}/generated-picocli-docs + org.aksw.rdf_processing_toolkit.cli.cmd.CmdRptMain + + + + + info.picocli + picocli-codegen + 4.7.4 + jar + + + + + + org.asciidoctor + asciidoctor-maven-plugin + 2.1.0 + + + output-html + process-classes + + process-asciidoc + + + coderay + html5 + + + + output-manpage + process-classes + + process-asciidoc + + + coderay + manpage + + + + + ${project.build.directory}/generated-picocli-docs + + + + dist