Merge pull request #28 from jenkinsci/jetty9.2

[JENKINS-23378] update to Jetty9.2
jenkinsci · Feb 25, 2016 · a91d455 · a91d455
2 parents 01181f0 + ebe619a
commit a91d455
Show file tree

Hide file tree

Showing 4 changed files with 348 additions and 415 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
     <dollar>$</dollar>
     <openbracket>{</openbracket>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.level>6</java.level>
+    <java.level>7</java.level>
   </properties>
 
   <repositories>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
+      <version>3.4</version>
       <!-- annotations are not needed for plugin execution, so exclude using provided scope -->
       <scope>provided</scope>
     </dependency>
@@ -118,9 +118,9 @@
       <version>2.2.0</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-maven-plugin</artifactId>
-      <version>8.1.16.v20140903</version>
+      <version>9.2.15.v20160210</version>
     </dependency>
     <dependency>
       <groupId>net.java.sezpoz</groupId>
@@ -243,7 +243,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.4</version>
         <configuration>
           <goalPrefix>hpi</goalPrefix>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -335,7 +335,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.4</version>
       </plugin>
     </plugins>
   </reporting>