diff options
author | Jan Bartel | 2013-04-04 02:31:33 +0000 |
---|---|---|
committer | Jan Bartel | 2013-04-04 02:31:33 +0000 |
commit | 7523c5234ca9d4a6faa03df23458f7f2f80ce07c (patch) | |
tree | e36ba68eac9f0fdd7bdcadfc748104b242315e7e /jetty-jsp | |
parent | 279dff381c170721addfb1783c298e8b0c20ace6 (diff) | |
parent | 2bd6a703f91202b4cb223defcd4e71d3e34403f7 (diff) | |
download | org.eclipse.jetty.project-7523c5234ca9d4a6faa03df23458f7f2f80ce07c.tar.gz org.eclipse.jetty.project-7523c5234ca9d4a6faa03df23458f7f2f80ce07c.tar.xz org.eclipse.jetty.project-7523c5234ca9d4a6faa03df23458f7f2f80ce07c.zip |
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-jsp/pom.xml
Diffstat (limited to 'jetty-jsp')
-rw-r--r-- | jetty-jsp/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 3ba7dd900a..aa406a55a6 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.el</artifactId> - <version>2.2.0.v201108011116</version> + <version>2.2.0.v201303151357</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty.orbit</groupId> @@ -76,7 +76,7 @@ <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>com.sun.el</artifactId> - <version>2.2.0.v201108011116</version> + <version>2.2.0.v201303151357</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty.orbit</groupId> @@ -88,7 +88,7 @@ <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>org.eclipse.jdt.core</artifactId> - <version>3.7.1</version> + <version>3.8.2.v20130121</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty.orbit</groupId> |