You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2021/04/12 08:35:13 UTC
[ws-wss4j] branch 2_3_x-fixes updated: Upgrade joda version to
2.10.10 (#33)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 2_3_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/2_3_x-fixes by this push:
new 5b0e15d Upgrade joda version to 2.10.10 (#33)
5b0e15d is described below
commit 5b0e15decbaf54bcbf8bae1ba6d14162f06e15d1
Author: jimma <em...@redhat.com>
AuthorDate: Mon Apr 12 16:35:05 2021 +0800
Upgrade joda version to 2.10.10 (#33)
---
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 5f11f01..f17d69d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -49,7 +49,7 @@
<xz.version>1.8</xz.version>
<xmlsec.version>2.2.1</xmlsec.version>
<xmlunit.version>2.7.0</xmlunit.version>
-
+ <joda.version>2.10.10</joda.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 4b18e35..7a8ca37 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>