From e58baf4ecbd2e587aa17ce2e7bbe3bcabd81894d Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Thu, 3 May 2018 12:15:39 +0200
Subject: [PATCH] SONAR-10611 Serve .jpg and .jpeg as static resources

---
 .../src/main/java/org/sonar/api/web/ServletFilter.java        | 2 +-
 .../src/test/java/org/sonar/api/web/ServletFilterTest.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java
index 93e549358dd..fd4bad56bc4 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/ServletFilter.java
@@ -142,7 +142,7 @@ public abstract class ServletFilter implements Filter {
     public static class Builder {
       private static final String WILDCARD_CHAR = "*";
       private static final Collection<String> STATIC_RESOURCES = unmodifiableList(asList(
-        "*.css", "*.css.map", "*.ico", "*.png", "*.gif", "*.svg", "*.js", "*.js.map", "*.eot", "*.ttf", "*.woff",
+        "*.css", "*.css.map", "*.ico", "*.png", "*.jpg", "*.jpeg", "*.gif", "*.svg", "*.js", "*.js.map", "*.eot", "*.ttf", "*.woff",
         "/static/*", "/robots.txt","/favicon.ico", "/apple-touch-icon*", "/mstile*"
       ));
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java
index 43e3379cf57..33389b6a321 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/web/ServletFilterTest.java
@@ -232,6 +232,8 @@ public class ServletFilterTest {
       "*.css.map",
       "*.ico",
       "*.png",
+      "*.jpg",
+      "*.jpeg",
       "*.gif",
       "*.svg",
       "*.js",
@@ -247,7 +249,7 @@ public class ServletFilterTest {
   }
 
   @Test
-  public void test_label() throws Exception {
+  public void test_label() {
     assertThat(ServletFilter.UrlPattern.builder().build().label()).isEqualTo("UrlPattern{inclusions=[], exclusions=[]}");
     assertThat(ServletFilter.UrlPattern.builder()
       .includes("/foo/*")
-- 
2.39.5