fix: package scram:client classes, so SCRAM works when using a shaded…

… jar (#1091)
pgjdbc · Jan 23, 2018 · 1a89290 · 1a89290
1 parent e133510
commit 1a89290
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -113,6 +113,7 @@ matrix:
         - XA=true
         - REPLICATION=Y
         - COVERAGE=Y
+        - TEST_CLIENTS=Y
         - TZ=Pacific/Chatham # flips between +12:45 and +13:45
     - jdk: oraclejdk8
       sudo: required
@@ -193,7 +194,7 @@ matrix:
         - PG_VERSION=9.6
         - QUERY_MODE=simple
         - COVERAGE=Y
-        - ANORM_SBT=Y
+        - TEST_CLIENTS=Y
     - jdk: oraclejdk8
       addons:
         postgresql: "9.3"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Avoid connection failure when `DateStyle` is set to `ISO` [Issue 1080](https://github.com/pgjdbc/pgjdbc/issues/1080)
+- Support SCRAM-SHA-256 for PostgreSQL 10 in the JDBC 4.2 version (Java 8+) using the Ongres SCRAM library
 
 ## [42.2.0] (2018-01-17)
+### Known issues
+- SCRAM does not work as scram:client library is not packaged
+
 ### Added
 - Support SCRAM-SHA-256 for PostgreSQL 10 in the JDBC 4.2 version (Java 8+) using the Ongres SCRAM library. [PR 842](https://github.com/pgjdbc/pgjdbc/pull/842)
 - Make SELECT INTO and CREATE TABLE AS return row counts to the client in their command tags. [Issue 958](https://github.com/pgjdbc/pgjdbc/issues/958) [PR 962](https://github.com/pgjdbc/pgjdbc/pull/962)

diff --git a/docs/_posts/2018-01-17-42.2.0-release.md b/docs/_posts/2018-01-17-42.2.0-release.md
@@ -7,6 +7,9 @@ version: 42.2.0
 ---
 **Notable changes**
 
+### Known issues
+- SCRAM authentication does not work as scram client classes are not packaged
+
 ### Added
 - Support SCRAM-SHA-256 for PostgreSQL 10 in the JDBC 4.2 version (Java 8+) using the Ongres SCRAM library. [PR 842](https://github.com/pgjdbc/pgjdbc/pull/842)
 - Make SELECT INTO and CREATE TABLE AS return row counts to the client in their command tags. [Issue 958](https://github.com/pgjdbc/pgjdbc/issues/958) [PR 962](https://github.com/pgjdbc/pgjdbc/pull/962)

diff --git a/pgjdbc/pom.xml b/pgjdbc/pom.xml
@@ -267,7 +267,7 @@
             <filter>
               <artifact>com.ongres.scram:client</artifact>
               <includes>
-                <include>*.*</include>
+                <include>**</include>
               </includes>
             </filter>
             <filter>