From 1472fd224f9bcb5c45d7d7e1f833566899567844 Mon Sep 17 00:00:00 2001
From: olivier lamy <olamy@apache.org>
Date: Mon, 31 Dec 2018 15:57:55 +1000
Subject: use jettt version property from parent pom

Signed-off-by: olivier lamy <olamy@apache.org>
---
 Jenkinsfile-itest                                                 | 7 +++++--
 archiva-jetty/pom.xml                                             | 6 +++---
 .../archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml   | 6 +++---
 .../archiva-web/archiva-rest/archiva-rest-services/pom.xml        | 4 ++--
 archiva-modules/archiva-web/archiva-web-common/pom.xml            | 6 +++---
 archiva-modules/archiva-web/archiva-webapp-test/pom.xml           | 8 ++++----
 archiva-modules/archiva-web/archiva-webapp/pom.xml                | 8 ++++----
 pom.xml                                                           | 8 ++++----
 8 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index 975808dc0..fcdc1cd28 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -29,14 +29,17 @@ buildJdk = 'JDK 1.8 (latest)'
 buildMvn = 'Maven 3.5.2'
 deploySettings = 'archiva-uid-jenkins'
 DOCKERHUB_CREDS = '10a5f89e-504b-11e8-945d-7fd7b29cc41c'
-localRepository = ".repository"
+//localRepository = ".repository"
+localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
 
 pipeline {
     agent {
         label "${LABEL}"
     }
     options {
-        buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
+        disableConcurrentBuilds()
+        durabilityHint('PERFORMANCE_OPTIMIZED')
+        buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '3'))
     }
 
     stages {
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 1ce0b0b75..031ac12af 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -44,14 +44,14 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jndi</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-start</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
index b919145c6..8a0867501 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
@@ -97,13 +97,13 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-plus</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -210,4 +210,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 3b515e479..f423f12f2 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -384,12 +384,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 3d70a4824..3aa323705 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -310,19 +310,19 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 5b7d47fee..764d2d78e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -308,24 +308,24 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-api</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-client</artifactId>
-      <version>${jettyVersion}</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 3fd8427a2..70206545e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -968,22 +968,22 @@
           <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>${jettyVersion}</version>
+            <version>${jetty.version}</version>
           </dependency>
           <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${jettyVersion}</version>
+            <version>${jetty.version}</version>
           </dependency>
           <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
-            <version>${jettyVersion}</version>
+            <version>${jetty.version}</version>
           </dependency>
           <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-client</artifactId>
-            <version>${jettyVersion}</version>
+            <version>${jetty.version}</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 881c9b632..9fc64c602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <httpclient.version>4.5.2</httpclient.version>
     <httpclient.core.version>4.4.4</httpclient.core.version>
     <javaxMailVersion>1.4</javaxMailVersion>
-    <jettyVersion>9.4.8.v20171121</jettyVersion>
+    <jetty.version>9.4.14.v20181114</jetty.version>
     <guava.version>15.0</guava.version>
     <openjpaVersion>2.4.1</openjpaVersion>
 
@@ -1459,12 +1459,12 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>${jettyVersion}</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-plus</artifactId>
-        <version>${jettyVersion}</version>
+        <version>${jetty.version}</version>
       </dependency>
 
 
@@ -1848,7 +1848,7 @@
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>${jettyVersion}</version>
+          <version>${jetty.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
-- 
cgit v1.2.3