Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-07-03 05:47:05 +0000
committerJan Bartel2015-07-03 05:47:05 +0000
commit5ac1c0a3b7d7053b8007bdd70beb18b288cdfaaa (patch)
tree8e496e327a355cbdf0b8a250fa1b56e8df9721cb
parenta9dd6ec676f67c91108e0a7dcb63514966aab267 (diff)
downloadorg.eclipse.jetty.project-5ac1c0a3b7d7053b8007bdd70beb18b288cdfaaa.tar.gz
org.eclipse.jetty.project-5ac1c0a3b7d7053b8007bdd70beb18b288cdfaaa.tar.xz
org.eclipse.jetty.project-5ac1c0a3b7d7053b8007bdd70beb18b288cdfaaa.zip
471623 Update to apache jsp 8.0.23
Use 8.0.23.M1 for jetty version of apache jsp 8.0.23
-rw-r--r--jetty-osgi/jetty-osgi-boot-jsp/pom.xml32
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java8
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java6
-rw-r--r--pom.xml2
4 files changed, 22 insertions, 26 deletions
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index a5018a2afe..905667eee7 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -95,20 +95,20 @@
javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional,
javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional,
javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional,
- org.apache.el;version="[8.0.20,9)";resolution:=optional,
- org.apache.el.lang;version="[8.0.20,9)";resolution:=optional,
- org.apache.el.stream;version="[8.0.20,9)";resolution:=optional,
- org.apache.el.util;version="[8.0.209,9)";resolution:=optional,
- org.apache.el.parser;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.compiler;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.compiler.tagplugin;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.runtime;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.security;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.servlet;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.tagplugins.jstl;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.util;version="[8.0.20,9)";resolution:=optional,
- org.apache.jasper.xmlparser;version="[8.0.20,9)";resolution:=optional,
+ org.apache.el;version="[8.0.23,9)";resolution:=optional,
+ org.apache.el.lang;version="[8.0.23,9)";resolution:=optional,
+ org.apache.el.stream;version="[8.0.23,9)";resolution:=optional,
+ org.apache.el.util;version="[8.0.23,9)";resolution:=optional,
+ org.apache.el.parser;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.compiler;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.runtime;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.security;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.servlet;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.util;version="[8.0.23,9)";resolution:=optional,
+ org.apache.jasper.xmlparser;version="[8.0.23,9)";resolution:=optional,
org.apache.taglibs.standard;version="1.2";resolution:=optional,
org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional,
org.apache.taglibs.standard.functions;version="1.2";resolution:=optional,
@@ -132,7 +132,7 @@
org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional,
org.apache.taglibs.standard.tei;version="1.2";resolution:=optional,
org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional,
- org.apache.tomcat;version="[8.0.20,9)";resolution:=optional,
+ org.apache.tomcat;version="[8.0.23,9)";resolution:=optional,
org.eclipse.jetty.jsp;version="[9.3,10)";resolution:=optional,
org.osgi.*,
org.xml.*;resolution:=optional,
@@ -143,7 +143,7 @@
javax.xml.parser;resolution:=optional
</Import-Package>
<_nouses>true</_nouses>
- <DynamicImport-Package>org.eclipse.jetty.jsp.*;version="9.3",org.apache.jasper.*;version="8.0.20",org.apache.el.*;version="8.0.20"</DynamicImport-Package>
+ <DynamicImport-Package>org.eclipse.jetty.jsp.*;version="9.3",org.apache.jasper.*;version="8.0.23",org.apache.el.*;version="8.0.23"</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java
index 8d3b10a018..c90f6b5552 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2.java
@@ -60,12 +60,8 @@ public class TestJettyOSGiBootHTTP2
options.add(CoreOptions.junitBundles());
options.addAll(TestJettyOSGiBootCore.httpServiceJetty());
options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none"))));
- options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"))));
- options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value("INFO"))));
- options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.osgi.LEVEL").value("DEBUG"))));
- options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.util.component.LEVEL").value("DEBUG"))));
- options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.server.LEVEL").value("DEBUG"))));
- options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.xml.LEVEL").value("INFO"))));
+ options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL))));
+ options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.osgi.LEVEL").value(LOG_LEVEL))));
return options.toArray(new Option[options.size()]);
}
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
index 39d47c46aa..b59b839be3 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
@@ -51,7 +51,7 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@RunWith(PaxExam.class)
public class TestJettyOSGiBootWithJsp
{
- private static final String LOG_LEVEL = "INFO";
+ private static final String LOG_LEVEL = "WARN";
@Inject
BundleContext bundleContext = null;
@@ -71,7 +71,7 @@ public class TestJettyOSGiBootWithJsp
options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none"))));
options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL))));
options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL))));
- options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.annotations.LEVEL").value("DEBUG"))));
+ options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.osgi.LEVEL").value(LOG_LEVEL))));
options.addAll(jspDependencies());
return options.toArray(new Option[options.size()]);
}
@@ -117,8 +117,8 @@ public class TestJettyOSGiBootWithJsp
}
- @Test
@Ignore
+ @Test
public void assertAllBundlesActiveOrResolved()
{
TestOSGiUtil.debugBundles(bundleContext);
diff --git a/pom.xml b/pom.xml
index 5be04f0fce..a514da9bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<slf4j-version>1.6.6</slf4j-version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
<alpn.api.version>1.1.2.v20150522</alpn.api.version>
- <jsp.version>8.0.20.M0</jsp.version>
+ <jsp.version>8.0.23.M1</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version>
</properties>

Back to the top