HV-1989 Use a Jakarta Validation version from dependencies in the man…

…ifest entry
hibernate · Jul 15, 2024 · 4c62854 · 4c62854
1 parent 08bab27
commit 4c62854
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 30 deletions.
diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -174,7 +174,7 @@
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                                 <manifestEntries>
                                     <Specification-Title>Jakarta Validation</Specification-Title>
-                                    <Specification-Version>2.0</Specification-Version>
+                                    <Specification-Version>${parsed-version.jakarta.validation-api.majorVersion}.${parsed-version.jakarta.validation-api.minorVersion}</Specification-Version>
                                     <Automatic-Module-Name>${hibernate-validator-cdi.module-name}</Automatic-Module-Name>
                                 </manifestEntries>
                             </archive>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -244,7 +244,7 @@
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                                 <manifestEntries>
                                     <Specification-Title>Jakarta Validation</Specification-Title>
-                                    <Specification-Version>3.0</Specification-Version>
+                                    <Specification-Version>${parsed-version.jakarta.validation-api.majorVersion}.${parsed-version.jakarta.validation-api.minorVersion}</Specification-Version>
                                     <Automatic-Module-Name>${hibernate-validator.module-name}</Automatic-Module-Name>
                                 </manifestEntries>
                             </archive>
@@ -260,7 +260,7 @@
                         <Bundle-SymbolicName>${hibernate-validator.module-name}</Bundle-SymbolicName>
                         <Import-Package>
                             jakarta.persistence.*;version="[3.0.0,4.0.0)";resolution:=optional,
-                            jakarta.validation.*;version="[3.0.0,4.0.0)",
+                            jakarta.validation.*;version="[${version.jakarta.validation-api},${parsed-version.jakarta.validation-api.nextMajorVersion}.0.0)",
                             javax.script.*;version="0",
                             javax.xml.*;version="0",
                             jakarta.el.*;version="[5.0.0,6.0.0)";resolution:=optional,

diff --git a/performance/pom.xml b/performance/pom.xml
@@ -22,6 +22,12 @@
     <properties>
         <!-- Disable enforcer as we are using banned dependencies for old versions -->
         <enforcer.skip>true</enforcer.skip>
+        <!--
+            The build-helper-maven-plugin is used to add Bean Validation 2.0 source folder to the BV implementations
+            that are 2.0+. Since we are also using this plugin to parse versions in the root pom we want to control
+            when the sources are added with this property:
+        -->
+        <add.bv2.sources.skip>true</add.bv2.sources.skip>
 
         <!--
         Need to specify something, since the plugin cannot handle empty options. Using something which does not have
@@ -76,6 +82,7 @@
                                 <goal>add-source</goal>
                             </goals>
                             <configuration>
+                                <skipAddSource>${add.bv2.sources.skip}</skipAddSource>
                                 <sources>
                                     <source>${project.basedir}/src/main/java-bv2</source>
                                 </sources>
@@ -172,6 +179,7 @@
             <properties>
                 <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
                 <beanvalidation-impl.version>${project.version}</beanvalidation-impl.version>
+                <add.bv2.sources.skip>false</add.bv2.sources.skip>
             </properties>
             <dependencies>
                 <dependency>
@@ -192,15 +200,6 @@
                     <artifactId>log4j</artifactId>
                 </dependency>
             </dependencies>
-            <!-- adding sources for BV 2.0 tests -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>hv-6.1</id>
@@ -214,6 +213,7 @@
                 <validation-api.version>2.0.1.Final</validation-api.version>
                 <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
                 <beanvalidation-impl.version>6.1.2.Final</beanvalidation-impl.version>
+                <add.bv2.sources.skip>false</add.bv2.sources.skip>
             </properties>
             <dependencies>
                 <dependency>
@@ -236,15 +236,6 @@
                     <artifactId>log4j</artifactId>
                 </dependency>
             </dependencies>
-            <!-- adding sources for BV 2.0 tests -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>hv-6.0</id>
@@ -258,6 +249,7 @@
                 <validation-api.version>2.0.1.Final</validation-api.version>
                 <beanvalidation-impl.name>Hibernate Validator</beanvalidation-impl.name>
                 <beanvalidation-impl.version>6.0.19.Final</beanvalidation-impl.version>
+                <add.bv2.sources.skip>false</add.bv2.sources.skip>
             </properties>
             <dependencies>
                 <dependency>
@@ -280,15 +272,6 @@
                     <artifactId>log4j</artifactId>
                 </dependency>
             </dependencies>
-            <!-- adding sources for BV 2.0 tests -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>hv-5.4</id>

diff --git a/pom.xml b/pom.xml
@@ -621,6 +621,22 @@
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>parse-jakarta-validation-spec-version</id>
+                        <goals>
+                            <goal>parse-version</goal>
+                        </goals>
+                        <configuration>
+                            <propertyPrefix>parsed-version.jakarta.validation-api</propertyPrefix>
+                            <versionString>${version.jakarta.validation-api}</versionString>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>