[Git][java-team/libpostgresql-jdbc-java][master] pgjdbc/pom.xml: Manually patch scram dependency scope to be "provided" instead…

[Christoph Berg]

Christoph Berg pushed to branch master at Debian Java Maintainers / libpostgresql-jdbc-java


Commits:
ee6082d0 by Christoph Berg at 2018-06-05T09:44:55+02:00
pgjdbc/pom.xml: Manually patch scram dependency scope to be "provided" instead of relying on maven.rules. (Closes: #900615, induced by #900763, thanks Emmanuel Bourg.)

- - - - -


4 changed files:

- debian/changelog
- − debian/maven.rules
- + debian/patches/02-scram-scope.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libpgjava (42.2.2-3) UNRELEASED; urgency=medium
+
+  * pgjdbc/pom.xml: Manually patch scram dependency scope to be "provided"
+    instead of relying on maven.rules. (Closes: #900615, induced by #900763,
+    thanks Emmanuel Bourg.)
+
+ -- Christoph Berg <christoph.berg at credativ.de>  Tue, 05 Jun 2018 09:18:15 +0200
+
 libpgjava (42.2.2-2) unstable; urgency=medium
 
   * debian/maven.rules: Set scram scope to "provided" to properly remove the


=====================================
debian/maven.rules deleted
=====================================
--- a/debian/maven.rules
+++ /dev/null
@@ -1 +0,0 @@
-com.ongres.scram client * s/.*/debian/ * s/.*/provided/


=====================================
debian/patches/02-scram-scope.patch
=====================================
--- /dev/null
+++ b/debian/patches/02-scram-scope.patch
@@ -0,0 +1,12 @@
+--- a/pgjdbc/pom.xml
++++ b/pgjdbc/pom.xml
+@@ -54,7 +54,8 @@
+     <dependency>
+       <groupId>com.ongres.scram</groupId>
+       <artifactId>client</artifactId>
+-      <version>1.0.0-beta.2</version>
++      <version>debian</version>
++      <scope>provided</scope>
+     </dependency>
+   </dependencies>
+ 


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-missing-pom-configuration.patch
+02-scram-scope.patch



View it on GitLab: https://salsa.debian.org/java-team/libpostgresql-jdbc-java/commit/ee6082d017b30bcb79993ad4083e4b9360596045

-- 
View it on GitLab: https://salsa.debian.org/java-team/libpostgresql-jdbc-java/commit/ee6082d017b30bcb79993ad4083e4b9360596045
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/20180605/e7e3fae1/attachment.html>