diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index a5018a2afe0..905667eee7c 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 <_nouses>true - org.eclipse.jetty.jsp.*;version="9.3",org.apache.jasper.*;version="8.0.20",org.apache.el.*;version="8.0.20" + org.eclipse.jetty.jsp.*;version="9.3",org.apache.jasper.*;version="8.0.23",org.apache.el.*;version="8.0.23" 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 8d3b10a0187..c90f6b55527 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 39d47c46aa3..b59b839be3e 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 5be04f0fce2..a514da9bf78 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.6.6 1.2 1.1.2.v20150522 - 8.0.20.M0 + 8.0.23.M1 undefined