Skip to content

Excavator: Upgrades Baseline to the latest version #1235

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
bulldozer-bot merged 3 commits into from
Sep 16, 2019
Merged

Excavator: Upgrades Baseline to the latest version #1235

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60eb333
Excavator: Upgrades Baseline to the latest version
svc-excavator-bot Sep 13, 2019
9c5bc95
fix classpath duplicate
dansanduleac Sep 16, 2019
db9d245
locks
dansanduleac Sep 16, 2019
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
Prev Previous commit
Next Next commit
fix classpath duplicate
  • Loading branch information
@dansanduleac
dansanduleac committed Sep 16, 2019
commit 9c5bc95c62e3876404d7c516ff737bd17080528b
9 changes: 9 additions & 0 deletions conjure-java-jersey-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,12 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-all"
testImplementation "org.mockito:mockito-core"
}

configurations.all {
resolutionStrategy {
// Conflicts with javax.inject:javax.inject:1
// This is safe to remove, the purpose of the repackaged version is to implement OSGI, which we don't use
// Source: https://stackoverflow.com/a/25218230/274699
exclude group: 'org.glassfish.hk2.external', module: 'javax.inject'
}
}