[Git][java-team/xerial-sqlite-jdbc][master] 2 commits: bundle and javadoc plugins are not needed as build-dependencies

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / xerial-sqlite-jdbc


Commits:
43738cf3 by Pierre Gruet at 2022-01-08T11:00:16+01:00
bundle and javadoc plugins are not needed as build-dependencies

- - - - -
601293c7 by Pierre Gruet at 2022-01-08T11:00:41+01:00
The manifest file will be set by javahelper

- - - - -


4 changed files:

- debian/control
- debian/maven.ignoreRules
- debian/patches/series
- + debian/patches/skip_manifest_setting.patch


Changes:

=====================================
debian/control
=====================================
@@ -9,10 +9,8 @@ Build-Depends: debhelper-compat (= 13),
                dh-exec,
                junit5 <!nocheck>,
                libhamcrest-java <!nocheck>,
-               libmaven-bundle-plugin-java,
                libmaven-compiler-plugin-java,
                libmaven-jar-plugin-java,
-               libmaven-javadoc-plugin-java,
                libsqlite3-dev,
                maven-debian-helper,
                debhelper


=====================================
debian/maven.ignoreRules
=====================================
@@ -1,3 +1,5 @@
 
+org.apache.felix maven-bundle-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.graalvm.buildtools native-maven-plugin * * * *
 org.graalvm.buildtools junit-platform-native * * * *


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ test.patch
 removed_test_resource.patch
 allow_discrepancy_in_driver_version.patch
 cleaning.patch
+skip_manifest_setting.patch


=====================================
debian/patches/skip_manifest_setting.patch
=====================================
@@ -0,0 +1,23 @@
+Description: the manifest file will be set by javahelper
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2022-01-08
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -142,15 +142,6 @@
+       <plugin>
+         <artifactId>maven-jar-plugin</artifactId>
+         <version>3.2.0</version>
+-        <configuration>
+-          <!-- Pick the MANIFEST generated by the bundle plugin -->
+-          <archive>
+-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+-            <manifestEntries>
+-              <Automatic-Module-Name>org.xerial.sqlitejdbc</Automatic-Module-Name>
+-            </manifestEntries>
+-          </archive>
+-        </configuration>
+       </plugin>
+ 
+ 



View it on GitLab: https://salsa.debian.org/java-team/xerial-sqlite-jdbc/-/compare/bce82993e399a5edb4bf5e6becf305aff6cf63c0...601293c7ccacf097754bf3f77bdb1bf4472236b2

-- 
View it on GitLab: https://salsa.debian.org/java-team/xerial-sqlite-jdbc/-/compare/bce82993e399a5edb4bf5e6becf305aff6cf63c0...601293c7ccacf097754bf3f77bdb1bf4472236b2
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/20220108/215b2b83/attachment.htm>