JAVA-2470: Fix Session.OSS_DRIVER_COORDINATES for shaded JAR

olim7t · olim7t · commit 6b4ebea645f7 · 2019-10-02T08:27:48.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -4,6 +4,7 @@
 
 ### 4.2.1
 
+- [bug] JAVA-2470: Fix Session.OSS_DRIVER_COORDINATES for shaded JAR
 - [bug] JAVA-2454: Handle "empty" CQL type while parsing schema
 - [improvement] JAVA-2455: Improve logging of schema refresh errors
 - [documentation] JAVA-2429: Document expected types on DefaultDriverOption
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/DefaultMavenCoordinates.java b/core/src/main/java/com/datastax/oss/driver/internal/core/DefaultMavenCoordinates.java
@@ -51,7 +51,7 @@ public static DefaultMavenCoordinates buildFromResource(URL resource) {
       String artifactId = props.getProperty("driver.artifactId");
       String version = props.getProperty("driver.version");
       if (ByteBuf.class.getPackage().getName().contains("com.datastax.oss.driver.shaded")) {
-        version += "-shaded";
+        artifactId += "-shaded";
       }
       return new DefaultMavenCoordinates(name, groupId, artifactId, Version.parse(version));
     } catch (IOException e) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public static DefaultMavenCoordinates buildFromResource(URL resource) {`
`51`	`51`	`String artifactId = props.getProperty("driver.artifactId");`
`52`	`52`	`String version = props.getProperty("driver.version");`
`53`	`53`	`if (ByteBuf.class.getPackage().getName().contains("com.datastax.oss.driver.shaded")) {`
`54`		`- version += "-shaded";`
	`54`	`+ artifactId += "-shaded";`
`55`	`55`	`}`
`56`	`56`	`return new DefaultMavenCoordinates(name, groupId, artifactId, Version.parse(version));`
`57`	`57`	`} catch (IOException e) {`