HV-1308 Define a path variable instead of using maven-remote-resource…

…s plugin It sounded like a good idea but the fact is that the build-config artifact is not available when we build the aggregator so we needed a special case. Having a variable to for the root of the project might be useful for other plugins as well so I chose to go this route.
hibernate · Apr 13, 2017 · 6ac82ed · 6ac82ed
1 parent bd731cb
commit 6ac82ed
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 80 deletions.
diff --git a/annotation-processor/pom.xml b/annotation-processor/pom.xml
@@ -19,6 +19,10 @@
 
     <name>Hibernate Validator Annotation Processor</name>
 
+    <properties>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/build-config/pom.xml b/build-config/pom.xml
@@ -20,6 +20,10 @@
     <name>Hibernate Validator Build Configuration</name>
     <description>Configuration for the build of Hibernate Validator</description>
 
+    <properties>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -31,49 +35,6 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <includes>
-                        <include>**/*.txt</include>
-                        <include>**/*.xml</include>
-                        <include>**/*.header</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>src/main/resources/license.header</header>
-                    <strictCheck>true</strictCheck>
-                    <headerDefinitions>
-                        <headerDefinition>src/main/resources/xml-header-style.xml</headerDefinition>
-                    </headerDefinitions>
-                    <mapping>
-                        <xml>XML_FILE_STYLE</xml>
-                    </mapping>
-                    <includes>
-                        <include>**/*.xml</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>license-headers</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -20,6 +20,10 @@
     <name>Hibernate Validator Portable Extension</name>
     <description>Hibernate Validator CDI Portable Extension</description>
 
+    <properties>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+    </properties>
+
     <dependencies>
         <!--
         Compile time dependencies

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -24,6 +24,7 @@
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.javadoc.skip>false</maven.javadoc.skip>
         <javadoc.additional.param></javadoc.additional.param>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -41,6 +41,7 @@
         <maven-surefire-plugin.argLine>-Duser.language=en</maven-surefire-plugin.argLine>
 
         <forbiddenapis-junit.path>forbidden-allow-junit.txt</forbiddenapis-junit.path>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -20,6 +20,10 @@
     <name>Hibernate Validator Engine</name>
     <description>Hibernate's Bean Validation (JSR-380) reference implementation.</description>
 
+    <properties>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+    </properties>
+
     <distributionManagement>
         <site>
             <id>site</id>

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -23,6 +23,7 @@
     <properties>
         <wildflyTargetDir>${basedir}/target/wildfly-${wildfly.version}</wildflyTargetDir>
         <wildflyModulesDir>${wildflyTargetDir}/modules/system/layers/base</wildflyModulesDir>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -31,6 +31,8 @@
         <patchFile>${project.build.directory}/hv-patch.zip</patchFile>
 
         <patch-gen-maven-plugin.argLine.add-opens></patch-gen-maven-plugin.argLine.add-opens>
+
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
     </properties>
 
     <dependencyManagement/>

diff --git a/osgi/integrationtest/pom.xml b/osgi/integrationtest/pom.xml
@@ -25,6 +25,7 @@
         <maven.deploy.skip>true</maven.deploy.skip>
 
         <forbiddenapis-junit.path>forbidden-allow-junit.txt</forbiddenapis-junit.path>
+        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/osgi/karaf-features/pom.xml b/osgi/karaf-features/pom.xml
@@ -21,6 +21,10 @@
     <name>Hibernate Validator Karaf Features</name>
     <description>Hibernate Validator features for Apache Karaf</description>
 
+    <properties>
+        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
+    </properties>
+
     <build>
         <plugins>
             <plugin>

diff --git a/osgi/pom.xml b/osgi/pom.xml
@@ -21,6 +21,10 @@
     <name>Hibernate Validator OSGi Modules</name>
     <description>Hibernate Validator OSGi modules aggregator</description>
 
+    <properties>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+    </properties>
+
     <modules>
         <module>karaf-features</module>
         <module>integrationtest</module>

diff --git a/performance/pom.xml b/performance/pom.xml
@@ -32,6 +32,8 @@
         <!-- default values, overridden per profile -->
         <beanvalidation-impl.name>none</beanvalidation-impl.name>
         <beanvalidation-impl.version>none</beanvalidation-impl.version>
+
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -186,7 +186,7 @@
         <!-- Forbidden API related properties -->
         <forbiddenapis-junit.path>forbidden-junit.txt</forbiddenapis-junit.path>
 
-        <build-config-resources.path>${project.build.directory}/build-config-resources</build-config-resources.path>
+        <hibernate-validator-parent.path>.</hibernate-validator-parent.path>
     </properties>
 
     <prerequisites>
@@ -422,14 +422,6 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <header>build-config/src/main/resources/license.header</header>
-                    <strictCheck>true</strictCheck>
-                    <headerDefinitions>
-                        <headerDefinition>build-config/src/main/resources/java-header-style.xml</headerDefinition>
-                        <headerDefinition>build-config/src/main/resources/xml-header-style.xml</headerDefinition>
-                    </headerDefinitions>
-                </configuration>
             </plugin>
         </plugins>
         <pluginManagement>
@@ -571,41 +563,16 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.5</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.hibernate.validator</groupId>
-                            <artifactId>hibernate-validator-build-config</artifactId>
-                            <version>${project.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <resourceBundles>
-                            <resourceBundle>org.hibernate.validator:hibernate-validator-build-config:${project.version}</resourceBundle>
-                        </resourceBundles>
-                        <outputDirectory>${build-config-resources.path}</outputDirectory>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>process</goal>
-                            </goals>
-                            <phase>generate-resources</phase>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
                     <version>3.0</version>
                     <configuration>
-                        <header>${build-config-resources.path}/license.header</header>
+                        <header>${hibernate-validator-parent.path}/build-config/src/main/resources/license.header</header>
                         <strictCheck>true</strictCheck>
                         <headerDefinitions>
-                            <headerDefinition>${build-config-resources.path}/java-header-style.xml</headerDefinition>
-                            <headerDefinition>${build-config-resources.path}/xml-header-style.xml</headerDefinition>
+                            <headerDefinition>${hibernate-validator-parent.path}/build-config/src/main/resources/java-header-style.xml</headerDefinition>
+                            <headerDefinition>${hibernate-validator-parent.path}/build-config/src/main/resources/xml-header-style.xml</headerDefinition>
                         </headerDefinitions>
                         <mapping>
                             <java>JAVA_CLASS_STYLE</java>

diff --git a/tck-runner/pom.xml b/tck-runner/pom.xml
@@ -19,12 +19,15 @@
 
     <name>Hibernate Validator TCK Runner</name>
     <description>Aggregates dependencies and runs the JSR-380 TCK</description>
+
     <properties>
         <tck.version>2.0.0.Alpha3</tck.version>
         <tck.suite.file>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</tck.suite.file>
         <wildflyTargetDir>${project.build.directory}/wildfly-${wildfly.version}</wildflyTargetDir>
         <validation.provider>org.hibernate.validator.HibernateValidator</validation.provider>
         <remote.debug />
+
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -16,6 +16,10 @@
 
     <name>Hibernate Validator Test Utils</name>
 
+    <properties>
+        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+    </properties>
+
     <build>
         <plugins>
             <plugin>