Skip to content

Commit 2e29f4c

Browse files
committed
[CODEC-109] Allow the build to run with Maven 2 and Maven 3. https://issues.apache.org/jira/browse/CODEC-109.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1061085 13f79535-47bb-0310-9956-ffa450edef68
1 parent 8e7cbe5 commit 2e29f4c

2 files changed

Lines changed: 49 additions & 8 deletions

File tree

checkstyle.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ limitations under the License.
2424
<module name="Checker">
2525
<property name="localeLanguage" value="en"/>
2626

27+
<!-- Verify that EVERY source file has the appropriate license -->
28+
<module name="Header">
29+
<property name="headerFile" value="${checkstyle.header.file}"/>
30+
</module>
31+
2732
<module name="TreeWalker">
28-
<!-- Verify that EVERY source file has the appropriate license -->
29-
<module name="Header">
30-
<property name="headerFile" value="${checkstyle.header.file}"/>
31-
</module>
3233

3334
<module name="OperatorWrap">
3435
<property name="option" value="eol"/>

pom.xml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,46 @@
5151
<url>http://svn.apache.org/viewvc/commons/proper/codec/trunk</url>
5252
</scm>
5353

54+
<profiles>
55+
<!--
56+
Use maven-site-plugin 2.x with Maven 2.x and maven-site-plugin 3.x with Maven 3.x
57+
See http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3/maven-3.html
58+
-->
59+
<profile>
60+
<id>maven-3</id>
61+
<activation>
62+
<file>
63+
<!-- The basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
64+
<exists>${basedir}</exists>
65+
</file>
66+
</activation>
67+
<build>
68+
<pluginManagement>
69+
<plugins>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-site-plugin</artifactId>
73+
<version>3.0-beta-3</version>
74+
</plugin>
75+
</plugins>
76+
</pluginManagement>
77+
<plugins>
78+
<plugin>
79+
<artifactId>maven-site-plugin</artifactId>
80+
<executions>
81+
<execution>
82+
<id>attach-descriptor</id>
83+
<goals>
84+
<goal>attach-descriptor</goal>
85+
</goals>
86+
</execution>
87+
</executions>
88+
</plugin>
89+
</plugins>
90+
</build>
91+
</profile>
92+
</profiles>
93+
5494
<developers>
5595
<developer>
5696
<name>Henri Yandell</name>
@@ -237,7 +277,7 @@
237277
<plugin>
238278
<groupId>org.apache.maven.plugins</groupId>
239279
<artifactId>maven-checkstyle-plugin</artifactId>
240-
<version>2.3</version>
280+
<version>2.6</version>
241281
<configuration>
242282
<configLocation>${basedir}/checkstyle.xml</configLocation>
243283
<enableRulesSummary>false</enableRulesSummary>
@@ -257,21 +297,21 @@
257297
<plugin>
258298
<groupId>org.codehaus.mojo</groupId>
259299
<artifactId>findbugs-maven-plugin</artifactId>
260-
<version>2.0.1</version>
300+
<version>2.3.1</version>
261301
</plugin>
262302
<plugin>
263303
<groupId>org.codehaus.mojo</groupId>
264304
<artifactId>clirr-maven-plugin</artifactId>
265305
<version>2.2.2</version>
266306
<configuration>
267-
<comparisonVersion>1.3</comparisonVersion>
307+
<comparisonVersion>1.4</comparisonVersion>
268308
<minSeverity>info</minSeverity>
269309
</configuration>
270310
</plugin>
271311
<plugin>
272312
<groupId>org.apache.maven.plugins</groupId>
273313
<artifactId>maven-javadoc-plugin</artifactId>
274-
<version>2.5</version>
314+
<version>2.7</version>
275315
<configuration>
276316
<linksource>true</linksource>
277317
<links>

0 commit comments

Comments
 (0)