Merge pull request #713 from ehossack-aws/upgrade-jaxb
upgrade jaxb-basics-version to 0.12.0
diff --git a/Jenkinsfile b/Jenkinsfile
index 41bfb86..3f7f1fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,12 +27,6 @@
}
}
- environment {
- // ... setup any environment variables ...
- MVN_LOCAL_REPO_OPT = '-Dmaven.repo.local=.repository'
- MVN_TEST_FAIL_IGNORE = '-Dmaven.test.failure.ignore=true'
- }
-
tools {
// ... tell Jenkins what java version, maven version or other tools are required ...
maven 'maven_3_latest'
@@ -43,8 +37,8 @@
// Configure an overall timeout for the build of ten hours.
timeout(time: 10, unit: 'HOURS')
// When we have test-fails e.g. we don't need to run the remaining steps
- skipStagesAfterUnstable()
buildDiscarder(logRotator(numToKeepStr: '5', artifactNumToKeepStr: '5'))
+ disableConcurrentBuilds()
}
stages {
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
index 5e96385..0404762 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
@@ -138,6 +138,7 @@
connection.start();
xstream = new XStream();
xstream.processAnnotations(SamplePojo.class);
+ xstream.allowTypes(new Class[] { SamplePojo.class });
}
@Override
diff --git a/pom.xml b/pom.xml
index 84b235e..dd0d51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,14 +97,14 @@
<regexp-version>1.3</regexp-version>
<rome-version>1.16.0</rome-version>
<shiro-version>1.7.1</shiro-version>
- <slf4j-version>1.7.31</slf4j-version>
+ <slf4j-version>1.7.32</slf4j-version>
<snappy-version>1.1.2</snappy-version>
<spring-version>5.3.9</spring-version>
<taglibs-version>1.2.5</taglibs-version>
<velocity-version>2.3</velocity-version>
<xalan-version>2.7.2</xalan-version>
<xpp3-version>1.1.4c</xpp3-version>
- <xstream-version>1.4.17</xstream-version>
+ <xstream-version>1.4.18</xstream-version>
<xbean-version>4.20</xbean-version>
<xerces-version>2.12.0</xerces-version>
<jaxb-basics-version>0.12.0</jaxb-basics-version>
@@ -116,7 +116,7 @@
<site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
<source-version>1.8</source-version>
- <target-version>1.8</target-version>
+ <target-version>11</target-version>
<javase-javadoc-url>http://docs.oracle.com/javase/8/docs/api/</javase-javadoc-url>
<javaee-javadoc-url>http://download.oracle.com/javaee/6/api/</javaee-javadoc-url>
<slf4j-javadoc-url>http://www.slf4j.org/apidocs/</slf4j-javadoc-url>
