Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: package scram:client classes, so scram works when using a shaded jar #1091

Merged
merged 7 commits into from Jan 23, 2018
Merged

fix: package scram:client classes, so scram works when using a shaded jar #1091

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b51687c
fix #1090 scram client missing
davecramer Jan 23, 2018
e6d28a0
use scala tests to test jar file for completeness
davecramer Jan 23, 2018
432590f
Use scala tests to make sure jar is complete including scram
davecramer Jan 23, 2018
6a73bbb
set TEST_CLIENTS in HEAD to activate the job
davecramer Jan 23, 2018
5e9d678
No need to check for HEAD in TEST_CLIENTS
davecramer Jan 23, 2018
7625c89
chore: comment clojure test, and update release notes
vlsi Jan 23, 2018
e6b5bf2
chore: fix typo ANORM_SBT -> TEST_CLIENTS
vlsi Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions .travis/travis_build.sh
View file
Open in desktop
Expand Up @@ -72,11 +72,13 @@ then
sbt test

cd ..

# Uncomment when https://github.com/clojure/java.jdbc/pull/44 is merged in
#git clone --depth=10 https://github.com/clojure/java.jdbc.git
#cd java.jdbc
#TEST_DBS=postgres TEST_POSTGRES_USER=test TEST_POSTGRES_DBNAME=test mvn test -Djava.jdbc.test.pgjdbc.version=$PROJECT_VERSION
if [[ "${PG_VERSION}" == "HEAD" ]];
then
# test to make sure the jar is complete
git clone --depth=10 https://github.com/clojure/java.jdbc.git
cd java.jdbc
TEST_DBS=postgres TEST_POSTGRES_USER=test TEST_POSTGRES_DBNAME=test mvn test -Djava.jdbc.test.pgjdbc.version=$PROJECT_VERSION
fi
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move it out of if [[ "${TEST_CLIENTS}" == *"Y" ]];


if [[ "${COVERAGE}" == "Y" ]];
Expand Down
2 changes: 1 addition & 1 deletion pgjdbc/pom.xml
View file
Open in desktop
Expand Up @@ -267,7 +267,7 @@
<filter>
<artifact>com.ongres.scram:client</artifact>
<includes>
<include>*.*</include>
<include>**</include>
</includes>
</filter>
<filter>
Expand Down