Skip to content

Servlet API is now in a different JAR #6105

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

Merged
labkey-adam merged 3 commits into from
Dec 3, 2024
Merged

Servlet API is now in a different JAR #6105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e22924d
Servlet API is now in a different JAR
labkey-adam Nov 27, 2024
9a04e9f
Update comments and descriptions. Remove spring-tx dependency declara…
labkey-adam Nov 29, 2024
21011df
Remove obsolete comments
labkey-adam Nov 29, 2024
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
77 changes: 38 additions & 39 deletions api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ dependencies {
"http://commons.apache.org/pool/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"Object pooling - Pipeline & TargetedMS dependency",
"Object pooling - Pipeline & TargetedMS dependency"
)
)

Expand Down Expand Up @@ -323,8 +323,6 @@ dependencies {
)
)



BuildUtils.addExternalDependency(
project,
new ExternalDependency(
Expand Down Expand Up @@ -507,7 +505,6 @@ dependencies {
)
)


BuildUtils.addExternalDependency(
project,
new ExternalDependency(
Expand All @@ -520,7 +517,7 @@ dependencies {
"Jackson support for org.json data types, to ease migration out of code that uses them",
),
{
// exclude this because it gets in the way of our own JSON object implementations from server/api
// we explicitly include a more recent version of JSON-java below
exclude group: "org.json", module:"json"
}
)
Expand Down Expand Up @@ -600,24 +597,24 @@ dependencies {
"https://github.com/stleary/JSON-java",
"Public Domain",
"https://github.com/stleary/JSON-java/blob/master/LICENSE",
"JSON library",
"JSON library"
)
)

BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"org.jsoup:jsoup:${jsoupVersion}",
"JSoup",
"Jonathan Hedley",
"https://jsoup.org",
ExternalDependency.MIT_LICENSE_NAME,
ExternalDependency.MIT_LICENSE_URL,
"Validating HTML content",
)
project,
new ExternalDependency(
"org.jsoup:jsoup:${jsoupVersion}",
"JSoup",
"Jonathan Hedley",
"https://jsoup.org",
ExternalDependency.MIT_LICENSE_NAME,
ExternalDependency.MIT_LICENSE_URL,
"Validating HTML content"
)
)

// These are required for running unit tests through the server junit controller
// These are required for running unit tests through the server junit controller
BuildUtils.addExternalDependency(
project,
new ExternalDependency(
Expand All @@ -627,7 +624,7 @@ dependencies {
"http://www.junit.org",
"CPL 1.0",
"http://www.opensource.org/licenses/cpl1.0.php",
"Unit testing",
"Unit testing"
)
)

Expand All @@ -643,7 +640,7 @@ dependencies {
"Java Excel library",
),
{
// exclude this because it brings older version of log4j
// this brings in an old version of log4j
exclude group: "log4j", module:"log4j"
}
)
Expand Down Expand Up @@ -861,6 +858,9 @@ dependencies {
)
)

// Note: spring-beans, spring-context, and spring-core are duplicated in the embedded jar. If we combine the
// embedded and webapp classloaders into one we could stop including these three jars as external dependencies.

BuildUtils.addExternalDependency(
project,
new ExternalDependency(
Expand All @@ -870,7 +870,7 @@ dependencies {
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"spring-webmvc.jar dependency",
"spring-webmvc dependency",
)
)

Expand All @@ -883,7 +883,7 @@ dependencies {
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"spring-webmvc.jar dependency",
"spring-webmvc dependency",
)
)

Expand All @@ -896,7 +896,7 @@ dependencies {
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"spring-webmvc.jar dependency",
"spring-webmvc dependency",
)
)

Expand All @@ -910,7 +910,12 @@ dependencies {
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"SQL exceptions and errors",
)
),
{
// In the future, if the webapp ends up using the spring jars in embedded, this will prevent duplicate jars
exclude group: "org.springframework", module:"spring-beans"
exclude group: "org.springframework", module:"spring-core"
}
)

BuildUtils.addExternalDependency(
Expand All @@ -922,22 +927,16 @@ dependencies {
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"Object instantiation framework",
)
"Mock implementations of HttpServletRequest, HttpServletResponse, etc."
),
{
// In the future, if the webapp ends up using the spring jars in embedded, this will prevent duplicate jars
exclude group: "org.springframework", module:"spring-core"
}
)

BuildUtils.addExternalDependency(
project,
new ExternalDependency(
"org.springframework:spring-tx:${springVersion}",
"Spring Framework",
"Spring",
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"DAO and transactions",
)
)
// Note: spring-web and spring-webmvc are duplicated in the embedded jar. If we combine the embedded and webapp
// classloaders into one we could stop including these two jars as external dependencies.

BuildUtils.addExternalDependency(
project,
Expand All @@ -948,7 +947,7 @@ dependencies {
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"Basis of web framework",
"spring-webmvc dependency",
)
)

Expand All @@ -961,7 +960,7 @@ dependencies {
"http://www.springframework.org/",
ExternalDependency.APACHE_2_LICENSE_NAME,
ExternalDependency.APACHE_2_LICENSE_URL,
"spring-webmvc.jar dependency",
"Web framework",
)
)

Expand Down
30 changes: 0 additions & 30 deletions api/src/org/labkey/api/util/ExceptionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicInteger;

/**
* User: rossb
* Date: Oct 26, 2006
*/
public class ExceptionUtil
{
public static final String REQUEST_EXCEPTION_ATTRIBUTE = ExceptionUtil.class.getName() + "$exception";
Expand Down Expand Up @@ -1509,38 +1505,12 @@ public void addIntHeader(String s, int i)
headers.put(s,String.valueOf(i));
}

// This will be required when we upgrade servlet-api to a more modern version
// @Override
// public String getHeader(String s)
// {
// return headers.get(s);
// }
//
// @Override
// public Collection<String> getHeaders(String s)
// {
// return Collections.singleton(getHeader(s));
// }
//
// @Override
// public Collection<String> getHeaderNames()
// {
// return headers.keySet();
// }
//
@Override
public void setStatus(int i)
{
status = i;
}


// @Override
// public int getStatus()
// {
// return status;
// }
//
@Override
public String getCharacterEncoding()
{
Expand Down
2 changes: 1 addition & 1 deletion pipeline/src/org/labkey/pipeline/api/PipelineServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ private Pair<File, File> extractBootstrapFromEmbedded() throws IOException
{
bootstrap = extractEntry(j, entry, "labkeyBootstrap.jar");
}
if (entry.getName().contains("tomcat-servlet-api") && entry.getName().toLowerCase().endsWith(".jar"))
if (entry.getName().contains("tomcat-embed-core") && entry.getName().toLowerCase().endsWith(".jar"))
{
servlet = extractEntry(j, entry, "servletApi.jar");
}
Expand Down