Issue #4572 - no longer excluding slf4j from jetty-maven-plugin forke…

…d containerClasspath Signed-off-by: Joakim Erdfelt <[email protected]>
jetty · Feb 24, 2020 · 9034014 · 9034014
1 parent ab178f3
commit 9034014
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractWebAppMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractWebAppMojo.java
@@ -680,7 +680,7 @@ protected String getContainerClassPath() throws Exception
         for (Object obj : pluginArtifacts)
         {
             Artifact artifact = (Artifact)obj;
-            if ("jar".equals(artifact.getType()) && !artifact.getGroupId().contains("slf4j"))
+            if ("jar".equals(artifact.getType()))
             {
                 if (classPath.length() > 0)
                     classPath.append(File.pathSeparator);
@@ -689,7 +689,7 @@ protected String getContainerClassPath() throws Exception
             else
             {
                 if (artifact.getArtifactId().equals(plugin.getArtifactId())) //get the jetty-maven-plugin jar
-                 classPath.append(artifact.getFile().getAbsolutePath());                
+                    classPath.append(artifact.getFile().getAbsolutePath());
             }
         }
 

diff --git a/...aven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/TestWebAppPropertyConverter.java b/...aven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/TestWebAppPropertyConverter.java
@@ -35,6 +35,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -152,7 +153,7 @@ public void testFromProperties() throws Exception
         assertEquals(true, webApp.isPersistTempDirectory());
         assertEquals(war.getAbsolutePath(), webApp.getWar());
         assertEquals(webXml.getAbsolutePath(), webApp.getDescriptor());
-        assertTrue(webApp.getBaseResource() instanceof ResourceCollection);        
+        assertThat(webApp.getBaseResource(), instanceOf(ResourceCollection.class));
         assertThat(webApp.getBaseResource().toString(), Matchers.containsString(Resource.newResource(base1).toString()));
         assertThat(webApp.getBaseResource().toString(), Matchers.containsString(Resource.newResource(base2).toString()));
     }

diff --git a/jetty-maven-plugin/src/test/resources/embedder-context.xml b/jetty-maven-plugin/src/test/resources/embedder-context.xml
@@ -3,5 +3,4 @@
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/embedder</Set>
-  <Set name="resourceBase">src/test/resources/embedder</Set>
 </Configure>
diff --git a/jetty-maven-plugin/src/test/resources/embedder/.donotdelete b/jetty-maven-plugin/src/test/resources/embedder/.donotdelete