Skip to content

Commit

Permalink
Merge pull request #2615 from hgschmie/basepom-58
Browse files Browse the repository at this point in the history
Update to basepom 58
  • Loading branch information
hgschmie committed Jan 30, 2024
2 parents 3d7f23e + 67d03fb commit f7136bb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions internal/build/pom.xml
Expand Up @@ -115,7 +115,6 @@
<dep.plugin.dokka.version>1.9.0</dep.plugin.dokka.version>
<dep.plugin.flatten.version>1.5.0</dep.plugin.flatten.version>
<dep.plugin.inline.version>1.3.0</dep.plugin.inline.version>
<dep.plugin.javadoc.version>3.6.0</dep.plugin.javadoc.version>
<dep.plugin.kotlin.version>1.9.22</dep.plugin.kotlin.version>
<dep.plugin.ktlint.version>2.0.0</dep.plugin.ktlint.version>
<dep.plugin.sortpom.version>3.3.0</dep.plugin.sortpom.version>
Expand All @@ -133,11 +132,11 @@
<jdbi.check.skip-kotlin>${basepom.check.skip-extended}</jdbi.check.skip-kotlin>
<jdbi.check.skip-ktlint>${jdbi.check.skip-kotlin}</jdbi.check.skip-ktlint>
<jdbi.check.skip-sortpom>${basepom.check.skip-basic}</jdbi.check.skip-sortpom>
<jdbi.test.language>en</jdbi.test.language>
<jdbi.test.mysql-version>mysql:latest</jdbi.test.mysql-version>
<jdbi.test.pg-version>15</jdbi.test.pg-version>
<jdbi.test.timezone>UTC</jdbi.test.timezone>
<jdbi.test.language>en</jdbi.test.language>
<jdbi.test.region>US</jdbi.test.region>
<jdbi.test.timezone>UTC</jdbi.test.timezone>
<kotlin.compiler.apiVersion>1.6</kotlin.compiler.apiVersion>
<kotlin.compiler.jvmTarget>${project.build.targetJdk}</kotlin.compiler.jvmTarget>
<kotlin.compiler.languageVersion>1.6</kotlin.compiler.languageVersion>
Expand Down
2 changes: 1 addition & 1 deletion internal/root/pom.xml
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.basepom</groupId>
<artifactId>basepom-oss</artifactId>
<version>57</version>
<version>58</version>
<!-- null out the relative path, otherwise maven complains that the referenced POM is not in the parent directory -->
<relativePath />
</parent>
Expand Down

0 comments on commit f7136bb

Please sign in to comment.