[Git][java-team/libspring-java][master] 3 commits: Disable jasperreports support since it is RC-buggy

[Andrej Shadura]

Andrej Shadura pushed to branch master at Debian Java Maintainers / libspring-java


Commits:
28596c58 by Andrej Shadura at 2019-02-27T13:42:10Z
Disable jasperreports support since it is RC-buggy

- - - - -
c6366216 by Andrej Shadura at 2019-03-09T13:27:55Z
Don’t build against libreactor-core-java since it depends on RC-buggy openhft

- - - - -
fe97420d by Andrej Shadura at 2019-03-09T13:55:30Z
Merge branch 'wip/remove-jasperreports'

- - - - -


5 changed files:

- debian/control
- debian/maven.ignoreRules
- + debian/patches/0052-no-jasperreports.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -54,7 +54,7 @@ Build-Depends-Indep: bsh,
                      libjackson2-databind-java,
                      libjackson2-dataformat-xml-java,
                      libjamon-java,
-                     libjasperreports-java (>= 6.1.1+dfsg-4~),
+#                     libjasperreports-java (>= 6.1.1+dfsg-4~),
                      libjaxb-api-java,
                      libjaxws-api-java,
                      libjdo-api-java (>= 3.1),
@@ -75,7 +75,7 @@ Build-Depends-Indep: bsh,
                      libprotobuf-java,
                      libprotobuf-java-format-java (>= 1.3),
                      libquartz2-java,
-                     libreactor-core-java (>= 2.0.8),
+#                     libreactor-core-java (>= 2.0.8),
                      librome-java (>= 1.6),
                      libservlet-api-java,
                      libtaglibs-standard-jstlel-java,
@@ -182,7 +182,7 @@ Recommends: libspring-jdbc-java (= ${source:Version}),
 Suggests: libehcache-java,
           libfreemarker-java,
           libgeronimo-commonj-spec-java,
-          libjasperreports-java,
+#          libjasperreports-java,
           libquartz2-java,
           velocity
 Description: modular Java/J2EE application framework - Context Support
@@ -223,7 +223,7 @@ Depends: libspring-web-java (= ${source:Version}),
          ${misc:Depends}
 Recommends: libapache-poi-java,
             libitext-java,
-            libjasperreports-java,
+#            libjasperreports-java,
             libjexcelapi-java,
             libspring-context-support-java (= ${source:Version}),
             libtiles-java (>= 3.0),


=====================================
debian/maven.ignoreRules
=====================================
@@ -14,3 +14,6 @@ org.skyscreamer jsonassert * * * *
 org.seleniumhq.selenium htmlunit-driver * * * *
 org.seleniumhq.selenium selenium-java * * * *
 net.sourceforge.htmlunit htmlunit * * * *
+net.sf.jasperreports jasperreports * * * *
+io.projectreactor reactor-core * * * *
+io.projectreactor reactor-net * * * *


=====================================
debian/patches/0052-no-jasperreports.patch
=====================================
@@ -0,0 +1,30 @@
+From: Andrej Shadura <andrewsh at debian.org>
+Date: Wed, 27 Feb 2019 14:39:32 +0100
+Subject: Don’t build jasperreports support since it FTBFS and likely to be removed from Buster
+Forwarded: not-needed
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -685,6 +685,7 @@
+ 		main {
+ 			java {
+ 				exclude "**/caffeine/*"
++				exclude "**/jasperreports/*"
+ 			}
+ 		}
+ 	}
+@@ -922,6 +923,14 @@
+ 		testRuntime("org.python:jython-standalone:2.5.3")
+ 		testRuntime("org.webjars:underscorejs:1.8.3")
+ 	}
++
++	sourceSets {
++		main {
++			java {
++				exclude "**/jasperreports/*"
++			}
++		}
++	}
+ }
+ 
+ project("spring-webmvc-tiles2") {


=====================================
debian/patches/series
=====================================
@@ -19,3 +19,4 @@
 0049-java11-compatibility.patch
 0050-apache-poi-compatibility.patch
 0051-reproducible-build-source-date.patch
+0052-no-jasperreports.patch


=====================================
debian/rules
=====================================
@@ -5,15 +5,18 @@ export SOURCE_DATE_EPOCH
 
 JAVA_HOME       := /usr/lib/jvm/default-java
 
-MODULES = aop beans context context-support core expression instrument jdbc jms messaging orm oxm test tx web webmvc webmvc-portlet
+# MODULES = aop beans context context-support core expression instrument jdbc jms messaging orm oxm test tx web webmvc webmvc-portlet
+MODULES = aop beans context context-support core expression instrument jdbc orm oxm test tx web webmvc webmvc-portlet
 
 %:
-	dh $@ --buildsystem=gradle
+	dh $@ --buildsystem=gradle -Nlibspring-messaging-java -Nlibspring-jms-java
 
 override_dh_auto_build:
 	dh_auto_build -- jar -x test -x check \
 	                 -x :spring-orm-hibernate4:compileJava \
 	                 -x :spring-orm-hibernate5:compileJava \
+	                 -x :spring-jms:compileJava \
+	                 -x :spring-messaging:compileJava \
 	                 -x :spring-instrument-tomcat:compileJava \
 	                 -x :spring-webmvc-tiles2:compileJava \
 	                 -x :spring-websocket:compileJava



View it on GitLab: https://salsa.debian.org/java-team/libspring-java/compare/9afa9c08a156822eaf8223aae1cb5e278726f249...fe97420d50e9860c2754c831fb5d40ee4b5f0afe

-- 
View it on GitLab: https://salsa.debian.org/java-team/libspring-java/compare/9afa9c08a156822eaf8223aae1cb5e278726f249...fe97420d50e9860c2754c831fb5d40ee4b5f0afe
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/20190309/5e14a02f/attachment.html>