Skip to content

Commit 2ea0295

Browse files
rnveachnrmancuso
authored andcommitted
minor: moves projects to test on under config
1 parent a844187 commit 2ea0295

8 files changed

+14
-8
lines changed

.ci/no-exception-test.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ openjdk17-with-checks-nonjavadoc-error)
5656
sed -i.'' 's/value=\"error\"/value=\"ignore\"/' \
5757
.ci-temp/contribution/checkstyle-tester/checks-nonjavadoc-error.xml
5858
cd .ci-temp/contribution/checkstyle-tester
59-
cp ../../../.ci/openjdk-projects-to-test-on.config openjdk-projects-to-test-on.config
60-
sed -i '/ <!-- Filters -->/r ../../../.ci/openjdk17-excluded.files' checks-nonjavadoc-error.xml
59+
cp ../../../config/projects-to-test/openjdk-projects-to-test-on.config \
60+
openjdk-projects-to-test-on.config
61+
sed -i '/ <!-- Filters -->/r ../../../config/projects-to-test/openjdk17-excluded.files' \
62+
checks-nonjavadoc-error.xml
6163
export MAVEN_OPTS="-Xmx2048m"
6264
groovy ./diff.groovy --listOfProjects openjdk-projects-to-test-on.config \
6365
--mode single --allowExcludes \
@@ -74,7 +76,8 @@ no-exception-lucene-and-others-javadoc)
7476
BRANCH=$(git rev-parse --abbrev-ref HEAD)
7577
echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
7678
checkout_from https://github.com/checkstyle/contribution
77-
cp .ci/projects-for-no-exception-javadoc.config .ci-temp/contribution/checkstyle-tester
79+
cp config/projects-to-test/projects-for-no-exception-javadoc.config \
80+
.ci-temp/contribution/checkstyle-tester
7881
cd .ci-temp/contribution/checkstyle-tester
7982
sed -i'' 's/^guava/#guava/' projects-for-no-exception-javadoc.config
8083
sed -i'' 's/#infinispan/infinispan/' projects-for-no-exception-javadoc.config
@@ -95,7 +98,8 @@ no-exception-cassandra-storm-tapestry-javadoc)
9598
echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
9699
BRANCH=$(git rev-parse --abbrev-ref HEAD)
97100
checkout_from https://github.com/checkstyle/contribution
98-
cp .ci/projects-for-no-exception-javadoc.config .ci-temp/contribution/checkstyle-tester
101+
cp config/projects-to-test/projects-for-no-exception-javadoc.config \
102+
.ci-temp/contribution/checkstyle-tester
99103
cd .ci-temp/contribution/checkstyle-tester
100104
sed -i'' 's/^guava/#guava/' projects-for-no-exception-javadoc.config
101105
sed -i'' 's/#tapestry-5/tapestry-5/' projects-for-no-exception-javadoc.config
@@ -115,7 +119,8 @@ no-exception-hadoop-apache-groovy-scouter-javadoc)
115119
echo 'CS_POM_VERSION='"${CS_POM_VERSION}"
116120
BRANCH=$(git rev-parse --abbrev-ref HEAD)
117121
checkout_from https://github.com/checkstyle/contribution
118-
cp .ci/projects-for-no-exception-javadoc.config .ci-temp/contribution/checkstyle-tester
122+
cp config/projects-to-test/projects-for-no-exception-javadoc.config \
123+
.ci-temp/contribution/checkstyle-tester
119124
cd .ci-temp/contribution/checkstyle-tester
120125
sed -i'' 's/^guava/#guava/' projects-for-no-exception-javadoc.config
121126
sed -i'' 's/#apache-commons/apache-commons/' projects-for-no-exception-javadoc.config

config/checkstyle_non_main_files_suppressions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
files="config[\\/]intellij-idea-inspection-scope.xml"/>
9090

9191
<!-- we must use full paths in file pattern property value -->
92-
<suppress id="lineLength" files=".ci[\\/]openjdk17-excluded.files"/>
92+
<suppress id="lineLength" files="config[\\/]projects-to-test[\\/]openjdk17-excluded.files"/>
9393

9494
<!-- this file cannot be line wrapped, It contains a list of suppressions -->
9595
<suppress id="lineLength" files="config[\\/]pitest-suppressions[\\/].*"/>

config/intellij-idea-inspection-scope.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
all excludes should be specified in build configuration -->
33
<component name="DependencyValidationManager">
44
<scope name="Checkstyle Inspection Scope"
5-
pattern="!file[checkstyle]:target//*&amp;&amp;!file:src/test/resources*//**&amp;&amp;!file:src/it/resources*//**&amp;&amp;!file:src/site/resources/js/google-analytics.js&amp;&amp;!file:src/site/resources/styleguides*//**&amp;&amp;!file:config/intellij-idea-inspections.properties&amp;&amp;!file[checkstyle]:.ci-temp//*&amp;&amp;!file[checkstyle]:bin//*&amp;&amp;!file[checkstyle]:.settings//*&amp;&amp;!file:.classpath&amp;&amp;!file:.project&amp;&amp;!file:.circleci/config.yml&amp;&amp;!file:.ci/openjdk-projects-to-test-on.config&amp;&amp;!file:.ci/projects-for-no-exception-javadoc.config&amp;&amp;!file:.ci/pitest-survival-check-xml.groovy"/>
5+
pattern="!file[checkstyle]:target//*&amp;&amp;!file:src/test/resources*//**&amp;&amp;!file:src/it/resources*//**&amp;&amp;!file:src/site/resources/js/google-analytics.js&amp;&amp;!file:src/site/resources/styleguides*//**&amp;&amp;!file:config/intellij-idea-inspections.properties&amp;&amp;!file[checkstyle]:.ci-temp//*&amp;&amp;!file[checkstyle]:bin//*&amp;&amp;!file[checkstyle]:.settings//*&amp;&amp;!file:.classpath&amp;&amp;!file:.project&amp;&amp;!file:.circleci/config.yml&amp;&amp;!file:config/projects-to-test/openjdk-projects-to-test-on.config&amp;&amp;!file:config/projects-for-no-exception-javadoc.config&amp;&amp;!file:.ci/pitest-survival-check-xml.groovy"/>
66
</component>

config/jsoref-spellchecker/exclude.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
/releasenotes_old.*\.xml$
1515
/releasenotes\.xml$
1616
/.*_..\.translation[^/]*$
17-
/openjdk17-excluded\.files$
1817
^cdg-pitest-licence.txt$
1918
^.teamcity/
19+
^config/projects-to-test/openjdk17-excluded\.files$
2020
^config/checker-framework-suppressions/
2121
^config/archunit-store/
2222
^codeship.encrypted$
File renamed without changes.
File renamed without changes.
File renamed without changes.

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,6 +1633,7 @@
16331633
<exclude>signatures-test.txt</exclude>
16341634
<exclude>archunit-store/**</exclude>
16351635
<exclude>jsoref-spellchecker/**</exclude>
1636+
<exclude>projects-to-test/**</exclude>
16361637
</excludes>
16371638
</validationSet>
16381639
<validationSet>

0 commit comments

Comments
 (0)