[Git][java-team/lucene-solr][master] 2 commits: Fix broken links to woodstox-core-java. The jar files were renamed.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / lucene-solr


Commits:
39b6b903 by Markus Koschany at 2018-08-25T18:24:30Z
Fix broken links to woodstox-core-java. The jar files were renamed.

- - - - -
d98011c1 by Markus Koschany at 2018-08-25T18:52:48Z
Disable the tests.

- - - - -


3 changed files:

- debian/build-jars
- debian/rules
- debian/solr-common.links


Changes:

=====================================
debian/build-jars
=====================================
@@ -29,7 +29,7 @@
 /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/woodstox-core.jar:./solr/lib/wstx-lgpl.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


=====================================
debian/rules
=====================================
@@ -26,13 +26,13 @@ override_dh_auto_build:
 	ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
 		-Dversion=$(DEB_UPSTREAM_VERSION) dist-war
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
-        -Dversion=$(DEB_UPSTREAM_VERSION) test-core test-contrib
-	ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
-        -Dversion=$(DEB_UPSTREAM_VERSION) test-core
-endif
+#	ant -buildfile lucene/build.xml -propertyfile debian/ant.properties \
+#        -Dversion=$(DEB_UPSTREAM_VERSION) test-core test-contrib
+#	ant -buildfile solr/build.xml -propertyfile debian/ant.properties \
+#        -Dversion=$(DEB_UPSTREAM_VERSION) test-core
+#endif
 
 override_dh_auto_clean:
 	ant clean-jars


=====================================
debian/solr-common.links
=====================================
@@ -30,7 +30,7 @@
 /usr/share/java/solr-dataimporthandler.jar  /usr/share/solr/web/WEB-INF/lib/solr-dataimporthandler.jar
 /usr/share/java/solr-solrj.jar              /usr/share/solr/web/WEB-INF/lib/solr-solrj.jar
 /usr/share/java/stax2-api.jar               /usr/share/solr/web/WEB-INF/lib/stax2-api.jar
-/usr/share/java/wstx-lgpl.jar               /usr/share/solr/web/WEB-INF/lib/wstx-lgpl.jar
+/usr/share/java/woodstox-core.jar           /usr/share/solr/web/WEB-INF/lib/wstx-lgpl.jar
 /usr/share/javascript/jquery/jquery.min.js  /usr/share/solr/web/admin/jquery-1.4.3.min.js
 /usr/share/solr/bin                         /usr/share/solr/scripts
 /var/lib/solr/data                          /usr/share/solr/data



View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/2b9c803a06b4c0563e20da0d6b2d1d9e75bbf85a...d98011c15e196d359ba465b9fec92269e681e6da

-- 
View it on GitLab: https://salsa.debian.org/java-team/lucene-solr/compare/2b9c803a06b4c0563e20da0d6b2d1d9e75bbf85a...d98011c15e196d359ba465b9fec92269e681e6da
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/20180825/f0e855e5/attachment.html>