From 126dc1019093272b4af732ec642eae7c67436572 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 25 Nov 2020 16:33:44 -0600
Subject: [PATCH 1/3] Correct META-INF/LICENSE handling

The uber-jar now uses META-INF/LICENSE from the maven build, not the dependencies.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-runner/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index b979e13e777..2e62d106459 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -27,7 +27,7 @@
             </goals>
             <configuration>
               <includes>**</includes>
-              <excludes>**/MANIFEST.MF,META-INF/*.RSA,META-INF/*.DSA,META-INF/*.SF,module-info.class</excludes>
+              <excludes>**/MANIFEST.MF,META-INF/LICENSE,META-INF/*.RSA,META-INF/*.DSA,META-INF/*.SF,module-info.class</excludes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>

From 29372f31680f909a3be26db5bf7248c5a2c1e519 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 26 Nov 2020 18:51:24 +0100
Subject: [PATCH 2/3] Issue #5168 - Jetty 10 artifact archives should have EPL
 2 license in them.

Excluded unnecessary files from jetty-runner jar.
Moved MANIFEST.MF to proper place to it does not get copied into the jar root.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 jetty-runner/pom.xml                            | 17 +++++++++++++++--
 jetty-runner/src/main/resources/MANIFEST.MF     |  1 -
 .../src/main/resources/META-INF/MANIFEST.MF     |  0
 3 files changed, 15 insertions(+), 3 deletions(-)
 delete mode 100644 jetty-runner/src/main/resources/MANIFEST.MF
 create mode 100644 jetty-runner/src/main/resources/META-INF/MANIFEST.MF

diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 2e62d106459..9dac4901910 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -27,7 +27,18 @@
             </goals>
             <configuration>
               <includes>**</includes>
-              <excludes>**/MANIFEST.MF,META-INF/LICENSE,META-INF/*.RSA,META-INF/*.DSA,META-INF/*.SF,module-info.class</excludes>
+              <excludes>
+                **/MANIFEST.MF,
+                META-INF/LICENSE,
+                META-INF/*.RSA,
+                META-INF/*.DSA,
+                META-INF/*.SF,
+                module-info.class,
+                readme.txt,
+                MANIFEST.MF,
+                about.html,
+                ecj.1
+              </excludes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -84,10 +95,12 @@
           <artifactId>maven-jar-plugin</artifactId>
           <configuration>
             <archive>
-              <manifestFile>src/main/resources/MANIFEST.MF</manifestFile>
               <manifest>
                 <mainClass>org.eclipse.jetty.runner.Runner</mainClass>
               </manifest>
+              <manifestEntries>
+                <Comment>Jetty Runner</Comment>
+              </manifestEntries>
             </archive>
           </configuration>
         </plugin>
diff --git a/jetty-runner/src/main/resources/MANIFEST.MF b/jetty-runner/src/main/resources/MANIFEST.MF
deleted file mode 100644
index fa816753df9..00000000000
--- a/jetty-runner/src/main/resources/MANIFEST.MF
+++ /dev/null
@@ -1 +0,0 @@
-Comment: Jetty Runner
diff --git a/jetty-runner/src/main/resources/META-INF/MANIFEST.MF b/jetty-runner/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..e69de29bb2d

From c6f7e837f42991591db57e9e8255e48cbdcbb9c0 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Fri, 27 Nov 2020 10:39:01 +1000
Subject: [PATCH 3/3] do not include test dependencies in jetty-runner jar

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-runner/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 9dac4901910..2092c497881 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -42,6 +42,8 @@
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
+              <excludeScope>test</excludeScope>
+              <includeScope>runtime</includeScope>
             </configuration>
           </execution>
         </executions>