Skip to content

Commit

Permalink
HSEARCH-3823 Regroup configuration of public modules in a common pare…
Browse files Browse the repository at this point in the history 
…nt POM

In particular, regroup the configuration of javadoc generation
  • Loading branch information
@yrodiere
yrodiere committed Feb 17, 2020
1 parent a322e39 commit e57561b
Show file tree
Hide file tree
Showing 18 changed files with 217 additions and 654 deletions.
83 changes: 2 additions & 81 deletions backend/elasticsearch-aws/pom.xml
View file
Expand Up @@ -9,10 +9,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>hibernate-search-parent</artifactId>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-parent-public</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
<relativePath>../../parents/public</relativePath>
</parent>
<artifactId>hibernate-search-backend-elasticsearch-aws</artifactId>

Expand All @@ -33,83 +33,4 @@
<artifactId>aws-v4-signer-java</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<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>${java.module.name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>module-descriptors</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<executions>
<execution>
<id>add-module-infos</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<configuration>
<module>
<moduleInfo>
<name>${java.module.name}</name>
<exports>
!org.hibernate.search.*.impl;
!org.hibernate.search.*.impl.*;
*;
</exports>
</moduleInfo>
</module>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
84 changes: 2 additions & 82 deletions backend/elasticsearch/pom.xml
View file
Expand Up @@ -10,9 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-parent</artifactId>
<artifactId>hibernate-search-parent-public</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
<relativePath>../../parents/public</relativePath>
</parent>
<artifactId>hibernate-search-backend-elasticsearch</artifactId>

Expand Down Expand Up @@ -56,84 +56,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<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>${java.module.name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>module-descriptors</id>
<!--
TODO HSEARCH-3274 enable this profile by default to add module descriptors to Hibernate Search modules
(see also other modules)
-->
<build>
<plugins>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<executions>
<execution>
<id>add-module-infos</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<configuration>
<module>
<moduleInfo>
<name>${java.module.name}</name>
<exports>
!org.hibernate.search.*.impl;
!org.hibernate.search.*.impl.*;
*;
</exports>
</moduleInfo>
</module>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
66 changes: 6 additions & 60 deletions backend/lucene/pom.xml
View file
Expand Up @@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-parent</artifactId>
<artifactId>hibernate-search-parent-public</artifactId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
<relativePath>../../parents/public</relativePath>
</parent>
<artifactId>hibernate-search-backend-lucene</artifactId>

Expand Down Expand Up @@ -62,47 +62,6 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<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>${java.module.name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>module-descriptors</id>
Expand All @@ -125,36 +84,23 @@
A second step would be to express the dependency to the unnamed module directly in the module-info descriptor,
but I'm not sure this is even possible.
-->
<build>
<plugins>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<!-- Override the executions defined in the parent module -->
<executions>
<execution>
<id>add-module-infos</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<configuration>
<module>
<moduleInfo>
<name>${java.module.name}</name>
<exports>
!org.hibernate.search.*.impl;
!org.hibernate.search.*.impl.*;
*;
</exports>
</moduleInfo>
</module>
</configuration>
<!-- Disable the plugin, see above -->
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
-->
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion build-config/pom.xml
View file
Expand Up @@ -19,7 +19,6 @@

<properties>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<maven.javadoc.skip>true</maven.javadoc.skip>
<jqassistant.skip>true</jqassistant.skip>

<!--
Expand Down
5 changes: 3 additions & 2 deletions distribution/pom.xml
View file
Expand Up @@ -9,9 +9,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>hibernate-search-parent</artifactId>
<artifactId>hibernate-search-parent-public</artifactId>
<groupId>org.hibernate.search</groupId>
<version>6.0.0-SNAPSHOT</version>
<relativePath>../parents/public</relativePath>
</parent>

<artifactId>hibernate-search-distribution</artifactId>
Expand All @@ -21,7 +22,7 @@
<packaging>pom</packaging>

<properties>
<!-- Skip artifact deployment -->
<!-- Skip artifact deployment: we publish through other means. -->
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</properties>

Expand Down
1 change: 0 additions & 1 deletion documentation/pom.xml
View file
Expand Up @@ -34,7 +34,6 @@
<html.outdated-content.project-key>${html.meta.project-key}</html.outdated-content.project-key>

<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>

<dependencies>
Expand Down

0 comments on commit e57561b

Please sign in to comment.