Issue #4572 - Limiting inclusions in shaded jetty-start

+ Also adding note to jetty-util classes that are used by jetty-start Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Mar 10, 2020 · 6d4b5b4 · 6d4b5b4
1 parent 916e4ad
commit 6d4b5b4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
@@ -72,6 +72,16 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java b/jetty-util/src/main/java/org/eclipse/jetty/util/JavaVersion.java
@@ -24,6 +24,8 @@
  */
 public class JavaVersion
 {
+    // IMPORTANT NOTE: This class cannot use Logging, as this class is used by jetty-start
+
     /**
      * Context attribute that can be set to target a different version of the jvm than the current runtime.
      * Acceptable values should correspond to those returned by JavaVersion.getPlatform().

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ManifestUtils.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ManifestUtils.java
@@ -27,6 +27,8 @@
 
 public class ManifestUtils
 {
+    // IMPORTANT NOTE: This class cannot use Logging, as this class is used by jetty-start
+
     private ManifestUtils()
     {
     }

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/TopologicalSort.java b/jetty-util/src/main/java/org/eclipse/jetty/util/TopologicalSort.java
@@ -47,6 +47,8 @@
  */
 public class TopologicalSort<T>
 {
+    // IMPORTANT NOTE: This class cannot use Logging, as this class is used by jetty-start
+
     private final Map<T, Set<T>> _dependencies = new HashMap<>();
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ @@
     public class ManifestUtils
     {
+        // IMPORTANT NOTE: This class cannot use Logging, as this class is used by jetty-start
         private ManifestUtils()
         {
         }
@@ Expand Down @@