Skip to content

Commit 4253fa5

Browse files
committed
Merge branch 'release-1.x' into 1.X
2 parents 30cb43c + 75c9d0d commit 4253fa5

File tree

2 files changed

+8
-68
lines changed

2 files changed

+8
-68
lines changed

checkstyle.xml

Lines changed: 0 additions & 59 deletions
This file was deleted.

pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>commons-beanutils</groupId>
2626
<artifactId>commons-beanutils</artifactId>
27-
<version>1.10.0-SNAPSHOT</version>
27+
<version>1.10.1-SNAPSHOT</version>
2828
<name>Apache Commons BeanUtils</name>
2929

3030
<inceptionYear>2000</inceptionYear>
@@ -46,7 +46,7 @@
4646
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
4747
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-beanutils</commons.scmPubUrl>
4848
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
49-
<project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp>
49+
<project.build.outputTimestamp>2025-01-07T13:21:19Z</project.build.outputTimestamp>
5050
<japicmp.skip>false</japicmp.skip>
5151
<!-- Commons Release Plugin -->
5252
<commons.bc.version>1.9.4</commons.bc.version>
@@ -172,10 +172,12 @@
172172
<plugin>
173173
<groupId>org.apache.maven.plugins</groupId>
174174
<artifactId>maven-checkstyle-plugin</artifactId>
175-
<version>2.6</version>
176175
<configuration>
177-
<configLocation>${basedir}/checkstyle.xml</configLocation>
178-
<enableRulesSummary>false</enableRulesSummary>
176+
<configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
177+
<suppressionsLocation>${basedir}/src/conf/checkstyle-suppressions.xml</suppressionsLocation>
178+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
179+
<enableRulesSummary>false</enableRulesSummary>
180+
<resourceExcludes>NOTICE.txt,LICENSE.txt,**/pom.properties,target/**.properties,</resourceExcludes>
179181
</configuration>
180182
</plugin>
181183
<plugin>
@@ -184,8 +186,7 @@
184186
<configuration>
185187
<linksource>true</linksource>
186188
<links>
187-
<link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
188-
<link>http://commons.apache.org/collections/api-release/</link>
189+
<link>https://commons.apache.org/proper/commons-collections/apidocs/</link>
189190
</links>
190191
</configuration>
191192
</plugin>
@@ -208,8 +209,6 @@
208209
</plugin>
209210
</plugins>
210211
</reporting>
211-
212-
213212
<profiles>
214213
<profile>
215214
<id>setup-checkout</id>

0 commit comments

Comments
 (0)