Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #2080 Exclude cdi packages coming from maven plugin dependencies (#2084) 

Signed-off-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
Jan Bartel 2018-01-12 18:56:00 +01:00 committed by GitHub
parent c7e03d6175
commit 65101b776b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenWebInfConfiguration.java
View File

@ -63,10 +63,12 @@ public class MavenWebInfConfiguration extends WebInfConfiguration
// knock out environmental maven and plexus classes from webAppContext // knock out environmental maven and plexus classes from webAppContext
String[] existingServerClasses = context.getServerClasses(); String[] existingServerClasses = context.getServerClasses();
String[] newServerClasses = new String[2+(existingServerClasses==null?0:existingServerClasses.length)]; String[] newServerClasses = new String[4+(existingServerClasses==null?0:existingServerClasses.length)];
newServerClasses[0] = "org.apache.maven."; newServerClasses[0] = "org.apache.maven.";
newServerClasses[1] = "org.codehaus.plexus."; newServerClasses[1] = "org.codehaus.plexus.";
System.arraycopy( existingServerClasses, 0, newServerClasses, 2, existingServerClasses.length ); newServerClasses[2] = "javax.enterprise.";
newServerClasses[3] = "javax.decorator.";
System.arraycopy( existingServerClasses, 0, newServerClasses, 4, existingServerClasses.length );
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{ {
LOG.debug("Server classes:"); LOG.debug("Server classes:");