Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #3162 - Use Jetty specific Servlet API jar. #3168

Merged
merged 38 commits into from
Feb 7, 2019
Merged

Issue #3162 - Use Jetty specific Servlet API jar. #3168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
bfa2dbf
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Nov 29, 2018
707c9ec
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Nov 29, 2018
8ff8242
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Nov 29, 2018
c3348a0
Issue #3162 - Correcting websocket issues in OSGi
joakime Nov 30, 2018
85f74f1
Issue #3162 - Fixing OSGi manifest for websocket
joakime Dec 3, 2018
e0f4e5a
Issue #3162 - correcting typo
joakime Dec 3, 2018
e16e3f1
Issue #3162 - correcting logger name
joakime Dec 3, 2018
7f6add5
Issue #3162 - Adding missing Configuration reference
joakime Dec 3, 2018
db11be0
Issue #3162 - Updating XML (removing references that seem to be getti…
joakime Dec 3, 2018
01e1f01
Issue #3162 - Correcting package name exposure (missing 's')
joakime Dec 3, 2018
231892e
Issue #3162 - Making dependents OSGi aware
joakime Dec 3, 2018
24e680e
Issue #3162 - Introducing more convenience Options for PaxExam
joakime Dec 3, 2018
97bba2e
Issue #3162 - Fail test early if `conscrypt-version` is undefined (li…
joakime Dec 4, 2018
7262bfd
Issue #3162 - Fixing testcase assertions
joakime Dec 4, 2018
435dd20
Issue #3162 - Attempting to address ServiceLoader with javax.websocke…
joakime Dec 4, 2018
1167adf
Issue #3162 Partial fix for javaxwebsocket in osgi, wip.
janbartel Dec 11, 2018
c30c8d4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
joakime Jan 30, 2019
755d572
Issue #3162 - Using snapshot repositories on CI (temporary)
joakime Jan 30, 2019
26fa79a
Issue #3162 - Reverting not-relevant OSGi changes
joakime Jan 30, 2019
c25cbf3
Issue #3162 - Reverting not-relevant JspConfig change.
joakime Jan 30, 2019
3c9c78c
Issue #132 - ClientConnector abstraction.
sbordet Jan 17, 2019
64a2bc3
Issue #132 - ClientConnector abstraction.
sbordet Jan 18, 2019
51730a7
Issue #132 - ClientConnector abstraction.
sbordet Jan 22, 2019
514c6df
Issue #132 - ClientConnector abstraction.
sbordet Jan 22, 2019
d8d1ecf
use snapshot of maven-invoker-plugin because of NPE https://issues.ap…
olamy Jan 30, 2019
b9281e3
fix merge
olamy Jan 30, 2019
0d89f29
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Nov 29, 2018
66f8259
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Nov 29, 2018
95bc15f
Issue #3162 - Correcting websocket issues in OSGi
joakime Nov 30, 2018
e135197
Issue #3162 - Introducing more convenience Options for PaxExam
joakime Dec 3, 2018
72ad748
Issue #3162 - Reverting not-relevant OSGi changes
joakime Jan 30, 2019
33f314e
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Feb 4, 2019
107170a
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Feb 4, 2019
cd488c2
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'.
sbordet Feb 4, 2019
b09f1de
Issue #3162 - Fixing compilation issues
joakime Feb 5, 2019
e4df1fe
Issue #3162 - Correcting javadoc
joakime Feb 5, 2019
0817928
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
joakime Feb 5, 2019
9286cdc
Issue #3162 - Use Jetty specific Servlet API jar.
sbordet Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
agent { node { label 'linux' } }
options { timeout(time: 120, unit: 'MINUTES') }
steps {
mavenBuild("jdk11", "-Pautobahn -Pmongodb install", "maven3")
mavenBuild("jdk11", "-Pautobahn -Pmongodb -Psnapshot-repositories install", "maven3")
warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
// Collect up the jacoco execution results (only on main build)
jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
Expand Down Expand Up @@ -44,7 +44,7 @@ pipeline {
agent { node { label 'linux' } }
options { timeout(time: 30, unit: 'MINUTES') }
steps {
mavenBuild("jdk11", "install javadoc:javadoc -DskipTests", "maven3")
mavenBuild("jdk11", "-Psnapshot-repositories install javadoc:javadoc -DskipTests", "maven3")
warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
}
}
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ The following artifacts are CDDL + GPLv2 with classpath exception.

https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html

org.eclipse.jetty.toolchain:jetty-schemas
org.eclipse.jetty.toolchain:jetty-servlet-api
Copy link
Contributor

@joakime joakime Nov 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmcc0nn3ll and @janbartel since this new artifact jetty-servlet-api is now ...

  • CDDL
  • and GPLv2 with Classpath Exception
  • and Eclipse License
  • and Apache License

... wouldn't we need to update this NOTICE file as well?

Or are the other sections of the NOTICE.txt sufficient for this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joakime actually, our standard NOTICE file covers everything already, so that's the one that we should use.


------
Assorted
Expand Down
4 changes: 2 additions & 2 deletions aggregates/jetty-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@
<artifactId>javax.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
Expand Down
4 changes: 2 additions & 2 deletions aggregates/jetty-websocket-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
6 changes: 1 addition & 5 deletions apache-jsp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-schemas</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<artifactId>jetty-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
Expand Down
2 changes: 1 addition & 1 deletion apache-jsp/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
requires java.xml;
requires org.eclipse.jetty.util;
requires org.mortbay.apache.jasper;
requires static javax.servlet.api;
requires static jetty.servlet.api;

provides Log with JuliLog;
provides ServletContainerInitializer with JettyJasperInitializer;
Expand Down
2 changes: 1 addition & 1 deletion apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static void init(WebAppContext context, URI baseUri, File scratchDir)
{
context.setAttribute("javax.servlet.context.tempdir", scratchDir);
context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
".*/javax.servlet-[^/]*\\.jar$|.*/servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
".*/jetty-servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
context.setWar(baseUri.toASCIIString());
context.setResourceBase(baseUri.toASCIIString());
}
Expand Down
4 changes: 2 additions & 2 deletions examples/async-rest/async-rest-jar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions examples/async-rest/async-rest-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 1 addition & 3 deletions examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.deploy.DeploymentManager;
import org.eclipse.jetty.deploy.PropertiesConfigurationManager;
import org.eclipse.jetty.deploy.bindings.DebugListenerBinding;
import org.eclipse.jetty.deploy.providers.WebAppProvider;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.jmx.MBeanContainer;
Expand All @@ -35,7 +34,6 @@
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.server.AsyncRequestLogWriter;
import org.eclipse.jetty.server.CustomRequestLog;
import org.eclipse.jetty.server.DebugListener;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
Expand Down Expand Up @@ -174,7 +172,7 @@ public static void main( String[] args ) throws Exception
deployer.setContexts(contexts);
deployer.setContextAttribute(
"org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$");
".*/jetty-servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$");

WebAppProvider webapp_provider = new WebAppProvider();
webapp_provider.setMonitoredDirName(jetty_base + "/webapps");
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static void main( String[] args ) throws Exception
// scan for them instead.
webapp.setAttribute(
"org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$" );
".*/jetty-servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$" );

// A WebAppContext is a ContextHandler as well so it needs to be set to
// the server so it is aware of where to
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static final void main( String args[] ) throws Exception
webapp.setWar(warFile.getAbsolutePath());
webapp.setAttribute(
"org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
".*/javax.servlet-[^/]*\\.jar$|.*/servlet-api-[^/]*\\.jar$");
".*/jetty-servlet-api-[^/]*\\.jar$");
server.setHandler(webapp);

// Register new transaction manager in JNDI
Expand Down
2 changes: 1 addition & 1 deletion jetty-annotations/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

requires java.naming;
requires java.annotation;
requires javax.servlet.api;
requires jetty.servlet.api;
requires org.objectweb.asm;
requires org.eclipse.jetty.util;
requires org.eclipse.jetty.http;
Expand Down
2 changes: 1 addition & 1 deletion jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public AnnotationConfiguration()
{
addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, FragmentConfiguration.class, PlusConfiguration.class);
addDependents(JettyWebXmlConfiguration.class);
protectAndExpose("org.eclipse.jetty.util.annotation.");
protectAndExpose("org.eclipse.jetty.util.annotations.");
hide("org.objectweb.asm.");
}

Expand Down
7 changes: 2 additions & 5 deletions jetty-ant/src/test/config/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@
<loginServices>
<hashLoginService name="Test Realm" config="realm.properties"/>
</loginServices>
<webApp
war="test.war"
contextpath="/test" >
<webApp war="test.war" contextpath="/test" >
<attributes>
<attribute name="org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern" value=".*/servlet-api-[^/]*\.jar$"/>

<attribute name="org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern" value=".*/jetty-servlet-api-[^/]*\.jar$"/>
</attributes>
</webApp>
</jetty.run>
Expand Down
8 changes: 4 additions & 4 deletions jetty-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.client=javax.servlet.api
--add-reads org.eclipse.jetty.client=jetty.servlet.api
--add-modules java.security.jgss
--add-modules javax.servlet.api
--add-modules jetty.servlet.api
--add-modules org.eclipse.jetty.jmx
--add-modules org.slf4j
</argLine>
Expand Down Expand Up @@ -120,8 +120,8 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-deploy/src/main/config/etc/jetty-deploy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</Set>
<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
<Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
<Arg>.*/jetty-servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
</Call>

<!-- Add a customize step to the deployment lifecycle -->
Expand Down
2 changes: 1 addition & 1 deletion jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<Call name="setContextAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
<Arg>.*/servlet-api-[^/]*\.jar$</Arg>
<Arg>.*/jetty-servlet-api-[^/]*\.jar$</Arg>
</Call>

<Call id="webappprovider" name="addAppProvider">
Expand Down
Loading