HSEARCH-3024 Make our pom files more consistent with WildFly and JBos…

…s parent pom files
hibernate · Mar 2, 2018 · f25b4ed · f25b4ed
1 parent 40dc6f1
commit f25b4ed
Show file tree

Hide file tree

Showing 45 changed files with 655 additions and 507 deletions.
diff --git a/backends/jgroups/pom.xml b/backends/jgroups/pom.xml
@@ -173,10 +173,10 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            org.apache.lucene;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.document;version="${luceneOsgiRangeVersion}",
+                            org.apache.lucene;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.document;version="${osgi.version-range.org.apache.lucene}",
                             org.hibernate.search.*;version="[${project.version},${project.version}]",
-                            org.jgroups.*;version="${jGroupsOsgiRangeVersion}"
+                            org.jgroups.*;version="${osgi.version-range.org.jgroups}"
                         </Import-Package>
                         <Export-Package>
                         </Export-Package>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -56,7 +56,7 @@
                                 <artifactItem>
                                     <groupId>org.hibernate.infra</groupId>
                                     <artifactId>hibernate-asciidoctor-theme</artifactId>
-                                    <version>${hibernate-asciidoctor-theme.version}</version>
+                                    <version>${version.org.hibernate.infra.hibernate-asciidoctor-theme}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.build.directory}/</outputDirectory>
@@ -170,16 +170,16 @@
                         <tabsize>4</tabsize>
 
                         <hibernateSearchVersion>${project.version}</hibernateSearchVersion>
-                        <hibernateVersion>${hibernateVersion}</hibernateVersion>
-                        <hibernateShortVersion>${hibernateShortVersion}</hibernateShortVersion>
-                        <luceneVersion>${luceneVersion}</luceneVersion>
-                        <infinispanVersion>${infinispanVersion}</infinispanVersion>
+                        <hibernateVersion>${version.org.hibernate}</hibernateVersion>
+                        <hibernateShortVersion>${parsed-version.org.hibernate.majorVersion}.${parsed-version.org.hibernate.minorVersion}</hibernateShortVersion>
+                        <luceneVersion>${version.org.apache.lucene}</luceneVersion>
+                        <infinispanVersion>${version.org.infinispan}</infinispanVersion>
                         <testElasticsearchVersion>${test.elasticsearch.host.version}</testElasticsearchVersion>
-                        <tikaModuleVersion>${tikaVersion}</tikaModuleVersion>
-                        <elasticsearchClientVersion>${elasticsearchClientVersion}</elasticsearchClientVersion>
-                        <gsonVersion>${gsonVersion}</gsonVersion>
-                        <awsV4SignerJavaVersion>${awsV4SignerJavaVersion}</awsV4SignerJavaVersion>
-                        <wildflyVersion>${wildflyVersion}</wildflyVersion>
+                        <tikaModuleVersion>${version.org.apache.tika}</tikaModuleVersion>
+                        <elasticsearchClientVersion>${version.org.elasticsearch.client}</elasticsearchClientVersion>
+                        <gsonVersion>${version.com.google.code.gson}</gsonVersion>
+                        <awsV4SignerJavaVersion>${version.uk.co.lucasweb.aws-v4-signer-java}</awsV4SignerJavaVersion>
+                        <wildflyVersion>${version.wildfly}</wildflyVersion>
                     </attributes>
                 </configuration>
             </plugin>

diff --git a/elasticsearch-aws/pom.xml b/elasticsearch-aws/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>uk.co.lucasweb</groupId>
             <artifactId>aws-v4-signer-java</artifactId>
-            <version>${awsV4SignerJavaVersion}</version>
+            <version>${version.uk.co.lucasweb.aws-v4-signer-java}</version>
         </dependency>
     </dependencies>
 

diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
@@ -32,17 +32,17 @@
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-client</artifactId>
-            <version>${elasticsearchClientVersion}</version>
+            <version>${version.org.elasticsearch.client}</version>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-client-sniffer</artifactId>
-            <version>${elasticsearchClientVersion}</version>
+            <version>${version.org.elasticsearch.client}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${gsonVersion}</version>
+            <version>${version.com.google.code.gson}</version>
         </dependency>
 
         <!-- Test -->
@@ -149,8 +149,8 @@
                     <instructions>
                         <Import-Package>
                             org.hibernate.search.*;version="[${project.version},${project.version}]",
-                            org.apache.lucene.*;version="${luceneOsgiRangeVersion}",
-                            org.hibernate.annotations.common.*;version="${hibernateHcannOsgiRangeVersion}",
+                            org.apache.lucene.*;version="${osgi.version-range.org.apache.lucene}",
+                            org.hibernate.annotations.common.*;version="${osgi.version-range.org.hibernate.commons.annotations}",
                         </Import-Package>
                         <Export-Package>
                         </Export-Package>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -173,28 +173,28 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            org.hibernate.annotations.common.*;version="${hibernateHcannOsgiRangeVersion}",
-                            org.apache.lucene;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.analysis;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.analysis.core;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.analysis.standard;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.analysis.tokenattributes;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.analysis.util;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.document;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.facet;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.facet.range;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.facet.sortedset;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.index;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.queries.mlt;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.search;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.search.similarities;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.store;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.uninverting;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.util;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.util.automaton;version="${luceneOsgiRangeVersion}",
-                            org.apache.lucene.queryparser.simple;version="${luceneOsgiRangeVersion}",
-                            org.jboss.logging.*;version="${jbossLoggingOsgiRangeVersion}",
-                            org.apache.tika.*;version="[${tikaVersion}, 1.5)";resolution:=optional,
+                            org.hibernate.annotations.common.*;version="${osgi.version-range.org.hibernate.commons.annotations}",
+                            org.apache.lucene;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.analysis;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.analysis.core;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.analysis.standard;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.analysis.tokenattributes;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.analysis.util;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.document;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.facet;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.facet.range;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.facet.sortedset;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.index;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.queries.mlt;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.search;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.search.similarities;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.store;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.uninverting;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.util;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.util.automaton;version="${osgi.version-range.org.apache.lucene}",
+                            org.apache.lucene.queryparser.simple;version="${osgi.version-range.org.apache.lucene}",
+                            org.jboss.logging.*;version="${osgi.version-range.org.jboss.logging.jboss-logging}",
+                            org.apache.tika.*;version="${osgi.version-range.org.apache.tika}";resolution:=optional,
                             javax.transaction.*;version="0"
                         </Import-Package>
                         <Export-Package>

diff --git a/infinispan/pom.xml b/infinispan/pom.xml
@@ -24,7 +24,7 @@
         <relocation>
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-directory-provider</artifactId>
-            <version>${infinispanVersion}</version>
+            <version>${version.org.infinispan}</version>
             <message>This component is now owned and maintained by the Infinispan team</message>
         </relocation>
     </distributionManagement>

diff --git a/integrationtest/jsr352/pom.xml b/integrationtest/jsr352/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>com.ibm.jbatch</groupId>
             <artifactId>com.ibm.jbatch-runtime</artifactId>
-            <version>1.0</version>
+            <version>${version.com.ibm.jbatch}</version>
             <scope>test</scope>
         </dependency>
         <!--
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.13.1.1</version>
+            <version>${version.org.apache.derby}</version>
             <scope>test</scope>
         </dependency>