You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2020/11/20 15:33:39 UTC
[incubator-daffodil] branch master updated: Clean up .gitignore and
ratCheck excludes list
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 064d7b8 Clean up .gitignore and ratCheck excludes list
064d7b8 is described below
commit 064d7b8655137da437a973331b7c99b039711b80
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Nov 6 07:37:19 2020 -0500
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
---
.classpath | 6 --
.gitignore | 74 ++++++---------------
daffodil-cli/src/it/java/.keep | 0
daffodil-cli/src/it/resources/.keep | 0
daffodil-cli/src/main/resources/.keep | 0
daffodil-core/src/main/java/.keep | 0
.../src/main/scala/org/apache/daffodil/.keep | 0
daffodil-core/src/test/resources/.keep | 0
daffodil-core/src/test/scala/.keep | 0
.../src/test/scala/org/apache/daffodil/.keep | 0
daffodil-japi/src/test/java/.keep | 0
.../src/test/java/org/apache/daffodil/.keep | 0
daffodil-lib/src/main/java/.keep | 0
daffodil-lib/src/test/java/.keep | 0
daffodil-lib/src/test/scala/.keep | 0
daffodil-propgen/lib/.keep | 0
daffodil-runtime1-unparser/src/main/java/.keep | 0
daffodil-runtime1-unparser/src/test/java/.keep | 0
daffodil-runtime1-unparser/src/test/scala/.keep | 0
.../src/main/scala/org/apache/daffodil/.keep | 0
.../src/test/scala/org/apache/daffodil/.keep | 0
daffodil-sapi/src/test/scala/.keep | 0
.../src/test/scala/org/apache/daffodil/.keep | 0
daffodil-tdml-lib/lib/jars/.keep | 0
daffodil-tdml-lib/src/test/scala/.keep | 0
.../src/main/java/org/apache/daffodil/.keep | 0
.../src/main/resources/org/apache/daffodil/.keep | 0
.../src/main/scala/org/apache/daffodil/.keep | 0
.../src/test/java/org/apache/daffodil/.keep | 0
.../src/test/scala/org/apache/daffodil/.keep | 0
daffodil-test/lib/.keep | 0
daffodil-test/src/main/java/.keep | 0
daffodil-test/src/main/resources/.keep | 0
daffodil-test/src/main/scala/.keep | 0
daffodil-test/src/test/java/.keep | 0
project/Rat.scala | 75 +++++++++++++---------
36 files changed, 64 insertions(+), 91 deletions(-)
diff --git a/.classpath b/.classpath
deleted file mode 100644
index 3362758..0000000
--- a/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 65b4c1d..df70556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/daffodil-cli/src/it/java/.keep b/daffodil-cli/src/it/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-cli/src/it/resources/.keep b/daffodil-cli/src/it/resources/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-cli/src/main/resources/.keep b/daffodil-cli/src/main/resources/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-core/src/main/java/.keep b/daffodil-core/src/main/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/.keep b/daffodil-core/src/main/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-core/src/test/resources/.keep b/daffodil-core/src/test/resources/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-core/src/test/scala/.keep b/daffodil-core/src/test/scala/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/.keep b/daffodil-core/src/test/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-japi/src/test/java/.keep b/daffodil-japi/src/test/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-japi/src/test/java/org/apache/daffodil/.keep b/daffodil-japi/src/test/java/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-lib/src/main/java/.keep b/daffodil-lib/src/main/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-lib/src/test/java/.keep b/daffodil-lib/src/test/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-lib/src/test/scala/.keep b/daffodil-lib/src/test/scala/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-propgen/lib/.keep b/daffodil-propgen/lib/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-runtime1-unparser/src/main/java/.keep b/daffodil-runtime1-unparser/src/main/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-runtime1-unparser/src/test/java/.keep b/daffodil-runtime1-unparser/src/test/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-runtime1-unparser/src/test/scala/.keep b/daffodil-runtime1-unparser/src/test/scala/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-runtime1/src/main/scala/org/apache/daffodil/.keep b/daffodil-runtime1/src/main/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-runtime1/src/test/scala/org/apache/daffodil/.keep b/daffodil-runtime1/src/test/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-sapi/src/test/scala/.keep b/daffodil-sapi/src/test/scala/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-sapi/src/test/scala/org/apache/daffodil/.keep b/daffodil-sapi/src/test/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-tdml-lib/lib/jars/.keep b/daffodil-tdml-lib/lib/jars/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-tdml-lib/src/test/scala/.keep b/daffodil-tdml-lib/src/test/scala/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test-ibm1/src/main/java/org/apache/daffodil/.keep b/daffodil-test-ibm1/src/main/java/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test-ibm1/src/main/resources/org/apache/daffodil/.keep b/daffodil-test-ibm1/src/main/resources/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test-ibm1/src/main/scala/org/apache/daffodil/.keep b/daffodil-test-ibm1/src/main/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test-ibm1/src/test/java/org/apache/daffodil/.keep b/daffodil-test-ibm1/src/test/java/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/.keep b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test/lib/.keep b/daffodil-test/lib/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test/src/main/java/.keep b/daffodil-test/src/main/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test/src/main/resources/.keep b/daffodil-test/src/main/resources/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test/src/main/scala/.keep b/daffodil-test/src/main/scala/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/daffodil-test/src/test/java/.keep b/daffodil-test/src/test/java/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/project/Rat.scala b/project/Rat.scala
index e9e4230..2489a69 100644
--- a/project/Rat.scala
+++ b/project/Rat.scala
@@ -20,14 +20,9 @@ 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"),
@@ -35,7 +30,13 @@ object Rat {
// 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,17 +62,20 @@ 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"),
@@ -90,6 +83,13 @@ object Rat {
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"),
@@ -97,30 +97,41 @@ object Rat {
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"),