[java-identity-provider] branch master updated: IDP-1465 - Update Jakarta JSONP artifacts
Ian Young
ian at iay.org.uk
Fri Jan 24 13:02:32 EST 2020
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=085f4b3e60fdded2567bd5d4e1e0960b571fa52d
The following commit(s) were added to refs/heads/master by this push:
new 085f4b3 IDP-1465 - Update Jakarta JSONP artifacts
085f4b3 is described below
commit 085f4b3e60fdded2567bd5d4e1e0960b571fa52d
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Jan 24 18:01:34 2020 +0000
IDP-1465 - Update Jakarta JSONP artifacts
https://issues.shibboleth.net/jira/browse/IDP-1465
---
idp-authn-api/pom.xml | 15 ++++++++-------
idp-authn-impl/pom.xml | 21 +++++++++++----------
idp-cas-impl/pom.xml | 18 ++++++++++--------
idp-consent-impl/pom.xml | 11 ++++++-----
idp-saml-impl/pom.xml | 12 ++++++------
idp-session-api/pom.xml | 10 +++++-----
idp-session-impl/pom.xml | 12 +++++++-----
7 files changed, 53 insertions(+), 46 deletions(-)
diff --git a/idp-authn-api/pom.xml b/idp-authn-api/pom.xml
index 2e66b9b..67e4695 100644
--- a/idp-authn-api/pom.xml
+++ b/idp-authn-api/pom.xml
@@ -63,22 +63,23 @@
<artifactId>spring-webflow</artifactId>
</dependency>
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
- <dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>1.18</version>
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
- <!-- TODO - needed? -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- Test Dependencies -->
@@ -89,7 +90,7 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
-
+
</dependencies>
<scm>
diff --git a/idp-authn-impl/pom.xml b/idp-authn-impl/pom.xml
index ad2a741..af8038d 100644
--- a/idp-authn-impl/pom.xml
+++ b/idp-authn-impl/pom.xml
@@ -78,7 +78,7 @@
<groupId>${opensaml.groupId}</groupId>
<artifactId>opensaml-storage-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
@@ -104,10 +104,6 @@
<groupId>com.github.jasminb</groupId>
<artifactId>jsonapi-converter</artifactId>
</dependency>
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
<dependency>
<groupId>${spring.groupId}</groupId>
@@ -151,10 +147,6 @@
<artifactId>cryptacular</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
- <dependency>
<groupId>org.ldaptive</groupId>
<artifactId>ldaptive</artifactId>
</dependency>
@@ -163,7 +155,6 @@
<artifactId>DuoWeb</artifactId>
<version>${duoweb.version}</version>
</dependency>
-
<!-- DEPRECATED - remove in V5 -->
<dependency>
@@ -172,8 +163,18 @@
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
diff --git a/idp-cas-impl/pom.xml b/idp-cas-impl/pom.xml
index 5cd35b6..f80b533 100644
--- a/idp-cas-impl/pom.xml
+++ b/idp-cas-impl/pom.xml
@@ -121,10 +121,6 @@
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
- <dependency>
<groupId>net.shibboleth.ext</groupId>
<artifactId>spring-extensions</artifactId>
</dependency>
@@ -132,14 +128,20 @@
<groupId>org.cryptacular</groupId>
<artifactId>cryptacular</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
diff --git a/idp-consent-impl/pom.xml b/idp-consent-impl/pom.xml
index 0ffbea1..f590b6d 100644
--- a/idp-consent-impl/pom.xml
+++ b/idp-consent-impl/pom.xml
@@ -61,10 +61,6 @@
</dependency>
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.cryptacular</groupId>
<artifactId>cryptacular</artifactId>
</dependency>
@@ -78,11 +74,16 @@
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/idp-saml-impl/pom.xml b/idp-saml-impl/pom.xml
index 0530d2f..eee6d67 100644
--- a/idp-saml-impl/pom.xml
+++ b/idp-saml-impl/pom.xml
@@ -130,17 +130,17 @@
<artifactId>spring-webflow</artifactId>
</dependency>
- <dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
-
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/idp-session-api/pom.xml b/idp-session-api/pom.xml
index 9c20329..3fa35cd 100644
--- a/idp-session-api/pom.xml
+++ b/idp-session-api/pom.xml
@@ -37,17 +37,17 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
+ <!-- Provided Dependencies -->
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
</dependency>
- <!-- Provided Dependencies -->
-
<!-- Runtime Dependencies -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/idp-session-impl/pom.xml b/idp-session-impl/pom.xml
index 0a73cf2..4a8416f 100644
--- a/idp-session-impl/pom.xml
+++ b/idp-session-impl/pom.xml
@@ -57,10 +57,6 @@
</dependency>
<dependency>
- <groupId>javax.json</groupId>
- <artifactId>javax.json-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -70,11 +66,17 @@
</dependency>
<!-- Provided Dependencies -->
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Runtime Dependencies -->
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
+ <artifactId>jakarta.json</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- Test Dependencies -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list