[openjpa] branch master updated: Documentation build is partially fixed

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

[openjpa] branch master updated: Documentation build is partially 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 6fe8f10  Documentation build is partially fixed
6fe8f10 is described below

commit 6fe8f101dfe4a3a7f7fc902ae49a16817beaf3cc
Author: Maxim Solodovnik <[hidden email]>
AuthorDate: Mon Dec 3 18:20:37 2018 +0700

    Documentation build is partially fixed
---
 openjpa-project/pom.xml | 2 ++
 pom.xml                 | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index c03a5a2..9a26c3b 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -114,6 +114,7 @@
         <!-- authentication for nightly uploads -->
         <nightly.user.name>${user.name}</nightly.user.name>
         <nightly.password>passw0rd</nightly.password>
+        <checkstyle.suppressions.location>suppressions.xml</checkstyle.suppressions.location>
     </properties>
 
     <build>
@@ -314,6 +315,7 @@
                             <groupId>net.sf.docbook</groupId>
                             <artifactId>docbook-xml</artifactId>
                             <version>5.0</version>
+                            <type>pom</type>
                             <scope>runtime</scope>
                         </dependency>
                         </dependencies>
diff --git a/pom.xml b/pom.xml
index 6cc7551..0909a5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
         <openjpa.version>${project.version}</openjpa.version>
         <openjpa.Log>DefaultLevel=INFO</openjpa.Log>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <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>
+        <checkstyle.config.location>openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
 
         <site.deploy.url>scp://people.apache.org/home/${site.deploy.user.name}/public_html/openjpa/${project.version}/staging-site</site.deploy.url>
         <!-- the test settings can be overridden my specific profiles -->