[Git][java-team/tomcat9][master] 2 commits: Revert "Set addOSGi to false when building the tests to prevent a FTBFS."

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / tomcat9


Commits:
6860051b by Markus Koschany at 2021-09-27T16:42:40+02:00
Revert "Set addOSGi to false when building the tests to prevent a FTBFS."

This reverts commit f0ea9cde7d9eef40f9f7ac8f118f5682600f592f.

- - - - -
a63a57cd by Markus Koschany at 2021-09-27T16:47:45+02:00
Update 0010-debianize-build-xml.patch and depend on the setup-bnd task

to prevent a FTBFS when building the tests. This replaces the workaround by
setting addOSGi to false.

Thanks to Aurimas Fišeras for the report.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/0010-debianize-build-xml.patch
- debian/patches/exclude-TestJNDIRealmIntegration.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -16,8 +16,6 @@ tomcat9 (9.0.53-1) unstable; urgency=medium
     applications in subdirectories of /var/log/tomcat9 are not compressed.
     Thanks to Ludovic Pouzenc for the report. (Closes: #982961)
   * Exclude TestJNDIRealmIntegration because of missing dependencies.
-  * d/rules: dh_auto_test override: Set addOSGi to false when building the
-    tests to prevent a FTBFS.
 
  -- Markus Koschany <apo at debian.org>  Fri, 24 Sep 2021 15:37:51 +0200
 


=====================================
debian/patches/0010-debianize-build-xml.patch
=====================================
@@ -1,20 +1,27 @@
-Description: Disable usage of embedded library copies
-Author: James Pages <james.page at canonical.com>
+From: James Pages <james.page at canonical.com>
+Date: Mon, 27 Sep 2021 16:45:13 +0200
+Subject: Disable usage of embedded library copies
+
 Forwarded: no
 Last-Update: 2011-05-16
+---
+ build.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/build.xml b/build.xml
+index 5c71f48..e7cc2cb 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -950,7 +950,7 @@
+@@ -964,7 +964,7 @@
      </copy>
    </target>
  
 -  <target name="compile" depends="download-compile,validate">
-+  <target name="compile" depends="validate">
++  <target name="compile" depends="setup-bnd,validate">
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -1388,9 +1388,9 @@
+@@ -1409,9 +1409,9 @@
  
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
            description="Default. Builds a working Tomcat instance">


=====================================
debian/patches/exclude-TestJNDIRealmIntegration.patch
=====================================
@@ -11,7 +11,7 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+)
 
 diff --git a/build.xml b/build.xml
-index 8539d29..ee229a8 100644
+index 84429db..4b4d289 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -1848,6 +1848,7 @@


=====================================
debian/rules
=====================================
@@ -20,7 +20,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p webapps/examples/WEB-INF/lib
 	cp /usr/share/java/taglibs-standard-spec.jar webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar
 	cp /usr/share/java/taglibs-standard-impl.jar webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
-	dh_auto_build -- test -Dtest.apr.loc=/usr/lib/$(shell dpkg-architecture --query DEB_BUILD_MULTIARCH) -Dtest.verbose=false -DaddOSGi=false
+	dh_auto_build -- test -Dtest.apr.loc=/usr/lib/$(shell dpkg-architecture --query DEB_BUILD_MULTIARCH) -Dtest.verbose=false
 endif
 
 override_dh_install-indep:



View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/f0ea9cde7d9eef40f9f7ac8f118f5682600f592f...a63a57cd64bb54810acbd226fb8f653d085d0ab6

-- 
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/f0ea9cde7d9eef40f9f7ac8f118f5682600f592f...a63a57cd64bb54810acbd226fb8f653d085d0ab6
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/20210927/0476ad17/attachment.htm>