Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lucene-solr
Commits: 90553234 by Emmanuel Bourg at 2018-12-03T22:35:16Z Transition to Tomcat 9 - - - - - d7683cc4 by Emmanuel Bourg at 2018-12-10T21:47:43Z Fixed the compatibility with Jetty 9.4 - - - - - c5dc206c by Emmanuel Bourg at 2018-12-10T21:59:25Z Use salsa.debian.org Vcs-* URLs - - - - - 2e71dd16 by Emmanuel Bourg at 2018-12-10T21:59:41Z Upload to unstable - - - - - 8 changed files: - debian/build-jars - debian/changelog - debian/control - debian/patches/jetty-compatibility.patch - debian/solr-tomcat.links - debian/solr-tomcat.postinst - debian/solr-tomcat.postrm - debian/tomcat.policy Changes: ===================================== debian/build-jars ===================================== @@ -46,14 +46,14 @@ /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/tomcat9-api.jar:./solr/example/lib/tomcat-api.jar +/usr/share/java/tomcat9-annotations-api.jar:./solr/example/lib/tomcat-annotations-api.jar +/usr/share/java/tomcat9-el-api.jar:./solr/example/lib/tomcat-el-api.jar +/usr/share/java/tomcat9-util.jar:./solr/example/lib/tomcat-util.jar +/usr/share/java/tomcat9-util-scan.jar:./solr/example/lib/tomcat-util-scan.jar +/usr/share/java/tomcat9-jasper.jar:./solr/example/lib/jasper.jar +/usr/share/java/tomcat9-jasper-el.jar:./solr/example/lib/jasper-el.jar +/usr/share/java/tomcat9-juli.jar:./solr/example/lib/tomcat-juli.jar +/usr/share/java/tomcat9-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 ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +lucene-solr (3.6.2+dfsg-16) unstable; urgency=medium + + * Team upload. + * Transition to Tomcat 9 + * Fixed the compatibility with Jetty 9.4 + * Use salsa.debian.org Vcs-* URLs + + -- Emmanuel Bourg <[email protected]> Mon, 10 Dec 2018 22:59:36 +0100 + lucene-solr (3.6.2+dfsg-15) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -32,14 +32,14 @@ Build-Depends: libhttpclient-java (>= 4.1.1), libhttpmime-java, libicu4j-4.4-java, - libjetty9-extra-java, - libjetty9-java, + libjetty9-extra-java (>= 9.4), + libjetty9-java (>= 9.4), libjmock-java, liblog4j1.2-java, libregexp-java, libservlet3.1-java, libslf4j-java (>= 1.6.1), - libtomcat8-java, + libtomcat9-java, libwoodstox-java, libxerces2-java, libxml-commons-external-java, @@ -47,8 +47,8 @@ Build-Depends: maven-repo-helper (>= 1.5~), po-debconf Standards-Version: 4.2.1 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/lucene-solr.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/lucene-solr.git +Vcs-Git: https://salsa.debian.org/java-team/lucene-solr.git +Vcs-Browser: https://salsa.debian.org/java-team/lucene-solr Homepage: http://lucene.apache.org Package: liblucene3-java @@ -137,7 +137,7 @@ Suggests: junit4, libeasymock-java, libjetty9-extras-java, - libjetty9-java, + libjetty9-java (>= 9.4), libsolr-java-doc Description: Enterprise search server based on Lucene - Java libraries Solr is an open source enterprise search server based on the Lucene @@ -181,7 +181,7 @@ Package: solr-tomcat Architecture: all Depends: solr-common (= ${binary:Version}), - tomcat8 | tomcat8-user, + tomcat9 | tomcat9-user, ${misc:Depends} Conflicts: solr-jetty, ===================================== debian/patches/jetty-compatibility.patch ===================================== @@ -26,12 +26,12 @@ Origin: backport, https://svn.apache.org/r1298108 +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; ++import org.eclipse.jetty.server.session.DefaultSessionIdManager; +import org.eclipse.jetty.util.log.Logger; /** * Run solr using jetty -@@ -81,7 +82,7 @@ +@@ -81,20 +82,20 @@ if (System.getProperty("jetty.testMode") != null) { // SelectChannelConnector connector = new SelectChannelConnector(); // Normal SocketConnector is what solr's example server uses by default @@ -40,7 +40,9 @@ Origin: backport, https://svn.apache.org/r1298108 connector.setPort(port); connector.setReuseAddress(true); server.setConnectors(new Connector[] { connector }); -@@ -90,11 +91,11 @@ +- server.setSessionIdManager(new HashSessionIdManager(new Random())); ++ server.setSessionIdManager(new DefaultSessionIdManager(server, new Random())); + } server.setStopAtShutdown( true ); // Initialize the servlets ===================================== debian/solr-tomcat.links ===================================== @@ -1 +1 @@ -/etc/solr/solr-tomcat.xml /etc/tomcat8/Catalina/localhost/solr.xml +/etc/solr/solr-tomcat.xml /etc/tomcat9/Catalina/localhost/solr.xml ===================================== debian/solr-tomcat.postinst ===================================== @@ -11,10 +11,10 @@ case "$1" in chown root:root /var/lib/solr chmod 755 /var/lib/solr - chown -R tomcat8:tomcat8 /var/lib/solr/data + chown -R tomcat:tomcat /var/lib/solr/data chmod -R 770 /var/lib/solr/data - ln -sf /etc/solr/tomcat.policy /etc/tomcat8/policy.d/05solr.policy + ln -sf /etc/solr/tomcat.policy /etc/tomcat9/policy.d/05solr.policy ;; abort-upgrade|abort-remove|abort-deconfigure) @@ -28,9 +28,9 @@ case "$1" in esac -invoke-rc.d --quiet tomcat8 restart || { +invoke-rc.d --quiet tomcat9 restart || { RESULT=$? - # Ignore if tomcat8 init script does not exist (yet) + # Ignore if tomcat9 init script does not exist (yet) if [ $RESULT != 100 ]; then exit $RESULT fi ===================================== debian/solr-tomcat.postrm ===================================== @@ -4,9 +4,9 @@ set -e case "$1" in remove) - rm -f /etc/tomcat8/policy.d/05solr.policy + rm -f /etc/tomcat9/policy.d/05solr.policy if [ -x invoke-rc.d ]; then - invoke-rc.d tomcat8 restart || true + invoke-rc.d tomcat9 restart || true fi ;; upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear) ===================================== 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/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 "/var/log/tomcat9/-", "read,write"; + permission java.io.FilePermission "/var/lib/tomcat9/webapps/solr/-", "read"; + permission java.io.FilePermission "/var/lib/tomcat9/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"; View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/671b3b2091da60d9f674a1672e0d8adc480eacd6...2e71dd16fb2311242274a1cfef2401cdd4045bfe -- View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/671b3b2091da60d9f674a1672e0d8adc480eacd6...2e71dd16fb2311242274a1cfef2401cdd4045bfe You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
