Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

updated checkstyle dep and moved config into pluginManagement

  • Loading branch information...
ksclarke authored and awoods committed May 6, 2014
1 parent 8ed3807 commit d7c3197c14db97ff1ed6246ee112429d79e9bb7e
Showing with 46 additions and 46 deletions.
  1. +1 −22 fcrepo-jms-indexer-core/pom.xml
  2. +8 −0 fcrepo-jms-indexer-elasticsearch/pom.xml
  3. +5 −0 fcrepo-jms-indexer-webapp/pom.xml
  4. +32 −24 pom.xml
@@ -204,29 +204,8 @@
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-build-tools</artifactId>
<version>${fcrepo-build-tools.version}</version>
</dependency>
</dependencies>
<configuration>
<consoleOutput>true</consoleOutput>
<configLocation>fcrepo-checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>fcrepo-checkstyle/checkstyle-suppressions.xml
</suppressionsLocation>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
@@ -72,4 +72,12 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
@@ -246,6 +246,11 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>

</plugins>
</build>

56 pom.xml
@@ -26,7 +26,7 @@
<jena.version>2.11.1</jena.version>
<httpcomponents.version>4.3.2</httpcomponents.version>
<httpclient.version>4.3.3</httpclient.version>

<checkstyle.plugin.version>2.12.1</checkstyle.plugin.version>
<solr.version>4.6.0</solr.version>
<!-- default, for execution without custom argLine -->
<argLine />
@@ -316,35 +316,43 @@
<argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=512m ${argLine} </argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-build-tools</artifactId>
<version>${fcrepo-build-tools.version}</version>
</dependency>
</dependencies>
<configuration>
<consoleOutput>true</consoleOutput>
<logViolationsToConsole>true</logViolationsToConsole>
<failsOnError>true</failsOnError>
<failOnViolation>true</failOnViolation>
<violationSeverity>warning</violationSeverity>
<configLocation>fcrepo-checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>fcrepo-checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-build-tools</artifactId>
<version>${fcrepo-build-tools.version}</version>
</dependency>
</dependencies>
<configuration>
<consoleOutput>true</consoleOutput>
<configLocation>fcrepo-checkstyle/checkstyle.xml</configLocation>
<suppressionsLocation>fcrepo-checkstyle/checkstyle-suppressions.xml
</suppressionsLocation>
</configuration>
<executions>
<execution>
<id>checkstyle</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

0 comments on commit d7c3197

Please sign in to comment.
You can’t perform that action at this time.