Author: kkolinko
Date: Mon Feb 9 02:58:32 2015
New Revision: 1658295
URL: http://svn.apache.org/r1658295
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57549
Fix checkstyle configuration to do not reference a SNAPSHOT version of
build-tools module.
Reference the configuration file directly instead of expecting it on classpath.
Tested with "mvn checkstyle:checkstyle".
Modified:
tomcat/taglibs/standard/trunk/CHANGES.txt
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/jstlel/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml
Modified: tomcat/taglibs/standard/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1658295&r1=1658294&r2=1658295&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/CHANGES.txt (original)
+++ tomcat/taglibs/standard/trunk/CHANGES.txt Mon Feb 9 02:58:32 2015
@@ -2,6 +2,7 @@ Changes in 1.2.3 release
57547 Fix regression with running on older JREs
57548 Update library version number printed by Version class
+57549 Fix reference to old SNAPSHOT version of taglibs-build-tools in pom
files.
Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs]
Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1658295&r1=1658294&r2=1658295&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Mon Feb 9 02:58:32 2015
@@ -133,13 +133,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-build-tools</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <configuration>
+
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -182,14 +178,6 @@
<!--
<excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
-->
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <configLocation>taglibs/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
</plugins>
</reporting>
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1658295&r1=1658294&r2=1658295&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Mon Feb 9 02:58:32 2015
@@ -129,13 +129,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-build-tools</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <configuration>
+
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -178,14 +174,6 @@
<!--
<excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
-->
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <configLocation>taglibs/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
</plugins>
</reporting>
Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1658295&r1=1658294&r2=1658295&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Mon Feb 9 02:58:32 2015
@@ -134,13 +134,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-build-tools</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <configuration>
+
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -183,14 +179,6 @@
<!--
<excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
-->
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <configLocation>taglibs/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
</plugins>
</reporting>
Modified: tomcat/taglibs/standard/trunk/spec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1658295&r1=1658294&r2=1658295&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/spec/pom.xml Mon Feb 9 02:58:32 2015
@@ -115,27 +115,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-build-tools</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <configuration>
+
<configLocation>../build-tools/src/main/resources/taglibs/checkstyle.xml</configLocation>
+ </configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <configLocation>taglibs/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
</plugins>
</reporting>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
