This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 2_4_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/2_4_x-fixes by this push:
new e60353a Upgrade joda version to 2.10.10. This closes #32
e60353a is described below
commit e60353aa2dfd18e7fa3e43d7aed29b95fe842151
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Apr 12 09:28:26 2021 +0100
Upgrade joda version to 2.10.10. This closes #32
---
parent/pom.xml | 2 +-
ws-security-common/pom.xml | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f9504ea..2e0f71c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,6 +39,7 @@
<geronimo.javamail.version>1.8.4</geronimo.javamail.version>
<hamcrest.version>2.2</hamcrest.version>
<jasypt.version>1.9.3</jasypt.version>
+ <joda.version>2.10.10</joda.version>
<junit.version>5.7.1</junit.version>
<kerby.version>2.0.1</kerby.version>
<neethi.version>3.1.1</neethi.version>
@@ -49,7 +50,6 @@
<xz.version>1.8</xz.version>
<xmlsec.version>2.3.0-SNAPSHOT</xmlsec.version>
<xmlunit.version>2.8.2</xmlunit.version>
-
<!-- OSGi related properties -->
<wss4j.osgi.import />
<wss4j.osgi.symbolic.name>${project.groupId}.${project.artifactId}</wss4j.osgi.symbolic.name>
diff --git a/ws-security-common/pom.xml b/ws-security-common/pom.xml
index 5b94024..11186da 100644
--- a/ws-security-common/pom.xml
+++ b/ws-security-common/pom.xml
@@ -30,7 +30,7 @@
<properties>
<wss4j.osgi.import>
- org.joda.time*;version="[1.6,3)",
+ org.joda.time*;version="[2.9,3)",
net.shibboleth*;resolution:=optional,
com.sun.security.jgss*;resolution:=optional
</wss4j.osgi.import>
@@ -140,6 +140,10 @@
<groupId>org.cryptacular</groupId>
<artifactId>cryptacular</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -149,6 +153,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1-jre</version>
