try to fix rpt integrate --server by manually pinning jetty version

SmartDataAnalytics · Jun 5, 2023 · f2a456a · f2a456a
1 parent eda4918
commit f2a456a
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -56,6 +56,8 @@
 		<conjure.version>4.8.0-3-SNAPSHOT</conjure.version>
 		<jackson.version>2.12.0</jackson.version>
 		<commons-vfs2.version>2.9.0</commons-vfs2.version>
+		<hadoop.version>3.3.4</hadoop.version>
+		<jetty.version>9.4.40.v20210413</jetty.version>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 		<!-- Project Settings -->
@@ -302,6 +304,82 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<!-- explicit jetty dependencies to pin version conflict with hadoop-client -->
+			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-client</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-util</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-io</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-http</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-servlets</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-servlet</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-server</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-webapp</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-xml</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-security</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-util-ajax</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-annotations</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-plus</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>jetty-jndi</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
+ 			<dependency>
+			  <groupId>org.eclipse.jetty</groupId>
+			  <artifactId>apache-jsp</artifactId>
+			  <version>${jetty.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>

diff --git a/rdf-processing-toolkit-cli/pom.xml b/rdf-processing-toolkit-cli/pom.xml
@@ -21,6 +21,22 @@
 		<dependency>
 			<groupId>net.sansa-stack</groupId>
 			<artifactId>sansa-cmds-picocli_2.12</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.hadoop</groupId>
+					<artifactId>hadoop-client-runtime</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+		  <groupId>org.apache.hadoop</groupId>
+		  <artifactId>hadoop-client</artifactId>
+		  <version>${hadoop.version}</version>
+		</dependency>
+		<dependency>
+		  <groupId>org.apache.hadoop</groupId>
+		  <artifactId>hadoop-client-api</artifactId>
+		  <version>${hadoop.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.aksw.conjure</groupId>

diff --git a/...essing-toolkit-cli/src/main/java/org/aksw/sparql_binding_stream/cli/main/SbsCmdImpls.java b/...essing-toolkit-cli/src/main/java/org/aksw/sparql_binding_stream/cli/main/SbsCmdImpls.java
@@ -25,7 +25,7 @@
 import org.aksw.jenax.stmt.parser.query.SparqlQueryParserWrapperSelectShortForm;
 import org.aksw.sparql_binding_stream.cli.cmd.CmdSbsFilter;
 import org.aksw.sparql_binding_stream.cli.cmd.CmdSbsMap;
-import org.apache.hadoop.shaded.org.apache.commons.compress.utils.CloseShieldFilterInputStream;
+import org.apache.commons.compress.utils.CloseShieldFilterInputStream;
 import org.apache.jena.atlas.web.TypedInputStream;
 import org.apache.jena.query.ARQ;
 import org.apache.jena.query.Query;