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

Jump to bottom

Issue #6586 - remove unnecessary dependencies #6599

Merged
merged 2 commits into from Aug 17, 2021
Merged

Issue #6586 - remove unnecessary dependencies #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a71f661
Issue #6586 Remove unnecessary dependencies
janbartel Aug 5, 2021
3567b5e
Issue #6586 Remove incorrect javadoc
janbartel Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions apache-jsp/pom.xml
View file
Open in desktop
Expand Up @@ -80,12 +80,6 @@
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
Expand Down
9 changes: 7 additions & 2 deletions jetty-jndi/pom.xml
View file
Open in desktop
Expand Up @@ -60,14 +60,19 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<artifactId>jetty-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
<version>1.4.1.v201005082020</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down
7 changes: 0 additions & 7 deletions jetty-webapp/pom.xml
View file
Open in desktop
Expand Up @@ -80,13 +80,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-slf4j-impl</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java
View file
Open in desktop
Expand Up @@ -13,8 +13,6 @@

package org.eclipse.jetty.webapp;

import java.util.ServiceLoader;

import org.eclipse.jetty.util.Loader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -24,9 +22,7 @@
* <p>This configuration configures the WebAppContext server/system classes to
* be able to see the org.eclipse.jetty.jaas package.
* This class is defined in the webapp package, as it implements the {@link Configuration} interface,
* which is unknown to the jaas package. However, the corresponding {@link ServiceLoader}
* resource is defined in the jaas package, so that this configuration only be
* loaded if the jetty-jaas jars are on the classpath.
* which is unknown to the jaas package.
* </p>
*/
public class JaasConfiguration extends AbstractConfiguration
Expand Down
2 changes: 1 addition & 1 deletion jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
/**
* JettyWebConfiguration.
*
* Looks for XmlConfiguration files in WEB-INF. Searches in order for the first of jetty6-web.xml, jetty-web.xml or web-jetty.xml
* Looks for XmlConfiguration files in WEB-INF. Searches in order for the first of jetty8-web.xml, jetty-web.xml or web-jetty.xml
*/
public class JettyWebXmlConfiguration extends AbstractConfiguration
{
Expand Down
6 changes: 1 addition & 5 deletions jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java
View file
Open in desktop
Expand Up @@ -13,8 +13,6 @@

package org.eclipse.jetty.webapp;

import java.util.ServiceLoader;

import org.eclipse.jetty.util.Loader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -24,9 +22,7 @@
* <p>This configuration configures the WebAppContext server/system classes to
* be able to see the org.eclipse.jetty.jmx package. This class is defined
* in the webapp package, as it implements the {@link Configuration} interface,
* which is unknown to the jmx package. However, the corresponding {@link ServiceLoader}
* resource is defined in the jmx package, so that this configuration only be
* loaded if the jetty-jmx jars are on the classpath.
* which is unknown to the jmx package.
* </p>
*/
public class JmxConfiguration extends AbstractConfiguration
Expand Down
6 changes: 1 addition & 5 deletions jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java
View file
Open in desktop
Expand Up @@ -13,8 +13,6 @@

package org.eclipse.jetty.webapp;

import java.util.ServiceLoader;

import org.eclipse.jetty.util.Loader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -24,9 +22,7 @@
* <p>This configuration configures the WebAppContext system/server classes to
* be able to see the org.eclipse.jetty.jaas package.
* This class is defined in the webapp package, as it implements the {@link Configuration} interface,
* which is unknown to the jndi package. However, the corresponding {@link ServiceLoader}
* resource is defined in the jndi package, so that this configuration only be
* loaded if the jetty-jndi jars are on the classpath.
* which is unknown to the jndi package.
* </p>
*/
public class JndiConfiguration extends AbstractConfiguration
Expand Down
6 changes: 1 addition & 5 deletions jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java
View file
Open in desktop
Expand Up @@ -13,8 +13,6 @@

package org.eclipse.jetty.webapp;

import java.util.ServiceLoader;

import org.eclipse.jetty.util.Loader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -24,9 +22,7 @@
* <p>This configuration configures the WebAppContext server/system classes to
* be able to see the org.eclipse.jetty.jsp and org.eclipse.jetty.apache packages.
* This class is defined in the webapp package, as it implements the {@link Configuration} interface,
* which is unknown to the jsp package. However, the corresponding {@link ServiceLoader}
* resource is defined in the jsp package, so that this configuration only be
* loaded if the jetty-jsp jars are on the classpath.
* which is unknown to the jsp package.
* </p>
*/
public class JspConfiguration extends AbstractConfiguration
Expand Down