Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
Specify bean validation api version for Java EE API jar (#22045)
Browse files Browse the repository at this point in the history
  • Loading branch information
@h2002044 @arindam-bandyopadhyay
h2002044 authored and arindam-bandyopadhyay committed Jul 15, 2017
1 parent 288a1ca commit 324e25a
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 7 deletions.
2 changes: 2 additions & 0 deletions appserver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
<javax.enterprise.deploy-api.version>1.6</javax.enterprise.deploy-api.version>
<javax.security.jacc-api.version>1.5</javax.security.jacc-api.version>
<javax.security.auth.message-api.version>1.1</javax.security.auth.message-api.version>
<!-- Ensure that nucleus/pom.xml's javax.validation property is of same value as the one below -->
<javax.validation-api.version>2.0.0.CR3</javax.validation-api.version>
<javax.security.enterprise-api.version>1.0-b06</javax.security.enterprise-api.version>
<javax.security.enterprise.version>1.0-b07</javax.security.enterprise.version>

Expand Down
52 changes: 45 additions & 7 deletions nucleus/packager/external/bean-validator-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,6 @@
</execution>-->
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -212,5 +205,50 @@
<optional>true</optional>
</dependency>
</dependencies>

<!--
This module repackages various maven artifacts and artifacts like hibernate-validator
and hibernate-validator-cdi does not have java-docs published. Hence, we cannot
repackage the java-docs. We skip java-doc generation and use empty java-doc plugin
to make Nexus release job succeed.
-->
<profiles>
<profile>
<!-- generate empty javadoc jar -->
<id>release-phase2</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>create-empty-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>
${project.build.directory}/javadoc
</classesDirectory>
<classifier>javadoc</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

45 changes: 45 additions & 0 deletions nucleus/packager/external/bean-validator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,5 +267,50 @@
<optional>true</optional>
</dependency>
</dependencies>

<!--
This module repackages various maven artifacts and artifacts like hibernate-validator does not
have java-docs published. Hence, we cannot repackage the java-docs. We skip java-doc
generation and use empty java-doc plugin
to make Nexus release job succeed.
-->
<profiles>
<profile>
<!-- generate empty javadoc jar -->
<id>release-phase2</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>create-empty-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>
${project.build.directory}/javadoc
</classesDirectory>
<classifier>javadoc</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

1 change: 1 addition & 0 deletions nucleus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
<grizzly.version>2.4.0-beta12</grizzly.version>
<grizzly.npn.version>1.7</grizzly.npn.version>
<jboss.logging.annotation.version>2.0.1.Final</jboss.logging.annotation.version>
<!-- Ensure that appserver/pom.xml's javax.validation property is of same value as the one below -->
<javax.validation.version>2.0.0.CR3</javax.validation.version>
<javax.validation.version.lowerbound>1.1.0.Final</javax.validation.version.lowerbound>
<hibernate-validator.version>6.0.0.CR3</hibernate-validator.version>
Expand Down

0 comments on commit 324e25a

Please sign in to comment.