diff options
| author | Joakim Erdfelt | 2015-04-09 20:32:30 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-04-09 20:32:30 +0000 |
| commit | d89aa3a86615c64edb4bfb861b790d3f818716c5 (patch) | |
| tree | 1f7fbf712c7241280b59936a00de84db6a582d4b | |
| parent | 4a9d9eae945409eb242ca856a34d64df7e62d005 (diff) | |
| download | org.eclipse.jetty.project-d89aa3a86615c64edb4bfb861b790d3f818716c5.tar.gz org.eclipse.jetty.project-d89aa3a86615c64edb4bfb861b790d3f818716c5.tar.xz org.eclipse.jetty.project-d89aa3a86615c64edb4bfb861b790d3f818716c5.zip | |
Fixing compiler source for modules that now require Java 8
| -rw-r--r-- | jetty-server/pom.xml | 8 | ||||
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java | 4 | ||||
| -rw-r--r-- | jetty-util/pom.xml | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 378f27ac18..49bb00be98 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -15,6 +15,14 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index a25f07006b..cecf30c2e2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -2220,8 +2220,8 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu try { - @SuppressWarnings("unchecked") - Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className); + @SuppressWarnings({ "unchecked", "rawtypes" }) + Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):(Class)_classLoader.loadClass(className); addListener(clazz); } catch (ClassNotFoundException e) diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 93704de487..444ff6dc50 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -15,6 +15,14 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> |