[openjpa] branch master updated: Doc build with OpenJdk should be fixed

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[openjpa] branch master updated: Doc build with OpenJdk should be fixed

solomax-2
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git


The following commit(s) were added to refs/heads/master by this push:
     new 6947da3  Doc build with OpenJdk should be fixed
6947da3 is described below

commit 6947da342f2346396ac6cf05aba89dce86293407
Author: Maxim Solodovnik <[hidden email]>
AuthorDate: Thu Dec 6 16:51:53 2018 +0700

    Doc build with OpenJdk should be fixed
---
 openjpa-examples/image-gallery/pom.xml | 1 +
 openjpa-examples/openbooks/pom.xml     | 5 +++++
 openjpa-examples/pom.xml               | 4 ++--
 openjpa-examples/simple/pom.xml        | 4 ++++
 openjpa-project/pom.xml                | 1 +
 pom.xml                                | 3 +++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/openjpa-examples/image-gallery/pom.xml b/openjpa-examples/image-gallery/pom.xml
index b8c5cd7..56c1b41 100644
--- a/openjpa-examples/image-gallery/pom.xml
+++ b/openjpa-examples/image-gallery/pom.xml
@@ -39,6 +39,7 @@
 
   <properties>
     <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+    <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
     <test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
     <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
     <test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments>
diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml
index 71ad8ce..ee19173 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -39,6 +39,10 @@
     <name>OpenJPA Examples - OpenBooks</name>
     <description>Apache OpenJPA Examples - OpenBooks</description>
 
+    <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
@@ -190,6 +194,7 @@
                                     <descriptors>
                                         <descriptor>assembly.xml</descriptor>
                                     </descriptors>
+                                    <skipAssembly>${skip-bin-assembly}</skipAssembly>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml
index dcee16e..34103b1 100644
--- a/openjpa-examples/pom.xml
+++ b/openjpa-examples/pom.xml
@@ -39,8 +39,8 @@
 
     <properties>
         <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
-        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
-        <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
     </properties>
 
     <modules>
diff --git a/openjpa-examples/simple/pom.xml b/openjpa-examples/simple/pom.xml
index ef0b72a..a2bee3f 100644
--- a/openjpa-examples/simple/pom.xml
+++ b/openjpa-examples/simple/pom.xml
@@ -46,6 +46,10 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+    </properties>
     <build>
         <plugins>
             <plugin>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index 9a26c3b..c367c39 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -150,6 +150,7 @@
                             </descriptors>
                             <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
                             <workDirectory>target/work</workDirectory>
+                            <skipAssembly>${skip-bin-assembly}</skipAssembly>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 0909a5e..7d52cd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,9 @@
                     mvn process-classes -Dtest=false -Pjavadoc-profile
             -->
             <id>javadoc-profile</id>
+            <properties>
+                <skip-bin-assembly>true</skip-bin-assembly>
+            </properties>
             <build>
                 <plugins>
                     <plugin>