aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-07-28 06:44:31 (EDT)
committerGlyn Normington2011-07-28 06:44:31 (EDT)
commit255f789ec3be28daf96e36fc52304432ec5b33e3 (patch)
treeef7bebef4db00e769fb637da3e3ea4e63603e428
parent1d4c53a2c709e229928a408c87d86262071831e4 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-255f789ec3be28daf96e36fc52304432ec5b33e3.zip
org.eclipse.gemini.web.gemini-web-container-255f789ec3be28daf96e36fc52304432ec5b33e3.tar.gz
org.eclipse.gemini.web.gemini-web-container-255f789ec3be28daf96e36fc52304432ec5b33e3.tar.bz2
bug 353295: Upgrade javax.servlet.jsp.jstl to v1.2 tag
-rw-r--r--build.versions2
-rw-r--r--org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/build.versions b/build.versions
index 4213b5c..e59c251 100644
--- a/build.versions
+++ b/build.versions
@@ -14,7 +14,7 @@ javax.el=2.2.0.v201105051105
javax.mail=1.4.0
javax.persistence=1.0.0
javax.servlet.jsp=2.2.0.v201103241009
-javax.servlet.jstl=1.2.0.v20110517
+javax.servlet.jstl=1.2.0.v20110728
javax.servlet=3.0.0.v201103241009
javax.transaction=1.1.0
javax.xml.bind=2.1.7
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index c3aa799..f353375 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -192,7 +192,7 @@ public class TomcatServletContainerTests {
@Test
public void testWarWithJSTLFromDependency() throws MalformedURLException, IOException, BundleException {
- String jstlLocation = "file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0.v20110517/com.springsource.javax.servlet.jsp.jstl-1.2.0.v20110517.jar";
+ String jstlLocation = "file:../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0.v20110728/com.springsource.javax.servlet.jsp.jstl-1.2.0.v20110728.jar";
Bundle jstlBundle = this.bundleContext.installBundle(jstlLocation);
try {
@@ -221,7 +221,7 @@ public class TomcatServletContainerTests {
@Test
public void testWarWithJSTLFromExplodedDependency() throws MalformedURLException, IOException, BundleException {
- String jstlPath = "../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0.v20110517/com.springsource.javax.servlet.jsp.jstl-1.2.0.v20110517.jar";
+ String jstlPath = "../ivy-cache/repository/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.2.0.v20110728/com.springsource.javax.servlet.jsp.jstl-1.2.0.v20110728.jar";
PathReference jstl = new PathReference(jstlPath);
PathReference unzippedJstl = explode(jstl);