Skip to content

Declare api and implementation dependencies to better align with code usages #14

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

Merged
labkey-susanh merged 6 commits into from
Sep 29, 2020
Merged

Declare api and implementation dependencies to better align with code usages #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
faa299d
Gradle 6.6.1
labkey-susanh Aug 29, 2020
104f374
Add missing explicit dependencies and use proper configuration for ot…
labkey-susanh Aug 29, 2020
cbf8141
update version number
labkey-susanh Aug 31, 2020
03fa98d
snapshot version and changelog update before merge
labkey-susanh Sep 17, 2020
bf7d34e
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 18, 2020
b82da79
Update changelog for new version
labkey-susanh Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion labkey-api-sas/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 5 additions & 0 deletions labkey-client-api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# The LabKey Remote API Library for Java - Change Log

## version TBD
*Released* :TBD
* Add some missing dependency declarations

## version 1.3.1
*Released* : 18 September 2020

* Fix pre-population of session ID and CSRF token in Connection
* Identify target server with a `URI` instead of a `String`
* Add support for Log4J 2


## version 1.3.0
*Released* : 16 June 2020

Expand Down
8 changes: 6 additions & 2 deletions labkey-client-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,17 @@ group "org.labkey.api"
version "1.4.0-SNAPSHOT"

dependencies {
api "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
api ("com.googlecode.json-simple:json-simple:${jsonSimpleVersion}")
{
// exclude this because it gets in the way of our own JSON object implementations from server/api
exclude group: "org.json", module:"json"
}
api "net.sf.opencsv:opencsv:${opencsvVersion}"
implementation "net.sf.opencsv:opencsv:${opencsvVersion}"
implementation "commons-logging:commons-logging:${commonsLoggingVersion}"
api "org.apache.httpcomponents:httpclient:${httpclientVersion}"
implementation "commons-codec:commons-codec:${commonsCodecVersion}"
api "org.apache.httpcomponents:httpcore:${httpcoreVersion}"
}

jar {
Expand Down
4 changes: 4 additions & 0 deletions labkey-client-api/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ artifactoryPluginVersion=4.13.0
bintrayPluginVersion=1.8.4
gradlePluginsVersion=1.12.0

commonsCodecVersion=1.10
commonsLoggingVersion=1.2
fluentHcVersion=4.3.5

httpclientVersion=4.5.3
httpcoreVersion=4.4.6
httpmimeVersion=4.5.3

jsonSimpleVersion=1.1
Expand Down
2 changes: 1 addition & 1 deletion labkey-client-api/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists