svn commit: r1511367 - in /openjpa/trunk: openjpa-examples/image-gallery/pom.xml openjpa-integration/jmx/pom.xml openjpa-tools/pom.xml pom.xml

[cu...@apache.org]

Author: curtisr7
Date: Wed Aug  7 15:46:38 2013
New Revision: 1511367

URL: http://svn.apache.org/r1511367
Log:
OPENJPA-2418 : Fix checkstyle to run with maven 3.x.

Modified:
    openjpa/trunk/openjpa-examples/image-gallery/pom.xml
    openjpa/trunk/openjpa-integration/jmx/pom.xml
    openjpa/trunk/openjpa-tools/pom.xml
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-examples/image-gallery/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/image-gallery/pom.xml?rev=1511367&r1=1511366&r2=1511367&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Wed Aug  7 15:46:38 2013
@@ -38,7 +38,7 @@
   <description>Apache OpenJPA Examples - image-gallery</description>
 
   <properties>
-    <checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
+    <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
     <test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
     <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
     <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize}</test.jvm.arguments>

Modified: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=1511367&r1=1511366&r2=1511367&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Wed Aug  7 15:46:38 2013
@@ -37,7 +37,7 @@
     <description>OpenJPA Integration Tests - JMX Platform MBeans</description>
 
   <properties>
-    <checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
+    <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
     <!-- Enable the JMX platform MBean provider -->
     <test.jvm.jmxprovider>com.sun.management.jmxremote</test.jvm.jmxprovider>
     <!-- Disable JMX platform MBean authentication  -->

Modified: openjpa/trunk/openjpa-tools/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-tools/pom.xml?rev=1511367&r1=1511366&r2=1511367&view=diff
==============================================================================
--- openjpa/trunk/openjpa-tools/pom.xml (original)
+++ openjpa/trunk/openjpa-tools/pom.xml Wed Aug  7 15:46:38 2013
@@ -38,7 +38,7 @@
     <name>OpenJPA tools</name>
 
     <properties>
-        <checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
+        <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
     </properties>
 
     <modules>

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1511367&r1=1511366&r2=1511367&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Wed Aug  7 15:46:38 2013
@@ -46,8 +46,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}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
-        <checkstyle.suppressions.location>${project.basedir}/../openjpa-project/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>
         
         <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 -->
@@ -794,7 +794,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.6</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.codehaus.plexus</groupId>