You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2019/12/12 11:20:02 UTC

[syncope] branch master updated: Replace JSTL with Apache Standard Taglibs (#146)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 34aed95  Replace JSTL with Apache Standard Taglibs (#146)
34aed95 is described below

commit 34aed95cb166d3e55d13fba139a362e81a2035be
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Thu Dec 12 11:19:54 2019 +0000

    Replace JSTL with Apache Standard Taglibs (#146)
---
 ext/oidcclient/agent/pom.xml | 4 ++--
 ext/saml2sp/agent/pom.xml    | 4 ++--
 pom.xml                      | 6 +++---
 standalone/LICENSE           | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/oidcclient/agent/pom.xml b/ext/oidcclient/agent/pom.xml
index 878aeb9..d0c37b7 100644
--- a/ext/oidcclient/agent/pom.xml
+++ b/ext/oidcclient/agent/pom.xml
@@ -47,8 +47,8 @@ under the License.
       <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-impl</artifactId>
       <scope>provided</scope>
     </dependency>
     
diff --git a/ext/saml2sp/agent/pom.xml b/ext/saml2sp/agent/pom.xml
index 808c76d..7a3bf6d 100644
--- a/ext/saml2sp/agent/pom.xml
+++ b/ext/saml2sp/agent/pom.xml
@@ -47,8 +47,8 @@ under the License.
       <artifactId>javax.servlet.jsp-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-impl</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 490b972..ea11284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -602,9 +602,9 @@ under the License.
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>jstl</artifactId>
-        <version>1.2</version>
+        <groupId>org.apache.taglibs</groupId>
+        <artifactId>taglibs-standard-impl</artifactId>
+        <version>1.2.5</version>
       </dependency>
       
       <!-- CXF -->
diff --git a/standalone/LICENSE b/standalone/LICENSE
index 3769043..77fc5fb 100644
--- a/standalone/LICENSE
+++ b/standalone/LICENSE
@@ -928,8 +928,8 @@ This is licensed under the CDDL 1.0, see above.
 
 ==
 
-For JSP Standard Tag Library (https://jstl.java.net/):
-This is licensed under the CDDL 1.0, see above.
+For Apache Standard Taglib (http://tomcat.apache.org/taglibs/standard/):
+This is licensed under the AL 2.0, see above.
 
 ==