[med-svn] [Git][med-team/milib][master] 2 commits: See how far we move with simply adding --buildsystem=gradle
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Jun 30 16:04:44 BST 2022
Andreas Tille pushed to branch master at Debian Med / milib
Commits:
f43699b3 by Andreas Tille at 2022-06-30T17:00:33+02:00
See how far we move with simply adding --buildsystem=gradle
- - - - -
17c3f42e by Andreas Tille at 2022-06-30T17:03:00+02:00
No need to patch pom.xml
- - - - -
5 changed files:
- debian/control
- − debian/patches/jaxb.patch
- − debian/patches/removeHostnameFromPomXml.patch
- − debian/patches/series
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Section: java
Priority: optional
Build-Depends: debhelper-compat (= 13),
default-jdk,
- maven-debian-helper (>= 2.1)
+ gradle-debian-helper
Build-Depends-Indep: libcommons-compress-java (>= 1.13),
libcommons-io-java (>= 2.5),
libcommons-math3-java,
=====================================
debian/patches/jaxb.patch deleted
=====================================
@@ -1,29 +0,0 @@
-Description: Use jaxb-api
-Author: tony mancill <tmancill at debian.org>
-Description: Sat, 26 Jan 2019 20:33:16 -0800
-Origin: https://lists.debian.org/debian-java/2019/01/msg00051.html
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -98,6 +98,21 @@
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
-+ <dependency>
-+ <groupId>javax.xml.bind</groupId>
-+ <artifactId>jaxb-api</artifactId>
-+ <version>2.3.1</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.glassfish.jaxb</groupId>
-+ <artifactId>jaxb-core</artifactId>
-+ <version>2.3.0.1</version>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.glassfish.jaxb</groupId>
-+ <artifactId>jaxb-runtime</artifactId>
-+ <version>2.3.0.1</version>
-+ </dependency>
- </dependencies>
-
- <developers>
=====================================
debian/patches/removeHostnameFromPomXml.patch deleted
=====================================
@@ -1,31 +0,0 @@
-Author: Steffen Moeller
-Last-Update: 2020-06-13 21:40:54 +0200
-Description: remove hostname from pom xml
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -236,24 +236,6 @@
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>build-helper-maven-plugin</artifactId>
-- <version>3.1.0</version>
-- <executions>
-- <execution>
-- <id>init-build-properties</id>
-- <phase>validate</phase>
-- <goals>
-- <goal>hostname</goal>
-- </goals>
-- <configuration>
-- <hostnameProperty>hostname</hostnameProperty>
-- </configuration>
-- </execution>
-- </executions>
-- </plugin>
--
-- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
=====================================
debian/patches/series deleted
=====================================
@@ -1,2 +0,0 @@
-jaxb.patch
-removeHostnameFromPomXml.patch
=====================================
debian/rules
=====================================
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --buildsystem=gradle
View it on GitLab: https://salsa.debian.org/med-team/milib/-/compare/9c14603e8f0d3fd95030dd50e0a116d16b0fecb8...17c3f42e92c03cecf0025f26af5548ba9d147e2b
--
View it on GitLab: https://salsa.debian.org/med-team/milib/-/compare/9c14603e8f0d3fd95030dd50e0a116d16b0fecb8...17c3f42e92c03cecf0025f26af5548ba9d147e2b
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/debian-med-commit/attachments/20220630/120860eb/attachment-0001.htm>
More information about the debian-med-commit
mailing list