Skip to content

Commit fd9993e

Browse files
committed
HV-2015 Cleanup persistence version usage, add todo for enforcer rule
1 parent 58f3eb6 commit fd9993e

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

documentation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295

296296
<jdkVersion>${java-version.main.release}</jdkVersion>
297297
<compilerPluginVersion>${version.compiler.plugin}</compilerPluginVersion>
298-
<versionJakartaPersistence>${version.jakarta.persistence}</versionJakartaPersistence>
298+
<versionJakartaPersistence>${parsed-version.jakarta.persistence-api.majorVersion}.${parsed-version.jakarta.persistence-api.minorVersion}</versionJakartaPersistence>
299299

300300
<!-- URLs -->
301301
<javaApiDocsUrl>${java.api-docs.base-url}/</javaApiDocsUrl>

pom.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124

125125
<!-- Dependencies versions -->
126126

127-
<version.jakarta.validation-api>3.1.0</version.jakarta.validation-api>
128127
<version.jakarta.validation.validation-tck>3.1.1</version.jakarta.validation.validation-tck>
129128

130129
<version.com.thoughtworks.paranamer>2.8</version.com.thoughtworks.paranamer>
@@ -163,6 +162,14 @@
163162
<version.org.jboss.weld.weld>6.0.0.Beta4</version.org.jboss.weld.weld>
164163
<version.org.wildfly.arquillian>5.0.0.Alpha3</version.org.wildfly.arquillian>
165164
<version.jakarta.jakartaee-bom>11.0.0-M4</version.jakarta.jakartaee-bom>
165+
<!--
166+
These are now managed by the BOM ^ but we want to have version properties available to us
167+
so that we can use them elsewhere, e.g. in asciidoc files.
168+
169+
TODO: add an enforcer rile to check that the versions in these properties are aligned with the ones
170+
coming from the BOM.
171+
-->
172+
<version.jakarta.validation-api>3.1.0</version.jakarta.validation-api>
166173
<version.jakarta.persistence-api>3.2.0</version.jakarta.persistence-api>
167174

168175
<!-- JavaMoney dependencies -->
@@ -357,7 +364,6 @@
357364
<!-- Maven version required for the build -->
358365
<!-- Remember to update README when changing the version here. -->
359366
<maven.min.version>3.9.6</maven.min.version>
360-
<version.jakarta.persistence>3.2</version.jakarta.persistence>
361367
</properties>
362368

363369
<dependencyManagement>
@@ -628,6 +634,16 @@
628634
<versionString>${version.jakarta.validation-api}</versionString>
629635
</configuration>
630636
</execution>
637+
<execution>
638+
<id>parse-jakarta-persistence-spec-version</id>
639+
<goals>
640+
<goal>parse-version</goal>
641+
</goals>
642+
<configuration>
643+
<propertyPrefix>parsed-version.jakarta.persistence-api</propertyPrefix>
644+
<versionString>${version.jakarta.persistence-api}</versionString>
645+
</configuration>
646+
</execution>
631647
</executions>
632648
</plugin>
633649
</plugins>

0 commit comments

Comments
 (0)