From 362458e145bfc77013573988193e62523728ab4f Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Fri, 12 Nov 2021 11:30:38 +1000
Subject: [PATCH] remove native libraries and use external project

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 .../quic-quiche/quic-quiche-common/pom.xml    | 19 ++++++-------------
 .../src/main/resources/libquiche-build.txt    |  8 --------
 2 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 jetty-quic/quic-quiche/quic-quiche-common/src/main/resources/libquiche-build.txt

diff --git a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml
index af7c45a0b29..b2d94f71b2d 100644
--- a/jetty-quic/quic-quiche/quic-quiche-common/pom.xml
+++ b/jetty-quic/quic-quiche/quic-quiche-common/pom.xml
@@ -12,21 +12,9 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.quic-quiche-common</bundle-symbolic-name>
+    <checkstyle.skip>true</checkstyle.skip>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${maven.checkstyle.plugin.version}</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -36,6 +24,11 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty.quic.libquiche</groupId>
+      <artifactId>jetty-quiche-native</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
diff --git a/jetty-quic/quic-quiche/quic-quiche-common/src/main/resources/libquiche-build.txt b/jetty-quic/quic-quiche/quic-quiche-common/src/main/resources/libquiche-build.txt
deleted file mode 100644
index cfd314dc72e..00000000000
--- a/jetty-quic/quic-quiche/quic-quiche-common/src/main/resources/libquiche-build.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-version=0.10.0
-
-# checkout and build quiche
-git clone --recursive https://github.com/cloudflare/quiche ${version}
-cd ${version}
-git checkout -b tag-${version} tags/${version}
-cargo build --features ffi,qlog
-ls ./target/debug/libquiche.so