aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Ritter <britter@apache.org>2016-06-19 17:27:01 +0000
committerBenedikt Ritter <britter@apache.org>2016-06-19 17:27:01 +0000
commit349f502a9a01aa98199fb66208c1dff70ed98d55 (patch)
treea4d9d4b8943be33c2a2074b916d73d79164f1cfd
parent15d015a2817103594e013e2ff6a7985e35ed03d0 (diff)
downloadapache-commons-bcel-349f502a9a01aa98199fb66208c1dff70ed98d55.tar.gz
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. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/bcel/trunk@1749187 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--pom.xml10
-rw-r--r--src/assembly/src.xml2
-rw-r--r--src/conf/checkstyle-suppressions.xml (renamed from checkstyle-suppressions.xml)0
-rw-r--r--src/conf/checkstyle.xml (renamed from checkstyle.xml)2
-rw-r--r--src/conf/clirr-ignored-diffs.xml (renamed from clirr-ignored-diffs.xml)0
-rw-r--r--src/conf/findbugs-exclude-filter.xml (renamed from findbugs-exclude-filter.xml)0
-rw-r--r--src/conf/pmd.xml (renamed from pmd.xml)0
7 files changed, 6 insertions, 8 deletions
diff --git a/pom.xml b/pom.xml
index c82e189f..2a09deaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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' -->
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index f12826a4..ef4025a2 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -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>
diff --git a/checkstyle-suppressions.xml b/src/conf/checkstyle-suppressions.xml
index 2494608a..2494608a 100644
--- a/checkstyle-suppressions.xml
+++ b/src/conf/checkstyle-suppressions.xml
diff --git a/checkstyle.xml b/src/conf/checkstyle.xml
index c36fe6c4..f2ab194b 100644
--- a/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -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>
<!--
diff --git a/clirr-ignored-diffs.xml b/src/conf/clirr-ignored-diffs.xml
index c3b9ed49..c3b9ed49 100644
--- a/clirr-ignored-diffs.xml
+++ b/src/conf/clirr-ignored-diffs.xml
diff --git a/findbugs-exclude-filter.xml b/src/conf/findbugs-exclude-filter.xml
index 854ef760..854ef760 100644
--- a/findbugs-exclude-filter.xml
+++ b/src/conf/findbugs-exclude-filter.xml
diff --git a/pmd.xml b/src/conf/pmd.xml
index d9883083..d9883083 100644
--- a/pmd.xml
+++ b/src/conf/pmd.xml