[archiva] branch master updated: Setting jackson version

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f6436c  Setting jackson version
7f6436c is described below

commit 7f6436c0e26b7792942917181c56218faf116073
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Jan 12 17:41:51 2020 +0100

    Setting jackson version
---
 Jenkinsfile | 2 +-
 pom.xml     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a7b5214..1d07b81 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 0def05c..869d22e 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>