Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use jettt version property from parent pom 

Signed-off-by: olivier lamy <olamy@apache.org>
This commit is contained in:
olivier lamy 2018-12-31 15:57:55 +10:00
parent 1cfd9d7f40
commit 1472fd224f
8 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfile-itest
View File

@ -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 {

6
archiva-jetty/pom.xml
View File

@ -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>

4
archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml
View File

@ -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>

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -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>

6
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

@ -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>

8
archiva-modules/archiva-web/archiva-webapp-test/pom.xml
View File

@ -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>

8
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -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>

8
pom.xml
View File

@ -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>