[lucene-solr] 01/06: Switched the dependencies to tomcat8, libservlet3.1-java and jetty9
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Oct 24 15:29:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository lucene-solr.
commit 4af3e084ae3943fc9660e158e1c68045c53ae6a7
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Oct 24 16:01:11 2016 +0200
Switched the dependencies to tomcat8, libservlet3.1-java and jetty9
---
debian/ant.properties | 3 ++
debian/build-jars | 47 +++++++++--------
debian/changelog | 5 ++
debian/control | 19 +++----
debian/maven.rules | 2 +-
...mpatibility.patch => jetty-compatibility.patch} | 60 ++++++++++++++++++++--
debian/patches/series | 2 +-
debian/solr-jetty.links | 2 +-
debian/solr-jetty.postinst | 2 +-
debian/solr-jetty.postrm | 2 +-
debian/solr-tomcat.links | 2 +-
debian/solr-tomcat.postinst | 8 +--
debian/solr-tomcat.postrm | 4 +-
debian/tomcat.policy | 6 +--
14 files changed, 115 insertions(+), 49 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index 2d86fc8..8495676 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -2,3 +2,6 @@ failonjavadocwarning=false
javacc.home=/usr/share/java
ivy.available=true
svnversion=debian
+javac.source=1.7
+javac.target=1.7
+jsp.target=1.7
diff --git a/debian/build-jars b/debian/build-jars
index 6513eda..ffd53d1 100644
--- a/debian/build-jars
+++ b/debian/build-jars
@@ -26,27 +26,34 @@
/usr/share/java/jcl-over-slf4j.jar:./solr/lib/jcl-over-slf4j.jar
/usr/share/java/junit4.jar:./solr/lib/junit4.jar
/usr/share/java/log4j-over-slf4j.jar:./solr/lib/log4j-over-slf4j.jar
-/usr/share/java/servlet-api-3.0.jar:./solr/lib/servlet-api-3.0.jar
+/usr/share/java/servlet-api-3.1.jar:./solr/lib/servlet-api-3.1.jar
/usr/share/java/slf4j-api.jar:./solr/lib/slf4j-api.jar
/usr/share/java/slf4j-jdk14.jar:./solr/lib/slf4j-jdk14.jar
/usr/share/java/wstx-lgpl.jar:./solr/lib/wstx-lgpl.jar
-/usr/share/java/jetty8-server.jar:./solr/example/lib/jetty-server.jar
-/usr/share/java/jetty8-servlet.jar:./solr/example/lib/jetty-servlet.jar
-/usr/share/java/jetty8-http.jar:./solr/example/lib/jetty-http.jar
-/usr/share/java/jetty8-continuation.jar:./solr/example/lib/jetty-continuation.jar
-/usr/share/java/jetty8-io.jar:./solr/example/lib/jetty-io.jar
-/usr/share/java/jetty8-util.jar:./solr/example/lib/jetty-util.jar
-/usr/share/java/jetty8-security.jar:./solr/example/lib/jetty-security.jar
-/usr/share/java/jetty8-webapp.jar:./solr/example/lib/jetty-webapp.jar
-/usr/share/java/jetty8-xml.jar:./solr/example/lib/jetty-xml.jar
-/usr/share/java/jetty8-start.jar:./solr/example/lib/start.jar
-/usr/share/java/servlet-api-3.0.jar:./solr/example/lib/servlet-api-3.0.jar
-/usr/share/java/jsp-api-2.2.jar:./solr/example/lib/jsp-api-2.2.jar
-/usr/share/java/el-api-2.2.jar:./solr/example/lib/el-api-2.2.jar
-/usr/share/tomcat7/lib/tomcat-api.jar:./solr/example/lib/tomcat-api.jar
-/usr/share/tomcat7/lib/tomcat-util.jar:./solr/example/lib/tomcat-util.jar
-/usr/share/tomcat7/lib/jasper.jar:./solr/example/lib/jasper.jar
-/usr/share/tomcat7/lib/jasper-el.jar:./solr/example/lib/jasper-el.jar
-/usr/share/java/tomcat-juli.jar:./solr/example/lib/tomcat-juli.jar
-/usr/share/java/tomcat-coyote.jar:./solr/example/lib/tomcat-coyote.jar
+/usr/share/java/jetty9-annotations.jar:./solr/example/lib/jetty-annotations.jar
+/usr/share/java/jetty9-server.jar:./solr/example/lib/jetty-server.jar
+/usr/share/java/jetty9-servlet.jar:./solr/example/lib/jetty-servlet.jar
+/usr/share/java/jetty9-http.jar:./solr/example/lib/jetty-http.jar
+/usr/share/java/jetty9-continuation.jar:./solr/example/lib/jetty-continuation.jar
+/usr/share/java/jetty9-io.jar:./solr/example/lib/jetty-io.jar
+/usr/share/java/jetty9-util.jar:./solr/example/lib/jetty-util.jar
+/usr/share/java/jetty9-security.jar:./solr/example/lib/jetty-security.jar
+/usr/share/java/jetty9-webapp.jar:./solr/example/lib/jetty-webapp.jar
+/usr/share/java/jetty9-xml.jar:./solr/example/lib/jetty-xml.jar
+/usr/share/java/jetty9-start.jar:./solr/example/lib/start.jar
+/usr/share/java/jetty9-plus.jar:./solr/example/lib/jetty-plus.jar
+/usr/share/java/jetty9-apache-jsp.jar:./solr/example/lib/jetty-apache-jsp.jar
+/usr/share/java/servlet-api-3.1.jar:./solr/example/lib/servlet-api-3.1.jar
+/usr/share/java/jsp-api-2.3.jar:./solr/example/lib/jsp-api-2.3.jar
+/usr/share/java/el-api-3.0.jar:./solr/example/lib/el-api-3.0.jar
+/usr/share/java/tomcat8-api.jar:./solr/example/lib/tomcat-api.jar
+/usr/share/java/tomcat8-annotations-api.jar:./solr/example/lib/tomcat-annotations-api.jar
+/usr/share/java/tomcat8-el-api.jar:./solr/example/lib/tomcat-el-api.jar
+/usr/share/java/tomcat8-util.jar:./solr/example/lib/tomcat-util.jar
+/usr/share/java/tomcat8-util-scan.jar:./solr/example/lib/tomcat-util-scan.jar
+/usr/share/java/tomcat8-jasper.jar:./solr/example/lib/jasper.jar
+/usr/share/java/tomcat8-jasper-el.jar:./solr/example/lib/jasper-el.jar
+/usr/share/java/tomcat8-juli.jar:./solr/example/lib/tomcat-juli.jar
+/usr/share/java/tomcat8-coyote.jar:./solr/example/lib/tomcat-coyote.jar
/usr/share/java/ecj.jar:./solr/example/lib/ecj.jar
+/usr/share/java/asm-all.jar:./solr/example/lib/asm-all.jar
diff --git a/debian/changelog b/debian/changelog
index 78ede63..509e25d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
lucene-solr (3.6.2+dfsg-9) UNRELEASED; urgency=medium
* Team upload.
+
+ [ Emmanuel Bourg ]
+ * Switched the dependencies to tomcat8, libservlet3.1-java and jetty9
+
+ [ tony mancill ]
* Add Dutch translation of debconf messages. (Closes: #835136)
Thank you to Frans Spiesschaert for the translation.
diff --git a/debian/control b/debian/control
index 88c1c22..5bc816e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,13 +30,14 @@ Build-Depends:
libhttpclient-java (>= 4.1.1),
libhttpmime-java,
libicu4j-4.4-java,
- libjetty8-java (>= 8.1.16-2~),
+ libjetty9-java,
+ libjetty9-extra-java,
libjmock-java,
liblog4j1.2-java,
libregexp-java,
- libservlet3.0-java,
+ libservlet3.1-java,
libslf4j-java (>= 1.6.1),
- libtomcat7-java,
+ libtomcat8-java,
libwoodstox-java,
libxerces2-java,
libxml-commons-external-java,
@@ -112,7 +113,7 @@ Depends:
libhttpmime-java,
liblucene3-contrib-java,
liblucene3-java,
- libservlet3.0-java,
+ libservlet3.1-java,
libslf4j-java (>= 1.6.1),
libwoodstox-java,
${misc:Depends}
@@ -121,8 +122,8 @@ Replaces: solr-common (<< 3.6.0-1)
Suggests:
junit4,
libeasymock-java,
- libjetty8-extras-java (>= 8.1.16-2~),
- libjetty8-java (>= 8.1.16-2~),
+ libjetty9-extras-java,
+ libjetty9-java,
libsolr-java-doc
Description: Enterprise search server based on Lucene - Java libraries
Solr is an open source enterprise search server based on the Lucene
@@ -162,7 +163,7 @@ Description: Enterprise search server based on Lucene3 - common files
Package: solr-tomcat
Architecture: all
-Depends: solr-common (= ${binary:Version}), tomcat7 | tomcat7-user, ${misc:Depends}
+Depends: solr-common (= ${binary:Version}), tomcat8 | tomcat8-user, ${misc:Depends}
Conflicts: solr-jetty, solr-tomcat6
Description: Enterprise search server based on Lucene3 - Tomcat integration
Solr is an open source enterprise search server based on the Lucene
@@ -175,8 +176,8 @@ Description: Enterprise search server based on Lucene3 - Tomcat integration
Package: solr-jetty
Architecture: all
Depends:
- jetty8 (>= 8.1.16-2~),
- libjetty8-extra-java,
+ jetty9,
+ libjetty9-extra-java,
solr-common (= ${binary:Version}),
default-jdk | java5-sdk,
${misc:Depends}
diff --git a/debian/maven.rules b/debian/maven.rules
index a103bb2..1f0c7c0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,6 +18,6 @@
commons-httpclient commons-httpclient * s/3\..*/3.x/ * *
org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/ * s/.*/debian/ * *
-javax.servlet servlet-api * s/.*/3.0/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
junit junit * s/4\..*/4.x/ * *
s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/debian/ * *
diff --git a/debian/patches/jetty8-compatibility.patch b/debian/patches/jetty-compatibility.patch
similarity index 65%
rename from debian/patches/jetty8-compatibility.patch
rename to debian/patches/jetty-compatibility.patch
index e959eb5..630ac97 100644
--- a/debian/patches/jetty8-compatibility.patch
+++ b/debian/patches/jetty-compatibility.patch
@@ -23,7 +23,7 @@ Origin: backport, https://svn.apache.org/r1298108
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.Connector;
-+import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.server.session.HashSessionIdManager;
@@ -31,6 +31,15 @@ Origin: backport, https://svn.apache.org/r1298108
/**
* Run solr using jetty
+@@ -81,7 +82,7 @@
+ if (System.getProperty("jetty.testMode") != null) {
+ // SelectChannelConnector connector = new SelectChannelConnector();
+ // Normal SocketConnector is what solr's example server uses by default
+- SocketConnector connector = new SocketConnector();
++ ServerConnector connector = new ServerConnector(server);
+ connector.setPort(port);
+ connector.setReuseAddress(true);
+ server.setConnectors(new Connector[] { connector });
@@ -90,11 +91,11 @@
server.setStopAtShutdown( true );
@@ -45,7 +54,16 @@ Origin: backport, https://svn.apache.org/r1298108
}
//------------------------------------------------------------------------------------------------
-@@ -220,11 +221,48 @@
+@@ -160,7 +161,7 @@
+ if (0 == conns.length) {
+ throw new RuntimeException("Jetty Server has no Connectors");
+ }
+- return conns[0].getLocalPort();
++ return ((org.eclipse.jetty.server.NetworkConnector) conns[0]).getLocalPort();
+ }
+
+ //--------------------------------------------------------------
+@@ -220,11 +221,52 @@
debug=enabled;
}
@@ -64,6 +82,10 @@ Origin: backport, https://svn.apache.org/r1298108
+ }
+
+ @Override
++ public void debug(String arg0, long arg1) {
++ }
++
++ @Override
+ public String getName() {
+ return toString();
+ }
@@ -110,11 +132,23 @@ Origin: backport, https://svn.apache.org/r1298108
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
* @since solr 1.3
+@@ -32,9 +32,9 @@
+ //System.setProperty("solr.solr.home", "../../../example/solr");
+
+ Server server = new Server();
+- SocketConnector connector = new SocketConnector();
++ ServerConnector connector = new ServerConnector(server);
+ // Set some timeout options to make debugging easier.
+- connector.setMaxIdleTime(1000 * 60 * 60);
++ connector.setIdleTimeout(1000 * 60 * 60);
+ connector.setSoLingerTime(-1);
+ connector.setPort(8080);
+ server.setConnectors(new Connector[] { connector });
@@ -52,7 +52,7 @@
// mBeanContainer.start();
// }
@@ -126,7 +160,7 @@ Origin: backport, https://svn.apache.org/r1298108
System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP");
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
-@@ -29,11 +29,11 @@
+@@ -29,11 +29,12 @@
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
@@ -137,9 +171,25 @@ Origin: backport, https://svn.apache.org/r1298108
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
-+import org.eclipse.jetty.server.bio.SocketConnector;
++import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.session.HashSessionIdManager;
++import org.eclipse.jetty.webapp.Configuration;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
* @version $Id$
+@@ -67,8 +68,12 @@
+ server.setSessionIdManager(new HashSessionIdManager(new Random(random.nextLong())));
+ new WebAppContext(server, path, context );
+
+- SocketConnector connector = new SocketConnector();
+- connector.setMaxIdleTime(1000 * 60 * 60);
++ Configuration.ClassList classlist = Configuration.ClassList.setServerDefault(server);
++ classlist.addBefore("org.eclipse.jetty.webapp.JettyWebXmlConfiguration",
++ "org.eclipse.jetty.annotations.AnnotationConfiguration");
++
++ ServerConnector connector = new ServerConnector(server);
++ connector.setIdleTimeout(1000 * 60 * 60);
+ connector.setSoLingerTime(-1);
+ connector.setPort(0);
+ server.setConnectors(new Connector[]{connector});
diff --git a/debian/patches/series b/debian/patches/series
index baeab1c..a197129 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,6 @@ regex-test-failure.patch
remove-prettify.patch
CVE-2013-6397.patch
CVE-2013-6407_CVE-2013-6408.patch
-jetty8-compatibility.patch
+jetty-compatibility.patch
commons-codec-compatibility.patch
java8-compatibility.patch
diff --git a/debian/solr-jetty.links b/debian/solr-jetty.links
index c752f00..474f402 100644
--- a/debian/solr-jetty.links
+++ b/debian/solr-jetty.links
@@ -1 +1 @@
-/etc/solr/solr-jetty.xml /etc/jetty8/contexts/solr.xml
+/etc/solr/solr-jetty.xml /etc/jetty9/contexts/solr.xml
diff --git a/debian/solr-jetty.postinst b/debian/solr-jetty.postinst
index 3357b58..f539df3 100644
--- a/debian/solr-jetty.postinst
+++ b/debian/solr-jetty.postinst
@@ -19,7 +19,7 @@ case "$1" in
chown -R jetty:root /var/lib/solr/data
fi
- invoke-rc.d --quiet jetty8 restart || {
+ invoke-rc.d --quiet jetty9 restart || {
RESULT=$?
# Ignore if jetty init script does not exist (yet)
if [ $RESULT != 100 ]; then
diff --git a/debian/solr-jetty.postrm b/debian/solr-jetty.postrm
index 3080591..7be0a6c 100644
--- a/debian/solr-jetty.postrm
+++ b/debian/solr-jetty.postrm
@@ -17,7 +17,7 @@ case "$1" in
fi
if [ -x invoke-rc.d ]; then
- invoke-rc.d jetty8 restart || true
+ invoke-rc.d jetty9 restart || true
fi
;;
upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/solr-tomcat.links b/debian/solr-tomcat.links
index b32ab49..3395a2b 100644
--- a/debian/solr-tomcat.links
+++ b/debian/solr-tomcat.links
@@ -1 +1 @@
-/etc/solr/solr-tomcat.xml /etc/tomcat7/Catalina/localhost/solr.xml
+/etc/solr/solr-tomcat.xml /etc/tomcat8/Catalina/localhost/solr.xml
diff --git a/debian/solr-tomcat.postinst b/debian/solr-tomcat.postinst
index f08c7e0..5574c9f 100644
--- a/debian/solr-tomcat.postinst
+++ b/debian/solr-tomcat.postinst
@@ -11,10 +11,10 @@ case "$1" in
chown root:root /var/lib/solr
chmod 755 /var/lib/solr
- chown -R tomcat7:tomcat7 /var/lib/solr/data
+ chown -R tomcat8:tomcat8 /var/lib/solr/data
chmod -R 770 /var/lib/solr/data
- ln -sf /etc/solr/tomcat.policy /etc/tomcat7/policy.d/05solr.policy
+ ln -sf /etc/solr/tomcat.policy /etc/tomcat8/policy.d/05solr.policy
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -28,9 +28,9 @@ case "$1" in
esac
-invoke-rc.d --quiet tomcat7 restart || {
+invoke-rc.d --quiet tomcat8 restart || {
RESULT=$?
- # Ignore if tomcat7 init script does not exist (yet)
+ # Ignore if tomcat8 init script does not exist (yet)
if [ $RESULT != 100 ]; then
exit $RESULT
fi
diff --git a/debian/solr-tomcat.postrm b/debian/solr-tomcat.postrm
index 8e31d9c..8f5758e 100644
--- a/debian/solr-tomcat.postrm
+++ b/debian/solr-tomcat.postrm
@@ -4,9 +4,9 @@ set -e
case "$1" in
remove)
- rm -f /etc/tomcat7/policy.d/05solr.policy
+ rm -f /etc/tomcat8/policy.d/05solr.policy
if [ -x invoke-rc.d ]; then
- invoke-rc.d tomcat7 restart || true
+ invoke-rc.d tomcat8 restart || true
fi
;;
upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/tomcat.policy b/debian/tomcat.policy
index 9b62c43..08c3732 100644
--- a/debian/tomcat.policy
+++ b/debian/tomcat.policy
@@ -10,9 +10,9 @@ grant codeBase "file:/usr/share/solr/-" {
permission java.io.FilePermission "/usr/share/java", "read";
permission java.io.FilePermission "/usr/share/java/-", "read";
permission java.io.FilePermission "/usr/share/maven-repo/-", "read";
- permission java.io.FilePermission "/var/log/tomcat7/-", "read,write";
- permission java.io.FilePermission "/var/lib/tomcat7/webapps/solr/-", "read";
- permission java.io.FilePermission "/var/lib/tomcat7/temp/-", "read,write";
+ permission java.io.FilePermission "/var/log/tomcat8/-", "read,write";
+ permission java.io.FilePermission "/var/lib/tomcat8/webapps/solr/-", "read";
+ permission java.io.FilePermission "/var/lib/tomcat8/temp/-", "read,write";
permission java.io.FilePermission "/etc/solr/-", "read";
permission java.io.FilePermission "/usr/share/solr/-", "read";
permission java.io.FilePermission "/usr/share/solr", "read";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene-solr.git
More information about the pkg-java-commits
mailing list