This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit 898250f06b94d9b8b901d729ade2d44c55e980b4
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Oct 9 08:50:50 2023 -0400

    Move 'conf' folder under 'src' like other components
---
 pom.xml                                        | 10 +++++-----
 {conf => src/conf}/CommonsConfiguration.xsd    |  0
 {conf => src/conf}/HEADER.txt                  |  0
 {conf => src/conf}/README                      |  0
 {conf => src/conf}/checkstyle-suppressions.xml |  0
 {conf => src/conf}/checkstyle.xml              |  0
 {conf => src/conf}/findbugs-exclude-filter.xml |  0
 7 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7068ac45..fbb07c8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -620,10 +620,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <configuration>
-            <configLocation>${basedir}/conf/checkstyle.xml</configLocation>
-            
<suppressionsLocation>${basedir}/conf/checkstyle-suppressions.xml</suppressionsLocation>
+            <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+            
<suppressionsLocation>${basedir}/src/conf/checkstyle-suppressions.xml</suppressionsLocation>
             <enableRulesSummary>false</enableRulesSummary>
-            <propertyExpansion>basedir=${basedir}</propertyExpansion>
+            <propertyExpansion>basedir=${basedir}/src</propertyExpansion>
             <includeResources>false</includeResources>
             <includeTestResources>false</includeTestResources>
             <sourceDirectories>
@@ -760,7 +760,7 @@
         <configuration>
           <threshold>Normal</threshold>
           <effort>Default</effort>
-          
<excludeFilterFile>${basedir}/conf/findbugs-exclude-filter.xml</excludeFilterFile>
+          
<excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>
@@ -864,7 +864,7 @@
         <configuration>
           <threshold>Normal</threshold>
           <effort>Default</effort>
-          
<excludeFilterFile>${basedir}/conf/findbugs-exclude-filter.xml</excludeFilterFile>
+          
<excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>
diff --git a/conf/CommonsConfiguration.xsd b/src/conf/CommonsConfiguration.xsd
similarity index 100%
rename from conf/CommonsConfiguration.xsd
rename to src/conf/CommonsConfiguration.xsd
diff --git a/conf/HEADER.txt b/src/conf/HEADER.txt
similarity index 100%
rename from conf/HEADER.txt
rename to src/conf/HEADER.txt
diff --git a/conf/README b/src/conf/README
similarity index 100%
rename from conf/README
rename to src/conf/README
diff --git a/conf/checkstyle-suppressions.xml 
b/src/conf/checkstyle-suppressions.xml
similarity index 100%
rename from conf/checkstyle-suppressions.xml
rename to src/conf/checkstyle-suppressions.xml
diff --git a/conf/checkstyle.xml b/src/conf/checkstyle.xml
similarity index 100%
rename from conf/checkstyle.xml
rename to src/conf/checkstyle.xml
diff --git a/conf/findbugs-exclude-filter.xml 
b/src/conf/findbugs-exclude-filter.xml
similarity index 100%
rename from conf/findbugs-exclude-filter.xml
rename to src/conf/findbugs-exclude-filter.xml

Reply via email to