You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/12/03 16:01:35 UTC
[10/11] portals-pluto git commit: Changed servlet, jsp,
and taglib dependencies to use the Apache versions of the artifacts.
Moved to servlet version 3.0, JSP & EL version 2.2,
which correspond to tomcat version 7.0.50. Moved to version 1.2.1 of the Apac
Changed servlet, jsp, and taglib dependencies to use the Apache versions of
the artifacts. Moved to servlet version 3.0, JSP & EL version 2.2,
which correspond to tomcat version 7.0.50. Moved to version 1.2.1 of the Apache
standard tag library.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/f25b14a1
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/f25b14a1
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/f25b14a1
Branch: refs/heads/PortletHub
Commit: f25b14a12eade4cae7bebdd1f9cb2370173d308a
Parents: 5eb2aa1
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Dec 3 15:53:05 2014 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Dec 3 15:53:05 2014 +0100
----------------------------------------------------------------------
PortletHubDemo/pom.xml | 18 +++++++++-------
pluto-container-api/pom.xml | 4 ++--
pluto-container-driver-api/pom.xml | 4 ++--
pluto-container/pom.xml | 4 ++--
pluto-portal-driver-impl/pom.xml | 12 +++++------
pluto-portal-driver/pom.xml | 21 ++++++++++++-------
pluto-portal/pom.xml | 32 ++++++++++++++--------------
pluto-taglib/pom.xml | 8 +++----
pluto-testsuite/pom.xml | 28 +++++++++++++++----------
pom.xml | 37 +++++++++++++++++++++------------
portlet-api_2.0_spec/pom.xml | 4 ++--
11 files changed, 98 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/PortletHubDemo/pom.xml
----------------------------------------------------------------------
diff --git a/PortletHubDemo/pom.xml b/PortletHubDemo/pom.xml
index 6249d99..267afa9 100644
--- a/PortletHubDemo/pom.xml
+++ b/PortletHubDemo/pom.xml
@@ -18,8 +18,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -31,8 +31,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -74,21 +74,23 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</exclusion>
</exclusions>
</dependency>
+<!--
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<scope>compile</scope>
</dependency>
+-->
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-container-api/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container-api/pom.xml b/pluto-container-api/pom.xml
index 9885f69..6f07bd9 100644
--- a/pluto-container-api/pom.xml
+++ b/pluto-container-api/pom.xml
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-container-driver-api/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container-driver-api/pom.xml b/pluto-container-driver-api/pom.xml
index 0796116..849df09 100644
--- a/pluto-container-driver-api/pom.xml
+++ b/pluto-container-driver-api/pom.xml
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-container/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container/pom.xml b/pluto-container/pom.xml
index ca5d8a0..fb01443 100644
--- a/pluto-container/pom.xml
+++ b/pluto-container/pom.xml
@@ -55,8 +55,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-portal-driver-impl/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-portal-driver-impl/pom.xml b/pluto-portal-driver-impl/pom.xml
index 6191c83..8afd8bc 100644
--- a/pluto-portal-driver-impl/pom.xml
+++ b/pluto-portal-driver-impl/pom.xml
@@ -83,20 +83,20 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
<scope>${dependency.scope}</scope>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
<scope>${dependency.scope}</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-portal-driver/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-portal-driver/pom.xml b/pluto-portal-driver/pom.xml
index 9595722..a5952dc 100644
--- a/pluto-portal-driver/pom.xml
+++ b/pluto-portal-driver/pom.xml
@@ -63,8 +63,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -73,18 +73,23 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
<scope>${dependency.scope}</scope>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <scope>${dependency.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
<scope>${dependency.scope}</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-portal/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-portal/pom.xml b/pluto-portal/pom.xml
index 721797c..7efc06e 100644
--- a/pluto-portal/pom.xml
+++ b/pluto-portal/pom.xml
@@ -41,12 +41,12 @@
<artifactId>pluto-container-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.portals</groupId>
@@ -66,12 +66,12 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
@@ -87,12 +87,12 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
@@ -102,13 +102,13 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-taglib/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-taglib/pom.xml b/pluto-taglib/pom.xml
index 0e34d0f..f24de0f 100644
--- a/pluto-taglib/pom.xml
+++ b/pluto-taglib/pom.xml
@@ -39,13 +39,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pluto-testsuite/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-testsuite/pom.xml b/pluto-testsuite/pom.xml
index 4eb285a..8ef5a4d 100644
--- a/pluto-testsuite/pom.xml
+++ b/pluto-testsuite/pom.xml
@@ -38,8 +38,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -48,13 +48,24 @@
<scope>${dependency.scope}</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
<scope>${dependency.scope}</scope>
<exclusions>
<exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <scope>${dependency.scope}</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -74,11 +85,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <scope>${dependency.scope}</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8914183..37c554a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,10 +257,11 @@ generate mailto links. -->
<javax.portlet.version.major>2</javax.portlet.version.major>
<javax.portlet.version.minor>0</javax.portlet.version.minor>
<portals.portlet2-api-spec.version>${project.version}</portals.portlet2-api-spec.version>
- <servlet-api.version>3.0.1</servlet-api.version>
- <jsp-api.version>2.0</jsp-api.version>
- <jstl.version>1.1.2</jstl.version>
- <taglibs.standard.version>1.1.2</taglibs.standard.version>
+ <servlet-api.version>7.0.50</servlet-api.version>
+ <jsp-api.version>7.0.50</jsp-api.version>
+ <jstl.version>7.0.50</jstl.version>
+ <el-api.version>7.0.50</el-api.version>
+ <taglibs.standard.version>1.2.1</taglibs.standard.version>
<jaxb.version>2.1</jaxb.version>
<jaxb-impl.version>2.1.9</jaxb-impl.version>
<stax.impl.version>1.2.0</stax.impl.version>
@@ -323,8 +324,8 @@ TODO: Check if we need all of them. -->
<version>${portals.portlet2-api-spec.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<version>${servlet-api.version}</version>
</dependency>
@@ -415,18 +416,28 @@ TODO: Check if we need all of them. -->
<version>${maven.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
<version>${jsp-api.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>${jstl.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <version>${el-api.version}</version>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-spec</artifactId>
+ <version>${taglibs.standard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-impl</artifactId>
+ <version>${taglibs.standard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
<version>${taglibs.standard.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/f25b14a1/portlet-api_2.0_spec/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-api_2.0_spec/pom.xml b/portlet-api_2.0_spec/pom.xml
index 48fdcd9..ed5c84f 100644
--- a/portlet-api_2.0_spec/pom.xml
+++ b/portlet-api_2.0_spec/pom.xml
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>