Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2012-02-15 19:49:23 +0000
committerJesse McConnell2012-02-15 19:49:23 +0000
commit098428dd376bc69657cf08c070bf2c3b3f80494b (patch)
tree39a78fef69e0001aaebe903425029c723c7172fa /jetty-aggregate
parent68737e7713d429e7eb78a00c35992cf9d21a7d27 (diff)
parentadeb18093b943d9a5fcdb96af4cd1169ddea4c81 (diff)
downloadorg.eclipse.jetty.project-098428dd376bc69657cf08c070bf2c3b3f80494b.tar.gz
org.eclipse.jetty.project-098428dd376bc69657cf08c070bf2c3b3f80494b.tar.xz
org.eclipse.jetty.project-098428dd376bc69657cf08c070bf2c3b3f80494b.zip
Merge branch 'master' into jetty-8
Diffstat (limited to 'jetty-aggregate')
-rw-r--r--jetty-aggregate/jetty-all/pom.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 105db34a78..07e5a969aa 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -37,7 +37,7 @@
<configuration>
<classifier>sources</classifier>
<includes>**/*</includes>
- <excludes>META-INF/**</excludes>
+ <excludes>META-INF/**,**/Servlet3Continuation*,**/Jetty6Continuation*</excludes>
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
<excludeArtifactIds>javax</excludeArtifactIds>
<excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
@@ -170,5 +170,11 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>

Back to the top