aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2020-01-12 17:41:51 +0100
committerMartin Stockhammer <martin_s@apache.org>2020-01-12 17:41:51 +0100
commit7f6436c0e26b7792942917181c56218faf116073 (patch)
tree93d0939d44a34310542cb9f113d2597b6bf52d3d
parentd805755df8561b933cf4e02acfb41fcf9b9e2196 (diff)
downloadarchiva-7f6436c0e26b7792942917181c56218faf116073.tar.gz
archiva-7f6436c0e26b7792942917181c56218faf116073.zip
Setting jackson version
-rw-r--r--Jenkinsfile2
-rw-r--r--pom.xml6
2 files changed, 4 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index a7b521484..1d07b8126 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@
*
* Only the war and zip artifacts are archived in the jenkins build archive.
*/
-LABEL = 'ubuntu'
+LABEL = 'ubuntu && !H23'
buildJdk = 'JDK 1.8 (latest)'
buildJdk9 = 'JDK 1.9 (latest)'
buildJdk10 = 'JDK 10 (latest)'
diff --git a/pom.xml b/pom.xml
index 0def05c43..869d22e27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -660,17 +660,17 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jacksonVersion}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-xml-provider</artifactId>
- <version>${jacksonVersion}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jacksonVersion}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>