Skip to content

Commit c6968a8

Browse files
committed
Ongres Scram client dependency is only required by Vert.x 4
In Vert.x 5, the dependency is transitive. See eclipse-vertx/vertx-sql-client#1481 Signed-off-by: Thomas Segismont <[email protected]>
1 parent 189f2c9 commit c6968a8

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/main/resources/templates/build.gradle.kts.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ dependencies {
7272
<#if language == "kotlin" && vertxVersion?starts_with("4.")>
7373
implementation(kotlin("stdlib-jdk8"))
7474
</#if>
75-
<#if hasPgClient>
75+
<#if hasPgClient && vertxVersion?starts_with("4.")>
7676
implementation("com.ongres.scram:client:2.1")
7777
</#if>
7878
<#if hasVertxJUnit5>

src/main/resources/templates/pom.xml.ftl

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,12 @@
9090
</#noparse>
9191
</#if>
9292
</#if>
93-
<#if hasPgClient>
94-
<#if vertxVersion?starts_with("5.")>
93+
<#if hasPgClient && vertxVersion?starts_with("4.")>
9594
<dependency>
9695
<groupId>com.ongres.scram</groupId>
97-
<artifactId>scram-client</artifactId>
98-
<version>3.1</version>
96+
<artifactId>client</artifactId>
97+
<version>2.1</version>
9998
</dependency>
100-
<#else>
101-
<dependency>
102-
<groupId>com.ongres.scram</groupId>
103-
<artifactId>client</artifactId>
104-
<version>2.1</version>
105-
</dependency>
106-
</#if>
10799
</#if>
108100

109101
<#if hasVertxJUnit5>

0 commit comments

Comments
 (0)