Skip to content
Permalink
Browse files
Clean up .gitignore and ratCheck excludes list
- Update the .gitignore file so that the .bsp directory generated by sbt
  for the Build Server Protocol is correctly ignored by ratCheck--the
  forward slash caused problems for the sbt-rat plugin. While at it,
  remove all .gitignore entries that are related to the OS environment
  and IDE. These types of entries should go in the $HOME/config/ignore
  or $GIT_DIR/info/exclude files (man gitignore for more info).
- Removes .classpath and .keep cruft
- Updates the ratExcludes file based on the above changes. Also adds
  missing binary files for tests and windows installation that ratCheck
  doesn't alert about but should be ignored since they are expected to
  be in he repo. Also sorts the ratExcludes list for easier scanning
- Also add plugins.sbt as an exclusion in .gitignore. That file should
  not be ignored.

DAFFODIL-2430, DAFFODIL-2360
  • Loading branch information
stevedlawrence committed Nov 20, 2020
1 parent 853a5f2 commit 064d7b8655137da437a973331b7c99b039711b80
Showing 36 changed files with 64 additions and 91 deletions.

This file was deleted.

@@ -13,63 +13,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# NOTE: This file should not list entries for operating system or IDE related
# files. To ignore those files, entries should be added to one of the following
# locations, as described in the "gitignore" man page:
#
# In general we don't want the litter files for every IDE/environment
# in the Daffodil source tree.
#
# $GIT_DIR/info/exclude
# $XDG_CONFIG_HOME/git/ignore
# $HOME/.config/git/ignore

# Ignore all root .sbt files except for build.sbt and plugins.sbt. This
# provides the ability to add custom sbt settings in a new *.sbt file and
# having those files be ignored by any automated checks such as git diff, a
# useful feature for continuous integration systems
*.sbt
.bsp/
!build.sbt
.cache-main
.cache-tests
!plugins.sbt

# Build directory for sbt
target
target/
lib_managed

# Directory auto-generated by the sbt console for build server protocol
.bsp

# Auto-generated resources and sources
src_managed
resource_managed
.history
.cache
daffodil-core/errors
daffodil-lib/errors
daffodil-lib/bin
daffodil-propgen/errors
daffodil-test/errors
errors
project/errors
.~*#
testData_OnClassPath
out
.scala_dependencies
daffodil-extra/*
# ignore all emacs backup files
*~
#
# For IntelliJ IDEA
#
# (Not keeping these for now. But if someone starts using IntelliJ heavily
# this could be changed.)
#
.idea
.idea_modules
*.iml
#
# FOR EMACS ENSIME
#
.ensime_cache
# these are autosave emacs files
\#*#
.\#*
.\#.*
#
# FOR VIM
#
.*.swp
#
# For Eclipse
#
.classpath
.project
bin/
/eclipse-projects
.settings/

# Project local cache of managed dependencies
lib_managed
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
@@ -20,22 +20,23 @@ import sbt._
object Rat {

lazy val excludes = Seq(
file(".git"),
file(".keep"),

// eclispe related files
file(".classpath"),
file(".project"),
file(".jupiter"),
file(".ensime"),
// git files
file(".git"),

// scaladoc related, has no way to include a license
file("daffodil-sapi/root-doc.txt"),

// UTF-16BE, Apache Rat thinks it is a binary and cannot tell it includes the Apache v2 license
file("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd"),

// images used for the windows installer
file("daffodil-cli/src/windows/apache-daffodil.ico"),
file("daffodil-cli/src/windows/banner.bmp"),
file("daffodil-cli/src/windows/dialog.bmp"),

// test files that cannot include the Apache license without breaking tests
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/982"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1326"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1328"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1329"),
@@ -51,18 +52,7 @@ object Rat {
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1591"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1602"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1863"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/982"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt"),
@@ -72,55 +62,76 @@ object Rat {
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/inputBig1M.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output10.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output11.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output12.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output13.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output14.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output15.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output16.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1_nopretty.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1_nopretty.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output2.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output3.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output4.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output5.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output6.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output8.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output9.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output10.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output11.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output12.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output13.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output14.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output15.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output16.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output_DFDL-714.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_01.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_02.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_03.txt"),
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_04.txt"),
file("daffodil-io/src/test/resources/iso8859.doc.dat"),
file("daffodil-japi/src/test/resources/test/japi/01very_simple.txt"),
file("daffodil-japi/src/test/resources/test/japi/myData16.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData2.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData3.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData4.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData5.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData16.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData19.dat"),
file("daffodil-japi/src/test/resources/test/japi/myDataBroken.dat"),
file("daffodil-japi/src/test/resources/test/japi/myData.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/01very_simple.txt"),
file("daffodil-sapi/src/test/resources/test/sapi/myData16.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData2.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData3.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData4.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData5.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData16.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData19.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myDataBroken.dat"),
file("daffodil-sapi/src/test/resources/test/sapi/myData.dat"),
file("daffodil-tdml-lib/src/test/resources/test/tdml/test.bin"),
file("daffodil-tdml-lib/src/test/resources/test/tdml/test.txt"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.bin"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.txt"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/ext_file2.txt"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/ext_file.txt"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/ext_file2.txt"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_01.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_02.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_03.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_04.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_07.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13a.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13b.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13c.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13d.bin"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/02nine_headers.txt"),
file("daffodil-test/src/test/resources/org/apache/daffodil/usertests/test_prefix_separator_as_variable"),
file("daffodil-test/src/test/resources/org/apache/daffodil/usertests/Book2.csv"),
file("daffodil-test/src/test/resources/org/apache/daffodil/usertests/test_prefix_separator_as_variable"),
file("daffodil-test/src/test/resources/test space/A BTinyData.tdml.dat"),
file("test-stdLayout/src/test/resources/org1/test-outer-data1.txt"),
file("test-stdLayout/src/test/resources/org2/test-data1.txt"),

0 comments on commit 064d7b8

Please sign in to comment.