Author: britter
Date: Sun Jun 19 17:27:01 2016
New Revision: 1749187
URL: http://svn.apache.org/viewvc?rev=1749187&view=rev
Log:
Move build tool related configuration files to separate config directory.
This way when files are added or removed, the source assembly descriptor
does not have to be modified.
Added:
commons/proper/bcel/trunk/src/conf/
commons/proper/bcel/trunk/src/conf/checkstyle-suppressions.xml
- copied unchanged from r1749186,
commons/proper/bcel/trunk/checkstyle-suppressions.xml
commons/proper/bcel/trunk/src/conf/checkstyle.xml
- copied, changed from r1749186, commons/proper/bcel/trunk/checkstyle.xml
commons/proper/bcel/trunk/src/conf/clirr-ignored-diffs.xml
- copied unchanged from r1749186,
commons/proper/bcel/trunk/clirr-ignored-diffs.xml
commons/proper/bcel/trunk/src/conf/findbugs-exclude-filter.xml
- copied unchanged from r1749186,
commons/proper/bcel/trunk/findbugs-exclude-filter.xml
commons/proper/bcel/trunk/src/conf/pmd.xml
- copied unchanged from r1749186, commons/proper/bcel/trunk/pmd.xml
Removed:
commons/proper/bcel/trunk/checkstyle-suppressions.xml
commons/proper/bcel/trunk/checkstyle.xml
commons/proper/bcel/trunk/clirr-ignored-diffs.xml
commons/proper/bcel/trunk/findbugs-exclude-filter.xml
commons/proper/bcel/trunk/pmd.xml
Modified:
commons/proper/bcel/trunk/pom.xml
commons/proper/bcel/trunk/src/assembly/src.xml
Modified: commons/proper/bcel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/pom.xml?rev=1749187&r1=1749186&r2=1749187&view=diff
==============================================================================
--- commons/proper/bcel/trunk/pom.xml [UTF-8] (original)
+++ commons/proper/bcel/trunk/pom.xml [UTF-8] Sun Jun 19 17:27:01 2016
@@ -282,7 +282,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>src/conf/checkstyle.xml</configLocation>
<!-- Needed to define config_loc -->
<propertyExpansion>config_loc=${basedir}</propertyExpansion>
<enableRulesSummary>false</enableRulesSummary>
@@ -315,7 +315,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>src/conf/checkstyle.xml</configLocation>
<!-- Needed to define config_loc -->
<propertyExpansion>config_loc=${basedir}</propertyExpansion>
<enableRulesSummary>false</enableRulesSummary>
@@ -337,7 +337,7 @@
<targetJdk>${maven.compiler.target}</targetJdk>
<linkXref>true</linkXref>
<rulesets>
- <ruleset>${basedir}/pmd.xml</ruleset>
+ <ruleset>${basedir}/src/conf/pmd.xml</ruleset>
</rulesets>
</configuration>
</plugin>
@@ -348,7 +348,7 @@
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
-
<excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
+
<excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
<fork>true</fork>
<jvmArgs>-Duser.language=en</jvmArgs>
</configuration>
@@ -408,7 +408,7 @@
</activation>
<properties>
<!-- It's not possible to undefine this once defined, so we define it
in a profile that is normally active -->
-
<clirr.ignoredDifferencesFile>clirr-ignored-diffs.xml</clirr.ignoredDifferencesFile>
+
<clirr.ignoredDifferencesFile>src/conf/clirr-ignored-diffs.xml</clirr.ignoredDifferencesFile>
</properties>
</profile>
<!-- Profile to build and run PerformanceTest. Use 'mvn test -Pjdk-rt' -->
Modified: commons/proper/bcel/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/assembly/src.xml?rev=1749187&r1=1749186&r2=1749187&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/assembly/src.xml (original)
+++ commons/proper/bcel/trunk/src/assembly/src.xml Sun Jun 19 17:27:01 2016
@@ -24,10 +24,8 @@
<fileSets>
<fileSet>
<includes>
- <include>checkstyle.xml</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
- <include>pmd.xml</include>
<include>pom.xml</include>
<include>README.txt</include>
<include>RELEASE-NOTES.txt</include>
Copied: commons/proper/bcel/trunk/src/conf/checkstyle.xml (from r1749186,
commons/proper/bcel/trunk/checkstyle.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/conf/checkstyle.xml?p2=commons/proper/bcel/trunk/src/conf/checkstyle.xml&p1=commons/proper/bcel/trunk/checkstyle.xml&r1=1749186&r2=1749187&rev=1749187&view=diff
==============================================================================
--- commons/proper/bcel/trunk/checkstyle.xml (original)
+++ commons/proper/bcel/trunk/src/conf/checkstyle.xml Sun Jun 19 17:27:01 2016
@@ -181,7 +181,7 @@ limitations under the License.
<module name="SuppressionFilter">
<!-- config_loc is used by Eclipse plugin -->
- <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
+ <property name="file"
value="${config_loc}/src/conf/checkstyle-suppressions.xml"/>
</module>
<!--
