diff --git a/pom.xml b/pom.xml
index 93fb88c813..668b13cb81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,8 @@
     <jersey.version>1.19</jersey.version>
     <ehcache.version>2.6.6</ehcache.version>
     <freemarker.version>2.3.20</freemarker.version>
-    <jetty.version>7.6.16.v20140903</jetty.version>
+    <jetty.version>7.6.18.v20150929</jetty.version>
+    <jetty.maven.version>7.6.16.v20140903</jetty.maven.version>
 
     <!-- security libraries -->
     <shiro.version>1.2.3</shiro.version>
diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml
index 6779d55ed6..d1bd41276b 100644
--- a/scm-clients/scm-cli-client/pom.xml
+++ b/scm-clients/scm-cli-client/pom.xml
@@ -168,7 +168,7 @@
           <plugin>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.maven.version}</version>
             <configuration>
               <stopPort>8085</stopPort>
               <stopKey>STOP</stopKey>
diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml
index b3abff916e..4ea0544ffc 100644
--- a/scm-clients/scm-client-impl/pom.xml
+++ b/scm-clients/scm-client-impl/pom.xml
@@ -176,7 +176,7 @@
           <plugin>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.maven.version}</version>
             <configuration>
               <stopPort>8085</stopPort>
               <stopKey>STOP</stopKey>
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 4f2e59e4ad..0e98df13a0 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -466,7 +466,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>${jetty.version}</version>
+        <version>${jetty.maven.version}</version>
         <configuration>
           <stopPort>8005</stopPort>
           <stopKey>STOP</stopKey>
@@ -617,7 +617,7 @@
           <plugin>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.maven.version}</version>
             <configuration>
               <stopPort>8085</stopPort>
               <stopKey>STOP</stopKey>
@@ -697,7 +697,7 @@
           <plugin>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.maven.version}</version>
             <configuration>
               <stopPort>8086</stopPort>
               <stopKey>STOP</stopKey>