[Git][java-team/lucene-solr][master] 8 commits: Do not build the lucene3 javadocs anymore. Very low popcon and build failures.
Markus Koschany
gitlab at salsa.debian.org
Fri Feb 15 10:40:23 GMT 2019
Markus Koschany pushed to branch master at Debian Java Maintainers / lucene-solr
Commits:
ffa0210c by Markus Koschany at 2019-02-14T21:41:29Z
Do not build the lucene3 javadocs anymore. Very low popcon and build failures.
Closes: #917739
- - - - -
fddc363c by Markus Koschany at 2019-02-15T08:45:03Z
Remove TODO.Debian.
- - - - -
88adffc4 by Markus Koschany at 2019-02-15T09:02:49Z
Add web.xml.patch
- - - - -
636063b5 by Markus Koschany at 2019-02-15T09:13:45Z
Build-depend on libel-api-java to fix another FTBFS.
- - - - -
09e90c16 by Markus Koschany at 2019-02-15T09:28:57Z
Remove el-api.jar from the classpath to avoid a conflict.
- - - - -
6284cd35 by Markus Koschany at 2019-02-15T09:39:14Z
Execute postrm commands on purge too.
- - - - -
2333fcc0 by Markus Koschany at 2019-02-15T10:30:34Z
Update changelog
- - - - -
f142790f by Markus Koschany at 2019-02-15T10:35:51Z
Declare compliance with Debian Policy 4.3.0.
- - - - -
11 changed files:
- − debian/TODO.Debian
- debian/build-jars
- debian/changelog
- debian/control
- − debian/liblucene3-java-doc.doc-base
- − debian/liblucene3-java-doc.docs
- debian/patches/series
- + debian/patches/web.xml.patch
- debian/rules
- debian/solr-jetty.postrm
- debian/solr-tomcat.postrm
Changes:
=====================================
debian/TODO.Debian deleted
=====================================
@@ -1,8 +0,0 @@
-TODO
-----
-* Work out the bnd issue where it thinks there is a header called "Name".
- Apparently fixed in later versions but the debian package for bnd is very out
- of date.
-* Use JFlex to generate Java files included in upstream tarball (needs 1.5 - not
- yet released)
-* Javadoc package for solr.
=====================================
debian/build-jars
=====================================
@@ -45,7 +45,6 @@
/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/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
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+lucene-solr (3.6.2+dfsg-17) unstable; urgency=medium
+
+ * Team upload.
+ * Do not build the lucene3 javadocs anymore. Very low popcon and build
+ failures. (Closes: #917739)
+ * Remove TODO.Debian.
+ * Add web.xml.patch and use a correct DTD schema otherwise jasper will abort
+ the build process.
+ * Remove el-api.jar from the classpath to avoid a conflict with jasper-el.
+ * Execute postrm commands in solr-jetty and solr-tomcat on purge too.
+ (Closes: #914223)
+
+ -- Markus Koschany <apo at debian.org> Fri, 15 Feb 2019 11:21:49 +0100
+
lucene-solr (3.6.2+dfsg-16) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -46,7 +46,7 @@ Build-Depends:
libxml-commons-resolver1.1-java,
maven-repo-helper (>= 1.5~),
po-debconf
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
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
@@ -73,8 +73,6 @@ Architecture: all
Depends:
liblucene3-java,
${misc:Depends}
-Suggests:
- liblucene3-java-doc
Recommends:
libavalon-framework-java,
libcommons-beanutils-java,
@@ -97,20 +95,6 @@ Description: Full-text search engine library for Java - additional libraries
.
This package contains a number of additional (contributed) libraries.
-Package: liblucene3-java-doc
-Architecture: all
-Section: doc
-Suggests:
- liblucene3-java
-Depends:
- ${misc:Depends}
-Description: Documentation for Lucene
- Lucene is a full-text search engine for the Java(TM) programming language.
- Lucene is not a complete application, but rather a code library and API
- that can easily be used to add search capabilities to applications.
- .
- This package contains class API documentation for Lucene.
-
Package: libsolr-java
Architecture: all
Depends:
@@ -137,8 +121,7 @@ Suggests:
junit4,
libeasymock-java,
libjetty9-extras-java,
- libjetty9-java (>= 9.4),
- libsolr-java-doc
+ libjetty9-java (>= 9.4)
Description: Enterprise search server based on Lucene - Java libraries
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
=====================================
debian/liblucene3-java-doc.doc-base deleted
=====================================
@@ -1,10 +0,0 @@
-Document: liblucene3-java-doc
-Title: API Javadoc for Apache Lucene Full-Text Search Library
-Author: Apache Lucene Project Team
-Abstract: This is the API Javadoc provided by the Apache
- Lucene Full-Text Search Library
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/liblucene3-java/api/index.html
-Files: /usr/share/doc/liblucene3-java/api/*.html
=====================================
debian/liblucene3-java-doc.docs deleted
=====================================
@@ -1 +0,0 @@
-lucene/build/docs/api
=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@ remove-RunExecutableListener.patch
CVE-2017-3163.patch
ant-1.10.patch
CVE-2018-1308.patch
+web.xml.patch
=====================================
debian/patches/web.xml.patch
=====================================
@@ -0,0 +1,32 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 15 Feb 2019 10:02:16 +0100
+Subject: web.xml
+
+---
+ solr/webapp/web/WEB-INF/web.xml | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/solr/webapp/web/WEB-INF/web.xml b/solr/webapp/web/WEB-INF/web.xml
+index b709bda..eda1dc8 100644
+--- a/solr/webapp/web/WEB-INF/web.xml
++++ b/solr/webapp/web/WEB-INF/web.xml
+@@ -1,5 +1,4 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+@@ -17,7 +16,12 @@
+ limitations under the License.
+ -->
+
+-<web-app>
++<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
++ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
++ version="3.1">
++
+
+ <!-- Uncomment if you are trying to use a Resin version before 3.0.19.
+ Their XML implementation isn't entirely compatible with Xerces.
=====================================
debian/rules
=====================================
@@ -20,7 +20,7 @@ override_dh_auto_build:
mkdir -p lucene/site/build/site
ant -buildfile build.xml -Dversion=$(DEB_UPSTREAM_VERSION) get-maven-poms
ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
- -Dversion=$(DEB_UPSTREAM_VERSION) javacc jar-core docs javadocs build-contrib
+ -Dversion=$(DEB_UPSTREAM_VERSION) javacc jar-core docs build-contrib
ant -buildfile solr/contrib/dataimporthandler/build.xml \
-propertyfile debian/ant.properties -Dversion=$(DEB_UPSTREAM_VERSION) dist
ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
=====================================
debian/solr-jetty.postrm
=====================================
@@ -3,7 +3,7 @@
set -e
case "$1" in
- remove)
+ remove|purge)
# If permissions for the stuff under /var/lib/solr haven't
# been removed, remove them now
if [ -x dpkg-statoverride ]; then
@@ -20,7 +20,7 @@ case "$1" in
invoke-rc.d jetty9 restart || true
fi
;;
- upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
# do nothing
;;
*)
=====================================
debian/solr-tomcat.postrm
=====================================
@@ -3,13 +3,13 @@
set -e
case "$1" in
- remove)
+ remove|purge)
rm -f /etc/tomcat9/policy.d/05solr.policy
if [ -x invoke-rc.d ]; then
invoke-rc.d tomcat9 restart || true
fi
;;
- upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear)
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
# do nothing
;;
*)
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/2e71dd16fb2311242274a1cfef2401cdd4045bfe...f142790fa47e4045ac7563748d84e451e2495980
--
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/2e71dd16fb2311242274a1cfef2401cdd4045bfe...f142790fa47e4045ac7563748d84e451e2495980
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190215/1097e711/attachment.html>
More information about the pkg-java-commits
mailing list