HSEARCH-3000 Pick Jigsaw Automatic Module names for all published mod…

…ules
hibernate · May 3, 2018 · 6d11e37 · 6d11e37
1 parent 9898bd9
commit 6d11e37
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 10 deletions.
diff --git a/backends/jgroups/pom.xml b/backends/jgroups/pom.xml
@@ -162,6 +162,9 @@
                         <configuration>
                             <archive>
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.clustering.jgroups</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>

diff --git a/backends/jms/pom.xml b/backends/jms/pom.xml
@@ -76,6 +76,9 @@
                         <configuration>
                             <archive>
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.clustering.jms</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>

diff --git a/elasticsearch-aws/pom.xml b/elasticsearch-aws/pom.xml
@@ -42,9 +42,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <!-- Elasticsearch integration currently not supported in OSGi;
-                 This section commented out to not make it appear it might work.
-                 If you need this to work in OSGi, please see and vote for: https://hibernate.atlassian.net/browse/HSEARCH-2524
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -57,12 +54,17 @@
                         </goals>
                         <configuration>
                             <archive>
-                                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.backend.elasticsearch.aws</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <!-- Elasticsearch integration currently not supported in OSGi;
+                 This section commented out to not make it appear it might work.
+                 If you need this to work in OSGi, please see and vote for: https://hibernate.atlassian.net/browse/HSEARCH-2524
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
@@ -121,9 +121,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <!-- Elasticsearch integration currently not supported in OSGi;
-                 This section commented out to not make it appear it might work.
-                 If you need this to work in OSGi, please see and vote for: https://hibernate.atlassian.net/browse/HSEARCH-2524
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -136,12 +133,17 @@
                         </goals>
                         <configuration>
                             <archive>
-                                <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.backend.elasticsearch</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <!-- Elasticsearch integration currently not supported in OSGi;
+                 This section commented out to not make it appear it might work.
+                 If you need this to work in OSGi, please see and vote for: https://hibernate.atlassian.net/browse/HSEARCH-2524
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -162,6 +162,9 @@
                         <configuration>
                             <archive>
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.engine</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>

diff --git a/integrationtest/jdk9-modules/src/main/java/module-info.java b/integrationtest/jdk9-modules/src/main/java/module-info.java
@@ -1,7 +1,7 @@
 module hibernate.search.integrationtest.jdk9.modules.client {
 	exports org.hibernate.search.test.integration.jdk9_modules.client.service;
-	requires hibernate.search.engine;
-	requires hibernate.search.orm;
+	requires org.hibernate.search.engine;
+	requires org.hibernate.search.orm;
 	requires java.persistence;
 	requires org.hibernate.orm.core;
 	requires lucene.analyzers.common;

diff --git a/jsr352/core/pom.xml b/jsr352/core/pom.xml
@@ -80,8 +80,23 @@
         </testResources>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.jsr352.core</Automatic-Module-Name>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
                     <execution>
                         <goals>
                             <goal>test-jar</goal>

diff --git a/jsr352/jberet/pom.xml b/jsr352/jberet/pom.xml
@@ -41,4 +41,28 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.jsr352.jberet</Automatic-Module-Name>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/orm/pom.xml b/orm/pom.xml
@@ -170,6 +170,9 @@
                         <configuration>
                             <archive>
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.orm</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>

diff --git a/serialization/avro/pom.xml b/serialization/avro/pom.xml
@@ -107,6 +107,9 @@
                         <configuration>
                             <archive>
                                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                                <manifestEntries>
+                                    <Automatic-Module-Name>org.hibernate.search.serialization.avro</Automatic-Module-Name>
+                                </manifestEntries>
                             </archive>
                         </configuration>
                     </execution>