diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2019-02-27 14:19:28 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2019-03-01 13:26:15 +0100 |
| commit | 1c7b85496b215cdb38c9550be595bf6d980751b8 (patch) | |
| tree | fd76a76dc6f29c71723c3b975604213329305675 | |
| parent | bc817b2fe5bce7e6722ec122f139c427b9dcfea5 (diff) | |
Drop the java9 classifier when building with jdk >= 9
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/drop-java9-classifier.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 24650ca..645c0b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hikaricp (2.7.1-2) UNRELEASED; urgency=medium + + * 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. + + -- Sjoerd Simons <sjoerd.simons@collabora.co.uk> Wed, 27 Feb 2019 14:19:28 +0100 + hikaricp (2.7.1-1) unstable; urgency=medium * New upstream version 2.7.1 (Closes: #875368) diff --git a/debian/patches/drop-java9-classifier.patch b/debian/patches/drop-java9-classifier.patch new file mode 100644 index 0000000..612e93d --- /dev/null +++ b/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> diff --git a/debian/patches/series b/debian/patches/series index 83bdb21..4ca2c09 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ skip-hibernate-prometheus-micrometer +drop-java9-classifier.patch |