[gradle] 02/02: Transition to Jetty 9 (patch imported from Fedora, thanks to Michal Srb)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 17 22:10:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository gradle.
commit 30e7d71d708d9f3880d69ebc80904e0bedece4e3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 18 00:01:50 2016 +0200
Transition to Jetty 9 (patch imported from Fedora, thanks to Michal Srb)
---
debian/changelog | 1 +
debian/control | 8 +-
debian/patches/jetty.diff | 17 --
debian/patches/series | 2 +-
debian/patches/upgrade-to-jetty9.patch | 448 ++++++++++++++++++++++++++++++++
debian/patches/use_local_artifacts.diff | 27 --
6 files changed, 454 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c0984d0..f8dfdcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
gradle (2.12-2) UNRELEASED; urgency=medium
* Team upload.
+ * Transition to Jetty 9 (patch imported from Fedora, thanks to Michal Srb)
* Modified the Groovy jar detection logic to recognize the jar
in the system Maven repository
diff --git a/debian/control b/debian/control
index 4549e3f..c66c057 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,8 @@ Build-Depends: ant,
libjarjar-java,
libjatl-java,
libjaxen-java,
- libjetty-java,
- libjetty-extra-java,
+ libjetty9-java,
+ libjetty9-extra-java,
libjcifs-java,
libjcip-annotations-java,
libjhighlight-java,
@@ -157,8 +157,8 @@ Depends: bnd (>= 2.1.0),
libgradle-core-java (>= ${binary:Version}),
libjatl-java,
libjaxen-java,
- libjetty-java,
- libjetty-extra-java,
+ libjetty9-java,
+ libjetty9-extra-java,
libjs-jquery,
libmaven3-core-java (>= 3.3.3),
libobjenesis-java,
diff --git a/debian/patches/jetty.diff b/debian/patches/jetty.diff
deleted file mode 100644
index 5ad2684..0000000
--- a/debian/patches/jetty.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Some Jetty jars referred by Gradle actually belong to other
- packages like libservlet2.5-java and libtomcat7-java
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-14
---- a/subprojects/jetty/jetty.gradle
-+++ b/subprojects/jetty/jetty.gradle
-@@ -30,8 +30,8 @@
- }
- }
-
-- runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
-- dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
-+ runtime module("org.apache.tomcat:tomcat8-jasper") {
-+ dependency "javax.servlet.jsp:jsp-api-2.3"
- dependency libraries.jetty_util
- dependency libraries.servlet_api
- }
diff --git a/debian/patches/series b/debian/patches/series
index 667b53e..9e1705b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ use_local_artifacts.diff
30_envjs.diff
33_scala_zinc.diff
disable_tests.diff
-jetty.diff
docs.diff
disable_sonar.diff
search_system_jar.diff
@@ -17,3 +16,4 @@ generate_pom.diff
ivy-2.4.0.patch
maven-3.3-compatibility.patch
groovy-jar.patch
+upgrade-to-jetty9.patch
diff --git a/debian/patches/upgrade-to-jetty9.patch b/debian/patches/upgrade-to-jetty9.patch
new file mode 100644
index 0000000..76cc428
--- /dev/null
+++ b/debian/patches/upgrade-to-jetty9.patch
@@ -0,0 +1,448 @@
+Description: Upgrade to Jetty 9
+Author: Michal Srb <msrb at redhat.com>
+Forwarded: no
+--- a/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -60,12 +60,12 @@
+ }
+
+ // Jetty
+-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
+-libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
++libraries.servlet_api = "javax.servlet:servlet-api-3.1"
++libraries.jetty_util = dependencies.module("org.eclipse.jetty:jetty9-util") {
+ dependency libraries.slf4j_api
+ dependency libraries.servlet_api
+ }
+-libraries.jetty = dependencies.module("org.mortbay.jetty:jetty:6.1.25") {
++libraries.jetty = dependencies.module("org.eclipse.jetty:jetty9-server") {
+ dependency libraries.jetty_util
+ dependency libraries.servlet_api
+ }
+--- a/subprojects/jetty/jetty.gradle
++++ b/subprojects/jetty/jetty.gradle
+@@ -23,22 +23,27 @@
+ compile libraries.jetty
+ compile libraries.jetty_util
+ compile libraries.servlet_api
+- compile module("org.mortbay.jetty:jetty-plus:6.1.25") {
++ compile module("org.eclipse.jetty:jetty9-plus") {
++ dependency "org.eclipse.jetty:jetty9-security"
++ dependency "org.eclipse.jetty:jetty9-webapp"
++ dependency "org.eclipse.jetty:jetty9-servlet"
++ dependency "org.eclipse.jetty:jetty9-xml"
+ dependency libraries.jetty
+- module("org.mortbay.jetty:jetty-naming:6.1.25") {
+- dependency libraries.jetty
+- }
+ }
+
+- runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
+- dependency "org.eclipse.jdt:core:3.1.1 at jar"
+- dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
++ runtime module("org.eclipse.jetty:jetty9-apache-jsp") {
++ dependency "org.eclipse.jetty:jetty9-server"
++ dependency "org.eclipse.jetty:jetty9-util"
++ dependency "org.eclipse.jetty:jetty9-security"
++ dependency "org.eclipse.jetty:jetty9-webapp"
++ dependency "org.eclipse.jetty:jetty9-servlet"
++ dependency "org.eclipse.jetty:jetty9-xml"
++ dependency "org.eclipse.jetty:jetty9-plus"
+ dependency libraries.jetty_util
+ dependency libraries.servlet_api
+ }
+
+- runtime "org.mortbay.jetty:jetty-annotations:6.1.25 at jar"
+- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
++ runtime "org.eclipse.jetty:jetty9-annotations"
+ }
+
+-useTestFixtures()
+\ No newline at end of file
++useTestFixtures()
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/AbstractJettyRunTask.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/AbstractJettyRunTask.java
+@@ -29,11 +29,11 @@
+ import org.gradle.internal.classpath.DefaultClassPath;
+ import org.gradle.logging.ProgressLogger;
+ import org.gradle.logging.ProgressLoggerFactory;
+-import org.mortbay.jetty.Connector;
+-import org.mortbay.jetty.RequestLog;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.security.UserRealm;
+-import org.mortbay.util.Scanner;
++import org.eclipse.jetty.server.Connector;
++import org.eclipse.jetty.server.RequestLog;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.security.LoginService;
++import org.eclipse.jetty.util.Scanner;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
+@@ -110,7 +110,7 @@
+ /**
+ * List of security realms to set up. Optional.
+ */
+- private UserRealm[] userRealms;
++ private LoginService[] userRealms;
+
+ /**
+ * A RequestLog implementation to use for the webapp at runtime. Optional.
+@@ -313,7 +313,7 @@
+ /**
+ * Run a scanner thread on the given list of files and directories, calling stop/start on the given list of LifeCycle objects if any of the watched files change.
+ */
+- private void startScanner() {
++ private void startScanner() throws Exception {
+
+ // check if scanning is enabled
+ if (getScanIntervalSeconds() <= 0) {
+@@ -536,11 +536,11 @@
+ this.connectors = connectors;
+ }
+
+- public UserRealm[] getUserRealms() {
++ public LoginService[] getUserRealms() {
+ return userRealms;
+ }
+
+- public void setUserRealms(UserRealm[] userRealms) {
++ public void setUserRealms(LoginService[] userRealms) {
+ this.userRealms = userRealms;
+ }
+
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/JettyRun.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/JettyRun.java
+@@ -26,15 +26,15 @@
+ import org.gradle.api.tasks.InputFile;
+ import org.gradle.api.tasks.InputFiles;
+ import org.gradle.api.tasks.Optional;
+-import org.mortbay.jetty.Handler;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.handler.ContextHandler;
+-import org.mortbay.jetty.handler.ContextHandlerCollection;
+-import org.mortbay.jetty.handler.HandlerCollection;
+-import org.mortbay.resource.Resource;
+-import org.mortbay.resource.ResourceCollection;
+-import org.mortbay.util.Scanner;
+-import org.mortbay.xml.XmlConfiguration;
++import org.eclipse.jetty.server.Handler;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.handler.ContextHandler;
++import org.eclipse.jetty.server.handler.ContextHandlerCollection;
++import org.eclipse.jetty.server.handler.HandlerCollection;
++import org.eclipse.jetty.util.resource.Resource;
++import org.eclipse.jetty.util.resource.ResourceCollection;
++import org.eclipse.jetty.util.Scanner;
++import org.eclipse.jetty.xml.XmlConfiguration;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/JettyRunWar.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/JettyRunWar.java
+@@ -17,8 +17,8 @@
+ package org.gradle.api.plugins.jetty;
+
+ import org.gradle.api.plugins.jetty.internal.Jetty6PluginServer;
+-import org.mortbay.util.Scanner;
+-import org.mortbay.xml.XmlConfiguration;
++import org.eclipse.jetty.util.Scanner;
++import org.eclipse.jetty.xml.XmlConfiguration;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.gradle.api.tasks.InputFile;
+@@ -51,7 +51,7 @@
+ }
+
+ /* (non-Javadoc)
+- * @see org.mortbay.jetty.plugin.util.AbstractJettyTask#configureScanner()
++ * @see org.eclipse.jetty.plugin.util.AbstractJettyTask#configureScanner()
+ */
+ public void configureScanner() {
+ List<File> scanList = new ArrayList<File>();
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/Jetty6PluginServer.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/Jetty6PluginServer.java
+@@ -16,18 +16,21 @@
+
+ package org.gradle.api.plugins.jetty.internal;
+
+-import org.mortbay.jetty.Connector;
+-import org.mortbay.jetty.Handler;
+-import org.mortbay.jetty.RequestLog;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.handler.ContextHandlerCollection;
+-import org.mortbay.jetty.handler.DefaultHandler;
+-import org.mortbay.jetty.handler.HandlerCollection;
+-import org.mortbay.jetty.handler.RequestLogHandler;
+-import org.mortbay.jetty.nio.SelectChannelConnector;
+-import org.mortbay.jetty.security.UserRealm;
+-import org.mortbay.jetty.webapp.WebAppContext;
+-import org.mortbay.resource.Resource;
++import java.util.Arrays;
++import java.util.List;
++
++import org.eclipse.jetty.server.Connector;
++import org.eclipse.jetty.server.Handler;
++import org.eclipse.jetty.server.RequestLog;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.ServerConnector;
++import org.eclipse.jetty.server.handler.ContextHandlerCollection;
++import org.eclipse.jetty.server.handler.DefaultHandler;
++import org.eclipse.jetty.server.handler.HandlerCollection;
++import org.eclipse.jetty.server.handler.RequestLogHandler;
++import org.eclipse.jetty.security.LoginService;
++import org.eclipse.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.util.resource.Resource;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
+@@ -39,6 +42,7 @@
+
+ public static final int DEFAULT_MAX_IDLE_TIME = 30000;
+ private Server server;
++ private List<LoginService> loginServices;
+ private ContextHandlerCollection contexts; //the list of ContextHandlers
+ HandlerCollection handlers; //the list of lists of Handlers
+ private RequestLogHandler requestLogHandler; //the request log handler
+@@ -63,7 +67,7 @@
+
+ for (int i = 0; i < connectors.length; i++) {
+ Connector connector = (Connector) connectors[i];
+- LOGGER.debug("Setting Connector: {} on port {}", connector.getClass().getName(), connector.getPort());
++ LOGGER.debug("Setting Connector: {}", connector.getClass().getName());
+ this.server.addConnector(connector);
+ }
+ }
+@@ -83,8 +87,10 @@
+ return;
+ }
+
++ this.loginServices = Arrays.asList((LoginService[]) realms);
++
+ for (int i = 0; i < realms.length; i++) {
+- this.server.addUserRealm((UserRealm) realms[i]);
++ this.server.addBean((LoginService) realms[i]);
+ }
+ }
+
+@@ -92,7 +98,7 @@
+ * @see org.gradle.api.plugins.jetty.internal.JettyPluginServer#getUserRealms()
+ */
+ public Object[] getUserRealms() {
+- return this.server.getUserRealms();
++ return this.loginServices.toArray();
+ }
+
+ public void setRequestLog(Object requestLog) {
+@@ -151,9 +157,9 @@
+ }
+
+ public Object createDefaultConnector(int port) throws Exception {
+- SelectChannelConnector connector = new SelectChannelConnector();
++ ServerConnector connector = new ServerConnector(server);
+ connector.setPort(port);
+- connector.setMaxIdleTime(DEFAULT_MAX_IDLE_TIME);
++ connector.setIdleTimeout(DEFAULT_MAX_IDLE_TIME);
+
+ return connector;
+ }
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/JettyConfiguration.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/JettyConfiguration.java
+@@ -17,28 +17,22 @@
+ package org.gradle.api.plugins.jetty.internal;
+
+ import java.io.File;
+-import java.io.IOException;
+-import java.lang.reflect.Method;
+-import java.net.URL;
+ import java.net.URLClassLoader;
+-import java.util.Iterator;
+ import java.util.List;
++import java.util.Arrays;
+
+-import org.mortbay.jetty.plus.annotation.InjectionCollection;
+-import org.mortbay.jetty.plus.annotation.LifeCycleCallbackCollection;
+-import org.mortbay.jetty.plus.annotation.RunAsCollection;
+-import org.mortbay.jetty.plus.webapp.Configuration;
+-import org.mortbay.jetty.servlet.FilterHolder;
+-import org.mortbay.jetty.servlet.ServletHolder;
+-import org.mortbay.jetty.webapp.WebAppContext;
+-import org.mortbay.jetty.webapp.WebAppClassLoader;
+-import org.mortbay.log.Log;
+-import org.mortbay.util.LazyList;
++import org.eclipse.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.webapp.WebAppClassLoader;
++import org.eclipse.jetty.webapp.WebXmlConfiguration;
++import org.eclipse.jetty.util.log.Log;
++import org.eclipse.jetty.util.log.Logger;
+
+-public class JettyConfiguration extends Configuration {
++public class JettyConfiguration extends WebXmlConfiguration {
+ private List<File> classPathFiles;
+ private File webXmlFile;
+
++ private static final Logger LOG = Log.getLogger(JettyConfiguration.class);
++
+ public JettyConfiguration() {
+ super();
+ }
+@@ -54,84 +48,25 @@
+ /**
+ * Set up the classloader for the webapp, using the various parts of the Maven project
+ *
+- * @see org.mortbay.jetty.webapp.Configuration#configureClassLoader()
++ * @see org.eclipse.jetty.webapp.Configuration#configureClassLoader()
+ */
+- public void configureClassLoader() throws Exception {
++ @Override
++ public void configure(WebAppContext context) throws Exception {
+ if (classPathFiles != null) {
+- Log.debug("Setting up classpath ...");
++ LOG.debug("Setting up classpath ...");
+
+ //put the classes dir and all dependencies into the classpath
+ for (File classPathFile : classPathFiles) {
+- ((WebAppClassLoader) getWebAppContext().getClassLoader()).addClassPath(
++ ((WebAppClassLoader) context.getClassLoader()).addClassPath(
+ classPathFile.getCanonicalPath());
+ }
+
+- if (Log.isDebugEnabled()) {
+- Log.debug("Classpath = " + LazyList.array2List(
+- ((URLClassLoader) getWebAppContext().getClassLoader()).getURLs()));
+- }
+- } else {
+- super.configureClassLoader();
+- }
+- }
+-
+- protected URL findWebXml() throws IOException {
+- //if an explicit web.xml file has been set (eg for jetty:run) then use it
+- if (webXmlFile != null && webXmlFile.exists()) {
+- return webXmlFile.toURI().toURL();
+- }
+-
+- //if we haven't overridden location of web.xml file, use the
+- //standard way of finding it
+- Log.debug("Looking for web.xml file in WEB-INF");
+- return super.findWebXml();
+- }
+-
+- public void parseAnnotations() throws Exception {
+- String v = System.getProperty("java.version");
+- String[] version = v.split("\\.");
+- if (version == null) {
+- Log.info("Unable to determine jvm version, annotations will not be supported");
+- return;
+- }
+- int major = Integer.parseInt(version[0]);
+- int minor = Integer.parseInt(version[1]);
+- if ((major >= 1) && (minor >= 5)) {
+- //TODO it would be nice to be able to re-use the parseAnnotations() method on
+- //the org.mortbay.jetty.annotations.Configuration class, but it's too difficult?
+-
+- //able to use annotations on jdk1.5 and above
+- Class<?> annotationParserClass = Thread.currentThread().getContextClassLoader().loadClass(
+- "org.mortbay.jetty.annotations.AnnotationParser");
+- Method parseAnnotationsMethod = annotationParserClass.getMethod("parseAnnotations", WebAppContext.class,
+- Class.class, RunAsCollection.class, InjectionCollection.class, LifeCycleCallbackCollection.class);
+-
+- //look thru _servlets
+- Iterator itor = LazyList.iterator(_servlets);
+- while (itor.hasNext()) {
+- ServletHolder holder = (ServletHolder) itor.next();
+- Class servlet = getWebAppContext().loadClass(holder.getClassName());
+- parseAnnotationsMethod.invoke(null, getWebAppContext(), servlet, _runAsCollection, _injections,
+- _callbacks);
+- }
+-
+- //look thru _filters
+- itor = LazyList.iterator(_filters);
+- while (itor.hasNext()) {
+- FilterHolder holder = (FilterHolder) itor.next();
+- Class filter = getWebAppContext().loadClass(holder.getClassName());
+- parseAnnotationsMethod.invoke(null, getWebAppContext(), filter, null, _injections, _callbacks);
+- }
+-
+- //look thru _listeners
+- itor = LazyList.iterator(_listeners);
+- while (itor.hasNext()) {
+- Object listener = itor.next();
+- parseAnnotationsMethod.invoke(null, getWebAppContext(), listener.getClass(), null, _injections,
+- _callbacks);
++ if (LOG.isDebugEnabled()) {
++ Log.getLog().debug("Classpath = " + Arrays.asList(
++ ((URLClassLoader) context.getClassLoader()).getURLs()));
+ }
+ } else {
+- Log.info("Annotations are not supported on jvms prior to jdk1.5");
++ super.configure(context);
+ }
+ }
+ }
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/JettyPluginServer.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/JettyPluginServer.java
+@@ -16,7 +16,7 @@
+
+ package org.gradle.api.plugins.jetty.internal;
+
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ /**
+ * JettyPluginServer
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/JettyPluginWebAppContext.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/JettyPluginWebAppContext.java
+@@ -19,12 +19,11 @@
+ import java.io.File;
+ import java.util.List;
+
+-import org.mortbay.jetty.plus.webapp.EnvConfiguration;
+-import org.mortbay.jetty.webapp.Configuration;
+-import org.mortbay.jetty.webapp.JettyWebXmlConfiguration;
+-import org.mortbay.jetty.webapp.TagLibConfiguration;
+-import org.mortbay.jetty.webapp.WebAppContext;
+-import org.mortbay.jetty.webapp.WebInfConfiguration;
++import org.eclipse.jetty.plus.webapp.EnvConfiguration;
++import org.eclipse.jetty.webapp.Configuration;
++import org.eclipse.jetty.webapp.JettyWebXmlConfiguration;
++import org.eclipse.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.webapp.WebInfConfiguration;
+
+ /**
+ * Jetty6PluginWebAppContext
+@@ -37,9 +36,8 @@
+ private EnvConfiguration envConfig = new EnvConfiguration();
+ private JettyConfiguration mvnConfig = new JettyConfiguration();
+ private JettyWebXmlConfiguration jettyWebConfig = new JettyWebXmlConfiguration();
+- private TagLibConfiguration tagConfig = new TagLibConfiguration();
+ private Configuration[] configs = new Configuration[]{
+- webInfConfig, envConfig, mvnConfig, jettyWebConfig, tagConfig
++ webInfConfig, envConfig, mvnConfig, jettyWebConfig
+ };
+
+ public JettyPluginWebAppContext() {
+@@ -108,12 +106,10 @@
+ }
+
+ public void doStart() throws Exception {
+- setShutdown(false);
+ super.doStart();
+ }
+
+ public void doStop() throws Exception {
+- setShutdown(true);
+ //just wait a little while to ensure no requests are still being processed
+ Thread.sleep(500L);
+ super.doStop();
+--- a/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/Monitor.java
++++ b/subprojects/jetty/src/main/java/org/gradle/api/plugins/jetty/internal/Monitor.java
+@@ -16,7 +16,7 @@
+
+ package org.gradle.api.plugins.jetty.internal;
+
+-import org.mortbay.jetty.Server;
++import org.eclipse.jetty.server.Server;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index a36a6c2..b630c3e 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -66,15 +66,6 @@ Last-Update: 2015-07-08
// Logging
libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10')
-@@ -60,7 +60,7 @@
- }
-
- // Jetty
--libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
-+libraries.servlet_api = "javax.servlet:servlet-api-3.1"
- libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
- dependency libraries.slf4j_api
- dependency libraries.servlet_api
@@ -80,13 +80,13 @@
libraries += [
@@ -173,24 +164,6 @@ Last-Update: 2015-07-08
- }
- }
-}
---- a/subprojects/jetty/jetty.gradle
-+++ b/subprojects/jetty/jetty.gradle
-@@ -31,14 +31,12 @@
- }
-
- runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
-- dependency "org.eclipse.jdt:core:3.1.1 at jar"
- dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
- dependency libraries.jetty_util
- dependency libraries.servlet_api
- }
-
- runtime "org.mortbay.jetty:jetty-annotations:6.1.25 at jar"
-- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
- }
-
- useTestFixtures()
-\ No newline at end of file
--- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
+++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
@@ -64,7 +64,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list