[Git][java-team/hikaricp][master] 4 commits: Drop the java9 classifier when building with jdk >= 9

[Andrej Shadura]

Andrej Shadura pushed to branch master at Debian Java Maintainers / hikaricp


Commits:
1c7b8549 by Sjoerd Simons at 2019-03-01T12:26:15Z
Drop the java9 classifier when building with jdk >= 9

- - - - -
2062676a by Andrej Shadura at 2019-03-01T12:26:44Z
Update Vcs-*

- - - - -
cfac0481 by Andrej Shadura at 2019-03-01T12:34:06Z
Don’t build the javadocs

- - - - -
8858e77d by Andrej Shadura at 2019-03-01T12:35:35Z
Update the changelog

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/drop-java9-classifier.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+hikaricp (2.7.1-2) unstable; urgency=medium
+
+  Team upload.
+
+  [ Sjoerd Simons ]
+  * d/p/drop-java9-classifier.patch: Added, drop the java9 classifier if build
+    with jdk >= 9. Prevents packages from hitting FTBS when building against
+    hikaricp build with jdk 9 which built fine with older hikaricp builds.
+
+  [ Andrej Shadura ]
+  * Update Vcs-*.
+  * Don’t build the javadocs.
+
+ -- Andrej Shadura <andrewsh at debian.org>  Fri, 01 Mar 2019 13:35:14 +0100
+
 hikaricp (2.7.1-1) unstable; urgency=medium
 
   * New upstream version 2.7.1 (Closes: #875368)


=====================================
debian/control
=====================================
@@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 10),
                maven-debian-helper (>= 2.1)
 Build-Depends-Indep: libslf4j-java
 Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/hikaricp.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/hikaricp.git
+Vcs-Git: https://salsa.debian.org/java-team/hikaricp.git
+Vcs-Browser: https://salsa.debian.org/java-team/hikaricp
 Homepage: https://github.com/brettwooldridge/HikariCP
 
 Package: libhikaricp-java


=====================================
debian/patches/drop-java9-classifier.patch
=====================================
@@ -0,0 +1,29 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -442,22 +442,26 @@
+    </build>
+ 
+    <profiles>
++   <!--
+       <profile>
+          <id>Java9</id>
+          <activation>
+             <jdk>[9,)</jdk>
+          </activation>
+          <properties>
++     -->
+             <!-- sureFireOptions9>
+                -add-opens java.base/java.net=ALL-UNNAMED
+                -add-opens java.base/java.security=ALL-UNNAMED
+                -add-exports java.base/sun.net.www.protocol.http=ALL-UNNAMED
+                -add-exports java.base/sun.net.www.protocol.https=ALL-UNNAMED
+             </sureFireOptions9 -->
++   <!--
+             <sureFireForks9>true</sureFireForks9>
+             <artifact.classifier>java9</artifact.classifier>
+          </properties>
+       </profile>
++     -->
+ 
+       <profile>
+          <id>coverage</id>


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 skip-hibernate-prometheus-micrometer
+drop-java9-classifier.patch


=====================================
debian/rules
=====================================
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ -Nlibhikaricp-java-doc
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink



View it on GitLab: https://salsa.debian.org/java-team/hikaricp/compare/bc817b2fe5bce7e6722ec122f139c427b9dcfea5...8858e77d64d398779780639594e19d0df7b08642

-- 
View it on GitLab: https://salsa.debian.org/java-team/hikaricp/compare/bc817b2fe5bce7e6722ec122f139c427b9dcfea5...8858e77d64d398779780639594e19d0df7b08642
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/20190301/59bf70b6/attachment.html>