diff --git a/build.gradle b/build.gradle
index 4eeb67e37..c7d9767a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.4.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.2.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.4.2'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
diff --git a/conjure-java-jersey-server/build.gradle b/conjure-java-jersey-server/build.gradle
index c12f0e285..abe9d945d 100644
--- a/conjure-java-jersey-server/build.gradle
+++ b/conjure-java-jersey-server/build.gradle
@@ -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'
+    }
+}
diff --git a/versions.lock b/versions.lock
index 7325c9562..ec6dab549 100644
--- a/versions.lock
+++ b/versions.lock
@@ -59,7 +59,7 @@ org.glassfish.hk2:hk2-locator:2.5.0-b32 (4 constraints: 3949d563)
 org.glassfish.hk2:hk2-utils:2.5.0-b32 (2 constraints: 0519152b)
 org.glassfish.hk2:osgi-resource-locator:1.0.1 (2 constraints: 79234465)
 org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b32 (2 constraints: 0519152b)
-org.glassfish.hk2.external:javax.inject:2.5.0-b32 (7 constraints: 3e86b56f)
+org.glassfish.hk2.external:javax.inject:2.5.0-b32 (6 constraints: b9722375)
 org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1 (1 constraints: 251120d4)
 org.glassfish.jersey.core:jersey-client:2.25.1 (2 constraints: dc34f938)
 org.glassfish.jersey.core:jersey-common:2.25.1 (7 constraints: 0a90843b)