You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2013/08/07 19:51:52 UTC
svn commit: r1511418 - in /openjpa/branches/2.2.x:
openjpa-examples/image-gallery/pom.xml openjpa-integration/jmx/pom.xml
openjpa-tools/pom.xml pom.xml
Author: curtisr7
Date: Wed Aug 7 17:51:51 2013
New Revision: 1511418
URL: http://svn.apache.org/r1511418
Log:
OPENJPA-2418: Fix checkstyle to run with maven 3.x.
Modified:
openjpa/branches/2.2.x/openjpa-examples/image-gallery/pom.xml
openjpa/branches/2.2.x/openjpa-integration/jmx/pom.xml
openjpa/branches/2.2.x/openjpa-tools/pom.xml
openjpa/branches/2.2.x/pom.xml
Modified: openjpa/branches/2.2.x/openjpa-examples/image-gallery/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/image-gallery/pom.xml?rev=1511418&r1=1511417&r2=1511418&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-examples/image-gallery/pom.xml Wed Aug 7 17:51:51 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/branches/2.2.x/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-integration/jmx/pom.xml?rev=1511418&r1=1511417&r2=1511418&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-integration/jmx/pom.xml Wed Aug 7 17:51:51 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/branches/2.2.x/openjpa-tools/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-tools/pom.xml?rev=1511418&r1=1511417&r2=1511418&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-tools/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-tools/pom.xml Wed Aug 7 17:51:51 2013
@@ -37,7 +37,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/branches/2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/pom.xml?rev=1511418&r1=1511417&r2=1511418&view=diff
==============================================================================
--- openjpa/branches/2.2.x/pom.xml (original)
+++ openjpa/branches/2.2.x/pom.xml Wed Aug 7 17:51:51 2013
@@ -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}/../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 -->
<test.jvm.maxpermsize>512m</test.jvm.maxpermsize>
@@ -792,7 +792,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>