HV-1484 Unify JPMS module names and OSGi bundle names

Author: gsmet

cdi/pom.xml

@@ -166,8 +166,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${hibernate-validator-cdi.bundle-name}</Bundle-SymbolicName>
-                        <Fragment-Host>${hibernate-validator.bundle-name}</Fragment-Host>
+                        <Bundle-SymbolicName>${hibernate-validator-cdi.module-name}</Bundle-SymbolicName>
+                        <Fragment-Host>${hibernate-validator.module-name}</Fragment-Host>
                         <Import-Package>
                             javax.validation.*;version="[2.0,3.0)",
                             javax.annotation.*;version="[1.2,2.0)",

engine/pom.xml

@@ -206,7 +206,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${hibernate-validator.bundle-name}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${hibernate-validator.module-name}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.persistence.*;version="[2.0.0,3.0.0)";resolution:=optional,
                             javax.validation.*;version="[2.0.0,3.0.0)",

pom.xml

@@ -101,9 +101,6 @@
         <!-- Module names used for Java 9 modules and OSGi bundles -->
         <hibernate-validator.module-name>org.hibernate.validator</hibernate-validator.module-name>
         <hibernate-validator-cdi.module-name>org.hibernate.validator.cdi</hibernate-validator-cdi.module-name>
-        <!-- TODO in 6.1: make the names consistent by removing the bundle properties, see HV-1484 -->
-        <hibernate-validator.bundle-name>org.hibernate.validator.hibernate-validator</hibernate-validator.bundle-name>
-        <hibernate-validator-cdi.bundle-name>org.hibernate.validator.hibernate-validator-cdi</hibernate-validator-cdi.bundle-name>
 
         <!-- see http://maven.apache.org/general.html -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>